Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 (b7e03ec9) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/net/wireless/hostap/hostap_main.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -891,7 +891,6 @@ void hostap_setup_dev(struct net_device dev, local_info_t local,

		SET_ETHTOOL_OPS(dev, &prism2_ethtool_ops);

		netif_stop_queue(dev);
		}

		static int hostap_enable_hostapd(local_info_t *local, int rtnl_locked)

drivers/net/wireless/rt2x00/rt2800pci.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -912,6 +912,7 @@ static int rt2800pci_probe_hw(struct rt2x00_dev *rt2x00dev)
		__set_bit(DRIVER_REQUIRE_DMA, &rt2x00dev->flags);
		__set_bit(DRIVER_REQUIRE_L2PAD, &rt2x00dev->flags);
		__set_bit(DRIVER_REQUIRE_TXSTATUS_FIFO, &rt2x00dev->flags);
		__set_bit(DRIVER_REQUIRE_TASKLET_CONTEXT, &rt2x00dev->flags);
		if (!modparam_nohwcrypt)
		__set_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags);
		__set_bit(DRIVER_SUPPORT_LINK_TUNING, &rt2x00dev->flags);

drivers/net/wireless/rt2x00/rt2x00.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -664,6 +664,7 @@ enum rt2x00_flags {
		DRIVER_REQUIRE_COPY_IV,
		DRIVER_REQUIRE_L2PAD,
		DRIVER_REQUIRE_TXSTATUS_FIFO,
		DRIVER_REQUIRE_TASKLET_CONTEXT,

		/*
		* Driver features

drivers/net/wireless/rt2x00/rt2x00dev.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -390,9 +390,12 @@ void rt2x00lib_txdone(struct queue_entry *entry,
		* through a mac80211 library call (RTS/CTS) then we should not
		* send the status report back.
		*/
		if (!(skbdesc_flags & SKBDESC_NOT_MAC80211))
		if (!(skbdesc_flags & SKBDESC_NOT_MAC80211)) {
		if (test_bit(DRIVER_REQUIRE_TASKLET_CONTEXT, &rt2x00dev->flags))
		ieee80211_tx_status(rt2x00dev->hw, entry->skb);
		else
		ieee80211_tx_status_ni(rt2x00dev->hw, entry->skb);
		} else
		dev_kfree_skb_any(entry->skb);

		/*

include/net/mac80211.h

+24 −4

Original line number	Diff line number	Diff line
		@@ -2024,8 +2024,8 @@ static inline void ieee80211_rx_ni(struct ieee80211_hw *hw,
		*
		* This function may not be called in IRQ context. Calls to this function
		* for a single hardware must be synchronized against each other. Calls
		* to this function and ieee80211_tx_status_irqsafe() may not be mixed
		* for a single hardware.
		* to this function, ieee80211_tx_status_ni() and ieee80211_tx_status_irqsafe()
		* may not be mixed for a single hardware.
		*
		* @hw: the hardware the frame was transmitted by
		* @skb: the frame that was transmitted, owned by mac80211 after this call
		@@ -2033,14 +2033,34 @@ static inline void ieee80211_rx_ni(struct ieee80211_hw *hw,
		void ieee80211_tx_status(struct ieee80211_hw *hw,
		struct sk_buff *skb);

		/**
		* ieee80211_tx_status_ni - transmit status callback (in process context)
		*
		* Like ieee80211_tx_status() but can be called in process context.
		*
		* Calls to this function, ieee80211_tx_status() and
		* ieee80211_tx_status_irqsafe() may not be mixed
		* for a single hardware.
		*
		* @hw: the hardware the frame was transmitted by
		* @skb: the frame that was transmitted, owned by mac80211 after this call
		*/
		static inline void ieee80211_tx_status_ni(struct ieee80211_hw *hw,
		struct sk_buff *skb)
		{
		local_bh_disable();
		ieee80211_tx_status(hw, skb);
		local_bh_enable();
		}

		/**
		* ieee80211_tx_status_irqsafe - IRQ-safe transmit status callback
		*
		* Like ieee80211_tx_status() but can be called in IRQ context
		* (internally defers to a tasklet.)
		*
		* Calls to this function and ieee80211_tx_status() may not be mixed for a
		* single hardware.
		* Calls to this function, ieee80211_tx_status() and
		* ieee80211_tx_status_ni() may not be mixed for a single hardware.
		*
		* @hw: the hardware the frame was transmitted by
		* @skb: the frame that was transmitted, owned by mac80211 after this call