diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2014-03-20 19:50:33 -0700 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2014-03-24 21:19:25 -0700 |
| commit | fb7c03dfc48eb81bda368561f4ca162749d127c9 (patch) | |
| tree | 2e259136fe391a5068bec0ea7f1e8d75e0cf7800 /include/linux/if_vlan.h | |
| parent | 85e945253955f399c2aacd220423a5e298e963b8 (diff) | |
| download | blackbird-obmc-linux-fb7c03dfc48eb81bda368561f4ca162749d127c9.tar.gz blackbird-obmc-linux-fb7c03dfc48eb81bda368561f4ca162749d127c9.zip | |
if_vlan: Call dev_kfree_skb_any instead of kfree_skb.
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>
Diffstat (limited to 'include/linux/if_vlan.h')
| -rw-r--r-- | include/linux/if_vlan.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index bbedfb56bd66..d3d2306f00bf 100644 --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h @@ -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); |
