From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 26 Nov 2012 19:46:41 +0000 (-0500)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802... 
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=62c8003ecb973986958e9dade4a7e598349caf48;p=~shefty%2Frdma-dev.git

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
---

62c8003ecb973986958e9dade4a7e598349caf48
diff --cc drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index 769c134c661,b596ca4f22b..2044fdb5555
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@@ -3506,9 -3937,11 +3506,10 @@@ brcmf_cfg80211_start_ap(struct wiphy *w
  	s32 bssidx = 0;
  
  	WL_TRACE("channel_type=%d, beacon_interval=%d, dtim_period=%d,\n",
- 		 settings->channel_type, settings->beacon_interval,
+ 		 cfg80211_get_chandef_type(&settings->chandef),
+ 		 settings->beacon_interval,
  		 settings->dtim_period);
 -	WL_TRACE("ssid=%s(%d), auth_type=%d, inactivity_timeout=%d\n",
 +	WL_TRACE("ssid=%s(%zu), auth_type=%d, inactivity_timeout=%d\n",
  		 settings->ssid, settings->ssid_len, settings->auth_type,
  		 settings->inactivity_timeout);