]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
net: fix netconsole filtering
authorJoe Hershberger <joe.hershberger@ni.com>
Wed, 3 Oct 2012 09:14:03 +0000 (09:14 +0000)
committerTom Rini <trini@ti.com>
Wed, 3 Oct 2012 23:01:22 +0000 (16:01 -0700)
Adjustment of Michael Walle's fix patch

Commit 8a0eccb1056b313b45ab62e3aac400f339aa71b4 breaks netconsole. src_ip
must not be converted to host byte order, because nc_ip is already stored
in network byte order (see string_to_ip(), called by getenv_IPaddr()).

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
net/net.c

index 809fb14c7955154ab7e9b8298c9142af876de2f7..569fec41e73efca6f033b6a7cef6464bf87accf7 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -1161,7 +1161,7 @@ NetReceive(uchar *inpkt, int len)
 
 #ifdef CONFIG_NETCONSOLE
                nc_input_packet((uchar *)ip + IP_UDP_HDR_SIZE,
-                                       ntohl(ip->ip_src),
+                                       src_ip,
                                        ntohs(ip->udp_dst),
                                        ntohs(ip->udp_src),
                                        ntohs(ip->udp_len) - UDP_HDR_SIZE);