diff --git a/[refs] b/[refs] index 6a62a6866c64..5f5017a6aae6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 784e2710ce3588d8316dc8efac9ecbebaeaf7c35 +refs/heads/master: 70777d03466e7a8a41b0d34677454c92f4e93d89 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 7f390b52caab..e85cc5fa3c4e 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -1537,7 +1537,8 @@ static void dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev) if (net_ratelimit()) printk(KERN_CRIT "protocol %04x is " "buggy, dev %s\n", - skb2->protocol, dev->name); + ntohs(skb2->protocol), + dev->name); skb_reset_network_header(skb2); }