diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-08-14 21:32:20 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-08-14 21:32:20 -0400 |
| commit | cd8d60f28f519786f00d64d68bb3b7669bdfbcb8 (patch) | |
| tree | 413685703c5d47aae38b51d673a31813907069dd /net/mac80211/ieee80211.c | |
| parent | 16f3051b166bde3f1bd741783b64a8feebdb6f00 (diff) | |
| parent | b9bf1e60a294fc7795d5198f94a917290e52865b (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, 0 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c index 8ec5ed192b5d..7286c389a4d0 100644 --- a/net/mac80211/ieee80211.c +++ b/net/mac80211/ieee80211.c | |||
| @@ -4678,7 +4678,6 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb, | |||
| 4678 | memset(skb->cb, 0, sizeof(skb->cb)); | 4678 | memset(skb->cb, 0, sizeof(skb->cb)); |
| 4679 | netif_rx(skb); | 4679 | netif_rx(skb); |
| 4680 | skb = skb2; | 4680 | skb = skb2; |
| 4681 | break; | ||
| 4682 | } | 4681 | } |
| 4683 | } | 4682 | } |
| 4684 | out: | 4683 | out: |