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

Commit 3d5c2032 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

parents 7da060c1 87f59c70

drivers/net/wireless/ath/ath6kl/cfg80211.c

+5 −3
Original line number Diff line number Diff line
@@ -2990,13 +2990,15 @@ static int ath6kl_change_station(struct wiphy *wiphy, struct net_device *dev, 
{

	struct ath6kl *ar = ath6kl_priv(dev);

	struct ath6kl_vif *vif = netdev_priv(dev);

	int err;



	if (vif->nw_type != AP_NETWORK)

		return -EOPNOTSUPP;



	/* Use this only for authorizing/unauthorizing a station */

	if (!(params->sta_flags_mask & BIT(NL80211_STA_FLAG_AUTHORIZED)))

		return -EOPNOTSUPP;

	err = cfg80211_check_station_change(wiphy, params,

					    CFG80211_STA_AP_MLME_CLIENT);

	if (err)

		return err;



	if (params->sta_flags_set & BIT(NL80211_STA_FLAG_AUTHORIZED))

		return ath6kl_wmi_ap_set_mlme(ar->wmi, vif->fw_vif_idx,

drivers/net/wireless/iwlegacy/3945.h

+0 −4
Original line number Diff line number Diff line
@@ -150,10 +150,6 @@ struct il3945_frame { 
	struct list_head list;

};



#define SEQ_TO_SN(seq) (((seq) & IEEE80211_SCTL_SEQ) >> 4)

#define SN_TO_SEQ(ssn) (((ssn) << 4) & IEEE80211_SCTL_SEQ)

#define MAX_SN ((IEEE80211_SCTL_SEQ) >> 4)



#define SUP_RATE_11A_MAX_NUM_CHANNELS  8

#define SUP_RATE_11B_MAX_NUM_CHANNELS  4

#define SUP_RATE_11G_MAX_NUM_CHANNELS  12

drivers/net/wireless/iwlegacy/4965-mac.c

+7 −6
Original line number Diff line number Diff line
@@ -2258,7 +2258,7 @@ il4965_tx_agg_start(struct il_priv *il, struct ieee80211_vif *vif, 


	spin_lock_irqsave(&il->sta_lock, flags);

	tid_data = &il->stations[sta_id].tid[tid];

	*ssn = SEQ_TO_SN(tid_data->seq_number);

	*ssn = IEEE80211_SEQ_TO_SN(tid_data->seq_number);

	tid_data->agg.txq_id = txq_id;

	il_set_swq_id(&il->txq[txq_id], il4965_get_ac_from_tid(tid), txq_id);

	spin_unlock_irqrestore(&il->sta_lock, flags);
@@ -2408,7 +2408,7 @@ il4965_txq_check_empty(struct il_priv *il, int sta_id, u8 tid, int txq_id) 
		/* aggregated HW queue */

		if (txq_id == tid_data->agg.txq_id &&

		    q->read_ptr == q->write_ptr) {

			u16 ssn = SEQ_TO_SN(tid_data->seq_number);

			u16 ssn = IEEE80211_SEQ_TO_SN(tid_data->seq_number);

			int tx_fifo = il4965_get_fifo_from_tid(tid);

			D_HT("HW queue empty: continue DELBA flow\n");

			il4965_txq_agg_disable(il, txq_id, ssn, tx_fifo);
@@ -2627,7 +2627,8 @@ il4965_get_ra_sta_id(struct il_priv *il, struct ieee80211_hdr *hdr) 
static inline u32

il4965_get_scd_ssn(struct il4965_tx_resp *tx_resp)

{

	return le32_to_cpup(&tx_resp->u.status + tx_resp->frame_count) & MAX_SN;

	return le32_to_cpup(&tx_resp->u.status +

			    tx_resp->frame_count) & IEEE80211_MAX_SN;

}



static inline u32
@@ -2717,15 +2718,15 @@ il4965_tx_status_reply_tx(struct il_priv *il, struct il_ht_agg *agg, 
			hdr = (struct ieee80211_hdr *) skb->data;



			sc = le16_to_cpu(hdr->seq_ctrl);

			if (idx != (SEQ_TO_SN(sc) & 0xff)) {

			if (idx != (IEEE80211_SEQ_TO_SN(sc) & 0xff)) {

				IL_ERR("BUG_ON idx doesn't match seq control"

				       " idx=%d, seq_idx=%d, seq=%d\n", idx,

				       SEQ_TO_SN(sc), hdr->seq_ctrl);

				       IEEE80211_SEQ_TO_SN(sc), hdr->seq_ctrl);

				return -1;

			}



			D_TX_REPLY("AGG Frame i=%d idx %d seq=%d\n", i, idx,

				   SEQ_TO_SN(sc));

				   IEEE80211_SEQ_TO_SN(sc));



			sh = idx - start;

			if (sh > 64) {

drivers/net/wireless/iwlegacy/common.h

+0 −4
Original line number Diff line number Diff line
@@ -541,10 +541,6 @@ struct il_frame { 
	struct list_head list;

};



#define SEQ_TO_SN(seq) (((seq) & IEEE80211_SCTL_SEQ) >> 4)

#define SN_TO_SEQ(ssn) (((ssn) << 4) & IEEE80211_SCTL_SEQ)

#define MAX_SN ((IEEE80211_SCTL_SEQ) >> 4)



enum {

	CMD_SYNC = 0,

	CMD_SIZE_NORMAL = 0,

drivers/net/wireless/iwlwifi/dvm/mac80211.c

+2 −1
Original line number Diff line number Diff line
@@ -1137,7 +1137,8 @@ done: 
static int iwlagn_mac_remain_on_channel(struct ieee80211_hw *hw,

				     struct ieee80211_vif *vif,

				     struct ieee80211_channel *channel,

				     int duration)

				     int duration,

				     enum ieee80211_roc_type type)

{

	struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);

	struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_PAN];