[U-Boot] [PATCH,for-rc] net: fix netconsole filtering
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: Michael Walle michael@walle.cc Cc: Joe Hershberger joe.hershberger@gmail.com --- net/net.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/net.c b/net/net.c index 809fb14..7515fc3 100644 --- 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), + ip->ip_src, ntohs(ip->udp_dst), ntohs(ip->udp_src), ntohs(ip->udp_len) - UDP_HDR_SIZE);
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 --- Appologies for the bug. Tested on PPC where the alignment is the same! :(
net/net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/net.c b/net/net.c index 809fb14..569fec4 100644 --- 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);
On Wed, Oct 03, 2012 at 09:14:03AM -0000, Joe Hershberger wrote:
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
Applied to u-boot/master, thanks!
participants (3)
-
Joe Hershberger -
Michael Walle -
Tom Rini