diff options
Diffstat (limited to 'net/core/dev.c')
-rw-r--r-- | net/core/dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index b2e9057be3bf..d4d874a25e45 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -1724,7 +1724,7 @@ static void dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev) | |||
1724 | skb_reset_mac_header(skb2); | 1724 | skb_reset_mac_header(skb2); |
1725 | 1725 | ||
1726 | if (skb_network_header(skb2) < skb2->data || | 1726 | if (skb_network_header(skb2) < skb2->data || |
1727 | skb2->network_header > skb2->tail) { | 1727 | skb_network_header(skb2) > skb_tail_pointer(skb2)) { |
1728 | net_crit_ratelimited("protocol %04x is buggy, dev %s\n", | 1728 | net_crit_ratelimited("protocol %04x is buggy, dev %s\n", |
1729 | ntohs(skb2->protocol), | 1729 | ntohs(skb2->protocol), |
1730 | dev->name); | 1730 | dev->name); |
@@ -3892,7 +3892,7 @@ static void skb_gro_reset_offset(struct sk_buff *skb) | |||
3892 | NAPI_GRO_CB(skb)->frag0 = NULL; | 3892 | NAPI_GRO_CB(skb)->frag0 = NULL; |
3893 | NAPI_GRO_CB(skb)->frag0_len = 0; | 3893 | NAPI_GRO_CB(skb)->frag0_len = 0; |
3894 | 3894 | ||
3895 | if (skb->mac_header == skb->tail && | 3895 | if (skb_mac_header(skb) == skb_tail_pointer(skb) && |
3896 | pinfo->nr_frags && | 3896 | pinfo->nr_frags && |
3897 | !PageHighMem(skb_frag_page(frag0))) { | 3897 | !PageHighMem(skb_frag_page(frag0))) { |
3898 | NAPI_GRO_CB(skb)->frag0 = skb_frag_address(frag0); | 3898 | NAPI_GRO_CB(skb)->frag0 = skb_frag_address(frag0); |