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

drivers/net/wireless/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@
		menuconfig WLAN
		bool "Wireless LAN"
		depends on !S390
		default y
		---help---
		This section contains all the pre 802.11 and 802.11 wireless
		device drivers. For a complete list of drivers and documentation

+4 −2

Original line number	Diff line number	Diff line
		@@ -327,7 +327,8 @@ static void ath9k_hw_ani_ofdm_err_trigger(struct ath_hw *ah)
		aniState->firstepLevel + 1);
		return;
		} else {
		if (conf->channel->band == IEEE80211_BAND_2GHZ) {
		if ((conf->channel->band == IEEE80211_BAND_2GHZ) &&
		!conf_is_ht(conf)) {
		if (!aniState->ofdmWeakSigDetectOff)
		ath9k_hw_ani_control(ah,
		ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
		@@ -369,7 +370,8 @@ static void ath9k_hw_ani_cck_err_trigger(struct ath_hw *ah)
		ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,
		aniState->firstepLevel + 1);
		} else {
		if (conf->channel->band == IEEE80211_BAND_2GHZ) {
		if ((conf->channel->band == IEEE80211_BAND_2GHZ) &&
		!conf_is_ht(conf)) {
		if (aniState->firstepLevel > 0)
		ath9k_hw_ani_control(ah,
		ATH9K_ANI_FIRSTEP_LEVEL, 0);

+3 −5

Original line number	Diff line number	Diff line
		@@ -2289,11 +2289,7 @@ static int b43_upload_microcode(struct b43_wldev *dev)
		err = -ENODEV;
		goto error;
		}
		msleep_interruptible(50);
		if (signal_pending(current)) {
		err = -EINTR;
		goto error;
		}
		msleep(50);
		}
		b43_read32(dev, B43_MMIO_GEN_IRQ_REASON); /* dummy read */

		@@ -4287,6 +4283,8 @@ static int b43_wireless_core_init(struct b43_wldev *dev)
		if (!dev->suspend_in_progress)
		b43_rng_init(wl);

		ieee80211_wake_queues(dev->wl->hw);

		b43_set_status(dev, B43_STAT_INITIALIZED);

		if (!dev->suspend_in_progress)

+2 −1

Original line number	Diff line number	Diff line
		@@ -875,15 +875,16 @@ void hostap_setup_dev(struct net_device dev, local_info_t local,

		switch(type) {
		case HOSTAP_INTERFACE_AP:
		dev->tx_queue_len = 0; /* use main radio device queue */
		dev->netdev_ops = &hostap_mgmt_netdev_ops;
		dev->type = ARPHRD_IEEE80211;
		dev->header_ops = &hostap_80211_ops;
		break;
		case HOSTAP_INTERFACE_MASTER:
		dev->tx_queue_len = 0; /* use main radio device queue */
		dev->netdev_ops = &hostap_master_ops;
		break;
		default:
		dev->tx_queue_len = 0; /* use main radio device queue */
		dev->netdev_ops = &hostap_netdev_ops;
		}

+1 −0