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

Commit 61a3d4f9 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

parents db906eb2 1bd3fa7b

drivers/bcma/host_pci.c

+1 −0
Original line number Diff line number Diff line
@@ -282,6 +282,7 @@ static const struct pci_device_id bcma_pci_bridge_tbl[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43a9) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43aa) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43227) },	/* 0xA8DB */

	{ 0, },

};

MODULE_DEVICE_TABLE(pci, bcma_pci_bridge_tbl);

drivers/net/wireless/at76c50x-usb.c

+1 −2
Original line number Diff line number Diff line
@@ -2423,8 +2423,6 @@ static void at76_delete_device(struct at76_priv *priv) 


	kfree_skb(priv->rx_skb);



	usb_put_dev(priv->udev);



	at76_dbg(DBG_PROC_ENTRY, "%s: before freeing priv/ieee80211_hw",

		 __func__);

	ieee80211_free_hw(priv->hw);
@@ -2558,6 +2556,7 @@ static void at76_disconnect(struct usb_interface *interface) 


	wiphy_info(priv->hw->wiphy, "disconnecting\n");

	at76_delete_device(priv);

	usb_put_dev(priv->udev);

	dev_info(&interface->dev, "disconnected\n");

}

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

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ static ssize_t write_file_spec_scan_ctl(struct file *file, 


	if (strncmp("trigger", buf, 7) == 0) {

		ath9k_spectral_scan_trigger(sc->hw);

	} else if (strncmp("background", buf, 9) == 0) {

	} else if (strncmp("background", buf, 10) == 0) {

		ath9k_spectral_scan_config(sc->hw, SPECTRAL_BACKGROUND);

		ath_dbg(common, CONFIG, "spectral scan: background mode enabled\n");

	} else if (strncmp("chanscan", buf, 8) == 0) {

drivers/net/wireless/iwlwifi/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ config IWLWIFI_LEDS 


config IWLDVM

	tristate "Intel Wireless WiFi DVM Firmware support"

	depends on m

	default IWLWIFI

	help

	  This is the driver that supports the DVM firmware which is
@@ -60,7 +59,6 @@ config IWLDVM 


config IWLMVM

	tristate "Intel Wireless WiFi MVM Firmware support"

	depends on m

	help

	  This is the driver that supports the MVM firmware which is

	  currently only available for 7260 and 3160 devices.

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

+12 −0
Original line number Diff line number Diff line
@@ -1068,6 +1068,13 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx) 
	/* recalculate basic rates */

	iwl_calc_basic_rates(priv, ctx);



	/*

	 * force CTS-to-self frames protection if RTS-CTS is not preferred

	 * one aggregation protection method

	 */

	if (!priv->hw_params.use_rts_for_aggregation)

		ctx->staging.flags |= RXON_FLG_SELF_CTS_EN;



	if ((ctx->vif && ctx->vif->bss_conf.use_short_slot) ||

	    !(ctx->staging.flags & RXON_FLG_BAND_24G_MSK))

		ctx->staging.flags |= RXON_FLG_SHORT_SLOT_MSK;
@@ -1473,6 +1480,11 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw, 
	else

		ctx->staging.flags &= ~RXON_FLG_TGG_PROTECT_MSK;



	if (bss_conf->use_cts_prot)

		ctx->staging.flags |= RXON_FLG_SELF_CTS_EN;

	else

		ctx->staging.flags &= ~RXON_FLG_SELF_CTS_EN;



	memcpy(ctx->staging.bssid_addr, bss_conf->bssid, ETH_ALEN);



	if (vif->type == NL80211_IFTYPE_AP ||