diff options
Diffstat (limited to 'net/ethernet')
| -rw-r--r-- | net/ethernet/eth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c index 205a1c12f3c0..61ec0329316c 100644 --- a/net/ethernet/eth.c +++ b/net/ethernet/eth.c | |||
| @@ -136,7 +136,7 @@ int eth_rebuild_header(struct sk_buff *skb) | |||
| 136 | default: | 136 | default: |
| 137 | printk(KERN_DEBUG | 137 | printk(KERN_DEBUG |
| 138 | "%s: unable to resolve type %X addresses.\n", | 138 | "%s: unable to resolve type %X addresses.\n", |
| 139 | dev->name, (int)eth->h_proto); | 139 | dev->name, ntohs(eth->h_proto)); |
| 140 | 140 | ||
| 141 | memcpy(eth->h_source, dev->dev_addr, ETH_ALEN); | 141 | memcpy(eth->h_source, dev->dev_addr, ETH_ALEN); |
| 142 | break; | 142 | break; |
| @@ -162,7 +162,7 @@ __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev) | |||
| 162 | 162 | ||
| 163 | skb->dev = dev; | 163 | skb->dev = dev; |
| 164 | skb_reset_mac_header(skb); | 164 | skb_reset_mac_header(skb); |
| 165 | skb_pull(skb, ETH_HLEN); | 165 | skb_pull_inline(skb, ETH_HLEN); |
| 166 | eth = eth_hdr(skb); | 166 | eth = eth_hdr(skb); |
| 167 | 167 | ||
| 168 | if (unlikely(is_multicast_ether_addr(eth->h_dest))) { | 168 | if (unlikely(is_multicast_ether_addr(eth->h_dest))) { |
