Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7573eac7 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

parents a6d27d2a 4efe7f51

net/mac80211/status.c

+2 −2
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb) 
				skb2 = skb_clone(skb, GFP_ATOMIC);

				if (skb2) {

					skb2->dev = prev_dev;

					netif_receive_skb(skb2);

					netif_rx(skb2);

				}

			}
@@ -386,7 +386,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb) 
	}

	if (prev_dev) {

		skb->dev = prev_dev;

		netif_receive_skb(skb);

		netif_rx(skb);

		skb = NULL;

	}

	rcu_read_unlock();