From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 29 May 2013 18:51:50 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802... 
X-Git-Tag: v3.11-rc1~16^2~103^2^2~41
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=933faa43ab9c1545c53ea082a8e4e1d1859568aa;p=linux.git

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

933faa43ab9c1545c53ea082a8e4e1d1859568aa
diff --cc drivers/net/wireless/iwlwifi/mvm/mac80211.c
index dc50020d746d,11dc7df8bdf9..12337aac2947
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@@ -170,13 -149,10 +161,10 @@@ int iwl_mvm_mac_setup_register(struct i
  
  	hw->sta_data_size = sizeof(struct iwl_mvm_sta);
  	hw->vif_data_size = sizeof(struct iwl_mvm_vif);
 -	hw->chanctx_data_size = sizeof(struct iwl_mvm_phy_ctxt);
 +	hw->chanctx_data_size = sizeof(u16);
  
  	hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
- 		BIT(NL80211_IFTYPE_P2P_CLIENT) |
- 		BIT(NL80211_IFTYPE_AP) |
- 		BIT(NL80211_IFTYPE_P2P_GO) |
- 		BIT(NL80211_IFTYPE_P2P_DEVICE);
+ 		BIT(NL80211_IFTYPE_AP);
  
  	hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY |
  			    WIPHY_FLAG_DISABLE_BEACON_HINTS |