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

Commit 94b10572 authored by David S. Miller's avatar David S. Miller
Browse files

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

parents b530fb69 4efe7f51

drivers/net/wireless/ath/ath9k/ani.c

+1 −1
Original line number Diff line number Diff line
@@ -543,7 +543,7 @@ static u8 ath9k_hw_chan_2_clockrate_mhz(struct ath_hw *ah) 
	if (conf_is_ht40(conf))

		return clockrate * 2;



	return clockrate * 2;

	return clockrate;

}



static int32_t ath9k_hw_ani_get_listen_time(struct ath_hw *ah)

net/mac80211/agg-tx.c

+2 −0
Original line number Diff line number Diff line
@@ -175,6 +175,8 @@ int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid, 


	set_bit(HT_AGG_STATE_STOPPING, &tid_tx->state);



	del_timer_sync(&tid_tx->addba_resp_timer);



	/*

	 * After this packets are no longer handed right through

	 * to the driver but are put onto tid_tx->pending instead,

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();