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

Commit 1eea72f0 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
parents 569943d0 f69727fd

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

+6 −3
Original line number Diff line number Diff line
@@ -1969,15 +1969,18 @@ static void ath_tx_txqaddbuf(struct ath_softc *sc, struct ath_txq *txq, 
static void ath_tx_send_normal(struct ath_softc *sc, struct ath_txq *txq,

			       struct ath_atx_tid *tid, struct sk_buff *skb)

{

	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);

	struct ath_frame_info *fi = get_frame_info(skb);

	struct list_head bf_head;

	struct ath_buf *bf;



	bf = fi->bf;

	struct ath_buf *bf = fi->bf;



	INIT_LIST_HEAD(&bf_head);

	list_add_tail(&bf->list, &bf_head);

	bf->bf_state.bf_type = 0;

	if (tid && (tx_info->flags & IEEE80211_TX_CTL_AMPDU)) {

		bf->bf_state.bf_type = BUF_AMPDU;

		ath_tx_addto_baw(sc, tid, bf);

	}



	bf->bf_next = NULL;

	bf->bf_lastbf = bf;

drivers/net/wireless/mwifiex/main.c

+4 −2
Original line number Diff line number Diff line
@@ -358,10 +358,12 @@ int mwifiex_main_process(struct mwifiex_adapter *adapter) 
		}

	} while (true);



	if ((adapter->int_status) || IS_CARD_RX_RCVD(adapter))

	spin_lock_irqsave(&adapter->main_proc_lock, flags);

	if ((adapter->int_status) || IS_CARD_RX_RCVD(adapter)) {

		spin_unlock_irqrestore(&adapter->main_proc_lock, flags);

		goto process_start;

	}



	spin_lock_irqsave(&adapter->main_proc_lock, flags);

	adapter->mwifiex_processing = false;

	spin_unlock_irqrestore(&adapter->main_proc_lock, flags);

drivers/net/wireless/rt2x00/rt2x00pci.c

+1 −8
Original line number Diff line number Diff line
@@ -105,13 +105,11 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct rt2x00_ops *ops) 
		goto exit_release_regions;

	}



	pci_enable_msi(pci_dev);



	hw = ieee80211_alloc_hw(sizeof(struct rt2x00_dev), ops->hw);

	if (!hw) {

		rt2x00_probe_err("Failed to allocate hardware\n");

		retval = -ENOMEM;

		goto exit_disable_msi;

		goto exit_release_regions;

	}



	pci_set_drvdata(pci_dev, hw);
@@ -152,9 +150,6 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct rt2x00_ops *ops) 
exit_free_device:

	ieee80211_free_hw(hw);



exit_disable_msi:

	pci_disable_msi(pci_dev);



exit_release_regions:

	pci_release_regions(pci_dev);
@@ -179,8 +174,6 @@ void rt2x00pci_remove(struct pci_dev *pci_dev) 
	rt2x00pci_free_reg(rt2x00dev);

	ieee80211_free_hw(hw);



	pci_disable_msi(pci_dev);



	/*

	 * Free the PCI device data.

	 */

net/mac80211/rx.c

+3 −0
Original line number Diff line number Diff line
@@ -3056,6 +3056,9 @@ static int prepare_for_handlers(struct ieee80211_rx_data *rx, 
	case NL80211_IFTYPE_ADHOC:

		if (!bssid)

			return 0;

		if (ether_addr_equal(sdata->vif.addr, hdr->addr2) ||

		    ether_addr_equal(sdata->u.ibss.bssid, hdr->addr2))

			return 0;

		if (ieee80211_is_beacon(hdr->frame_control)) {

			return 1;

		} else if (!ieee80211_bssid_match(bssid, sdata->u.ibss.bssid)) {

net/mac80211/util.c

+1 −4
Original line number Diff line number Diff line
@@ -2103,7 +2103,7 @@ int ieee80211_add_ext_srates_ie(struct ieee80211_sub_if_data *sdata, 
{

	struct ieee80211_local *local = sdata->local;

	struct ieee80211_supported_band *sband;

	int rate, skip, shift;

	int rate, shift;

	u8 i, exrates, *pos;

	u32 basic_rates = sdata->vif.bss_conf.basic_rates;

	u32 rate_flags;
@@ -2131,14 +2131,11 @@ int ieee80211_add_ext_srates_ie(struct ieee80211_sub_if_data *sdata, 
		pos = skb_put(skb, exrates + 2);

		*pos++ = WLAN_EID_EXT_SUPP_RATES;

		*pos++ = exrates;

		skip = 0;

		for (i = 8; i < sband->n_bitrates; i++) {

			u8 basic = 0;

			if ((rate_flags & sband->bitrates[i].flags)

			    != rate_flags)

				continue;

			if (skip++ < 8)

				continue;

			if (need_basic && basic_rates & BIT(i))

				basic = 0x80;

			rate = DIV_ROUND_UP(sband->bitrates[i].bitrate,