From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 6 Dec 2013 14:50:45 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
X-Git-Tag: v3.14-rc1~94^2~482^2^2~44
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e08fd975bf26aa8063cadd245817e042f570472d;p=platform%2Fkernel%2Flinux-stable.git

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

Conflicts:
	drivers/net/wireless/brcm80211/Kconfig
	net/mac80211/util.c
---

e08fd975bf26aa8063cadd245817e042f570472d
diff --cc drivers/net/wireless/brcm80211/Kconfig
index 5791857,54e36fc..fcfed6b
--- a/drivers/net/wireless/brcm80211/Kconfig
+++ b/drivers/net/wireless/brcm80211/Kconfig
@@@ -4,10 -4,13 +4,12 @@@ config BRCMUTI
  config BRCMSMAC
  	tristate "Broadcom IEEE802.11n PCIe SoftMAC WLAN driver"
  	depends on MAC80211
 -	depends on BCMA
 +	depends on BCMA_POSSIBLE
 +	select BCMA
+ 	select NEW_LEDS if BCMA_DRIVER_GPIO
+ 	select LEDS_CLASS if BCMA_DRIVER_GPIO
  	select BRCMUTIL
  	select FW_LOADER
 -	select CRC_CCITT
 -	select CRC8
  	select CORDIC
  	---help---
  	  This module adds support for PCIe wireless adapters based on Broadcom
diff --cc net/mac80211/util.c
index 06265d7,9f9b9bd..875e172
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@@ -2481,13 -2457,9 +2479,8 @@@ int ieee80211_send_action_csa(struct ie
  			  WLAN_EID_CHAN_SWITCH_PARAM_TX_RESTRICT : 0x00;
  		put_unaligned_le16(WLAN_REASON_MESH_CHAN, pos); /* Reason Cd */
  		pos += 2;
- 		if (!ifmsh->pre_value)
- 			ifmsh->pre_value = 1;
- 		else
- 			ifmsh->pre_value++;
 -		pre_value = cpu_to_le16(ifmsh->pre_value);
 -		memcpy(pos, &pre_value, 2);		/* Precedence Value */
 +		put_unaligned_le16(ifmsh->pre_value, pos);/* Precedence Value */
  		pos += 2;
- 		ifmsh->chsw_init = true;
  	}
  
  	ieee80211_tx_skb(sdata, skb);