diff --git a/[refs] b/[refs] index 9cc492488942..654ae05c565e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a20e3197e7f6097897c6d1f18335a326ee06299 +refs/heads/master: b002a861092b0db128800794a116cc3acc5ec239 diff --git a/trunk/net/ethernet/eth.c b/trunk/net/ethernet/eth.c index 35846964082c..0c0d272a9888 100644 --- a/trunk/net/ethernet/eth.c +++ b/trunk/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;