diff options
| author | Eric Dumazet <edumazet@google.com> | 2013-02-14 17:31:48 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-02-15 15:36:39 -0500 |
| commit | efd9450e7e36717f24dff3bd584faa80a85231d6 (patch) | |
| tree | 326b5f5e82859cad3bb00da31572b4549fabb8f1 | |
| parent | c14dd2680baaef02aa4d221a2b5d337fbfd71b00 (diff) | |
| download | linux-stable-efd9450e7e36717f24dff3bd584faa80a85231d6.tar.gz linux-stable-efd9450e7e36717f24dff3bd584faa80a85231d6.tar.bz2 linux-stable-efd9450e7e36717f24dff3bd584faa80a85231d6.zip | |
net: use skb_reset_mac_len() in dev_gro_receive()
We no longer need to use mac_len, lets cleanup things.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/core/dev.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 1cd6297fd34b..6ad37896a324 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3802,7 +3802,6 @@ static enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff __be16 type = skb->protocol; struct list_head *head = &offload_base; int same_flow; - int mac_len; enum gro_result ret; if (!(skb->dev->features & NETIF_F_GRO) || netpoll_rx_on(skb)) @@ -3819,8 +3818,7 @@ static enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff continue; skb_set_network_header(skb, skb_gro_offset(skb)); - mac_len = skb->network_header - skb->mac_header; - skb->mac_len = mac_len; + skb_reset_mac_len(skb); NAPI_GRO_CB(skb)->same_flow = 0; NAPI_GRO_CB(skb)->flush = 0; NAPI_GRO_CB(skb)->free = 0; |