diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-08-07 21:07:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-08-07 21:07:35 -0400 |
| commit | 864c5a4d37b1f25e3c36dd00a09158eae455a8fd (patch) | |
| tree | 7db008bc839e3d246bc905fc9b9798e79fbe000b /net/mac80211/ieee80211.c | |
| parent | 14ae856645dba5b9ba56b2d0627b3b9825fa37b2 (diff) | |
| parent | f27b62d3e7ecca42a75f1c5d3cc225539301ba6d (diff) | |
Merge branch 'fixes-davem' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/ieee80211.c')
| -rw-r--r-- | net/mac80211/ieee80211.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c index c944b17d0fc0..8ec5ed192b5d 100644 --- a/net/mac80211/ieee80211.c +++ b/net/mac80211/ieee80211.c | |||
| @@ -1650,6 +1650,7 @@ static int ieee80211_master_start_xmit(struct sk_buff *skb, | |||
| 1650 | if (skb_headroom(skb) < headroom) { | 1650 | if (skb_headroom(skb) < headroom) { |
| 1651 | if (pskb_expand_head(skb, headroom, 0, GFP_ATOMIC)) { | 1651 | if (pskb_expand_head(skb, headroom, 0, GFP_ATOMIC)) { |
| 1652 | dev_kfree_skb(skb); | 1652 | dev_kfree_skb(skb); |
| 1653 | dev_put(odev); | ||
| 1653 | return 0; | 1654 | return 0; |
| 1654 | } | 1655 | } |
| 1655 | } | 1656 | } |