OSDN Git Service

if_vlan: Call dev_kfree_skb_any instead of kfree_skb.
authorEric W. Biederman <ebiederm@xmission.com>
Fri, 21 Mar 2014 02:50:33 +0000 (19:50 -0700)
committerEric W. Biederman <ebiederm@xmission.com>
Tue, 25 Mar 2014 04:19:25 +0000 (21:19 -0700)
Replace kfree_skb with dev_kfree_skb_any in vlan_insert_tag as
vlan_insert_tag can be called from hard irq context (netpoll)
and from other contexts.

dev_kfree_skb_any is used as vlan_insert_tag only frees the skb if the
skb can not be modified to insert a tag, in which case vlan_insert_tag
drops the skb.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
include/linux/if_vlan.h

index bbedfb5..d3d2306 100644 (file)
@@ -288,7 +288,7 @@ static inline struct sk_buff *vlan_insert_tag(struct sk_buff *skb,
        struct vlan_ethhdr *veth;
 
        if (skb_cow_head(skb, VLAN_HLEN) < 0) {
-               kfree_skb(skb);
+               dev_kfree_skb_any(skb);
                return NULL;
        }
        veth = (struct vlan_ethhdr *)skb_push(skb, VLAN_HLEN);