aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2010-04-20 21:06:07 +0000
committerDavid S. Miller <davem@davemloft.net>2010-04-21 22:57:19 -0700
commitb002a861092b0db128800794a116cc3acc5ec239 (patch)
tree6d4f2c91f164de43bf387537aff72c222134cc40
parent9a20e3197e7f6097897c6d1f18335a326ee06299 (diff)
downloadkernel_samsung_crespo-b002a861092b0db128800794a116cc3acc5ec239.zip
kernel_samsung_crespo-b002a861092b0db128800794a116cc3acc5ec239.tar.gz
kernel_samsung_crespo-b002a861092b0db128800794a116cc3acc5ec239.tar.bz2
ethernet: print protocol in host byte order
Eric's recent patch added __force, but this place would seem to require actually doing a byte order conversion so the printk is consistent across architectures. Cc: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ethernet/eth.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index 3584696..0c0d272 100644
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -136,7 +136,7 @@ int eth_rebuild_header(struct sk_buff *skb)
default:
printk(KERN_DEBUG
"%s: unable to resolve type %X addresses.\n",
- dev->name, (__force int)eth->h_proto);
+ dev->name, ntohs(eth->h_proto));
memcpy(eth->h_source, dev->dev_addr, ETH_ALEN);
break;