]> Pileus Git - ~andy/linux/commitdiff
net: use skb_reset_mac_len() in dev_gro_receive()
authorEric Dumazet <edumazet@google.com>
Thu, 14 Feb 2013 17:31:48 +0000 (17:31 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 15 Feb 2013 20:36:39 +0000 (15:36 -0500)
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>
net/core/dev.c

index 1cd6297fd34b182b8cf0accd5a7618bc85aef6a3..6ad37896a324612ddbd0722dbe4f03f74a0584d7 100644 (file)
@@ -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;