From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 3 Jun 2013 19:55:37 +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~20
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=133eb82f0904049be96a8128b513e19e538fde5d;p=platform%2Fkernel%2Flinux-stable.git

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

133eb82f0904049be96a8128b513e19e538fde5d
diff --cc drivers/net/wireless/iwlwifi/mvm/mac80211.c
index 12337aa,dd158ec..dc50020
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@@ -161,10 -158,13 +170,13 @@@ 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_AP);
+ 		BIT(NL80211_IFTYPE_P2P_CLIENT) |
+ 		BIT(NL80211_IFTYPE_AP) |
+ 		BIT(NL80211_IFTYPE_P2P_GO) |
+ 		BIT(NL80211_IFTYPE_P2P_DEVICE);
  
  	hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY |
  			    WIPHY_FLAG_DISABLE_BEACON_HINTS |