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

Commit 4511a4a5 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'master-2014-10-08' of... 

Merge tag 'master-2014-10-08' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next



John W. Linville says:

====================
pull request: wireless-next 2014-10-09

Please pull this batch of fixes intended for the 3.18 stream!

Andrea Merello makes rtl818x_pci use a more reasonable transmission
rate for HW generated frames.

Fabian Frederick tweaks some kernel-doc bits to avoid warnings.

Larry Finger corrects a possible unaligned access in the rtlwifi code.

Marek Puzyniak avoids a kernel panic in ath9k_hw_reset.

Sujith Manoharan goes for the hat trick -- he fixes a smatch warning
in the shared ath code, he fixes a crash in ath9k, and he corrects
a sequence number assignment problem in ath9k too.

For ease of merging, I pulled the last bits of the wireless tree as well...

Please let me know if there are problems!
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3dab99e0 1fca350b

drivers/net/wireless/ath/ath9k/ath9k.h

+3 −1
Original line number Diff line number Diff line
@@ -294,7 +294,6 @@ struct ath_tx_control { 
 *  (axq_qnum).

 */

struct ath_tx {

	u16 seq_no;

	u32 txqsetup;

	spinlock_t txbuflock;

	struct list_head txbuf;
@@ -563,6 +562,7 @@ int ath_tx_init(struct ath_softc *sc, int nbufs); 
int ath_txq_update(struct ath_softc *sc, int qnum,

		   struct ath9k_tx_queue_info *q);

void ath_update_max_aggr_framelen(struct ath_softc *sc, int queue, int txop);

void ath_assign_seq(struct ath_common *common, struct sk_buff *skb);

int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,

		 struct ath_tx_control *txctl);

void ath_tx_cabq(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
@@ -592,6 +592,8 @@ void ath9k_release_buffered_frames(struct ieee80211_hw *hw, 
struct ath_vif {

	struct list_head list;



	u16 seq_no;



	/* BSS info */

	u8 bssid[ETH_ALEN];

	u16 aid;

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

+2 −10
Original line number Diff line number Diff line
@@ -144,16 +144,8 @@ static struct ath_buf *ath9k_beacon_generate(struct ieee80211_hw *hw, 
	mgmt_hdr->u.beacon.timestamp = avp->tsf_adjust;



	info = IEEE80211_SKB_CB(skb);

	if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) {

		/*

		 * TODO: make sure the seq# gets assigned properly (vs. other

		 * TX frames)

		 */

		struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

		sc->tx.seq_no += 0x10;

		hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);

		hdr->seq_ctrl |= cpu_to_le16(sc->tx.seq_no);

	}



	ath_assign_seq(common, skb);



	if (vif->p2p)

		ath9k_beacon_add_noa(sc, avp, skb);

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

+1 −0
Original line number Diff line number Diff line
@@ -464,6 +464,7 @@ static int ath9k_init_priv(struct ath9k_htc_priv *priv, 
		return -ENOMEM;



	ah->dev = priv->dev;

	ah->hw = priv->hw;

	ah->hw_version.devid = devid;

	ah->hw_version.usbdev = drv_info;

	ah->ah_flags |= AH_USE_EEPROM;

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

+1 −1
Original line number Diff line number Diff line
@@ -2332,7 +2332,7 @@ static void ath9k_remove_chanctx(struct ieee80211_hw *hw, 
		conf->def.chan->center_freq);



	ctx->assigned = false;

	ctx->hw_queue_base = -1;

	ctx->hw_queue_base = 0;

	ath_chanctx_event(sc, NULL, ATH_CHANCTX_EVENT_UNASSIGN);



	mutex_unlock(&sc->mutex);

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

+7 −1
Original line number Diff line number Diff line
@@ -54,6 +54,12 @@ static struct sk_buff *ath9k_build_tx99_skb(struct ath_softc *sc) 
	struct ieee80211_hdr *hdr;

	struct ieee80211_tx_info *tx_info;

	struct sk_buff *skb;

	struct ath_vif *avp;



	if (!sc->tx99_vif)

		return NULL;



	avp = (struct ath_vif *)sc->tx99_vif->drv_priv;



	skb = alloc_skb(len, GFP_KERNEL);

	if (!skb)
@@ -71,7 +77,7 @@ static struct sk_buff *ath9k_build_tx99_skb(struct ath_softc *sc) 
	memcpy(hdr->addr2, hw->wiphy->perm_addr, ETH_ALEN);

	memcpy(hdr->addr3, hw->wiphy->perm_addr, ETH_ALEN);



	hdr->seq_ctrl |= cpu_to_le16(sc->tx.seq_no);

	hdr->seq_ctrl |= cpu_to_le16(avp->seq_no);



	tx_info = IEEE80211_SKB_CB(skb);

	memset(tx_info, 0, sizeof(*tx_info));