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

diff --cc drivers/net/wireless/iwlwifi/dvm/commands.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/mac80211.c
index dc50020,11dc7df..12337aa
--- 1/drivers/net/wireless/iwlwifi/mvm/mac80211.c
--- 2/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 |

diff --cc drivers/net/wireless/iwlwifi/pcie/tx.c
Simple merge