projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 071d499 a877836)
Merge remote-tracking branch 'iwlwifi-fixes/master' into HEAD
authorJohannes Berg <johannes.berg@intel.com>
Mon, 27 May 2013 11:30:49 +0000 (13:30 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 27 May 2013 11:30:49 +0000 (13:30 +0200)
Conflicts:
drivers/net/wireless/iwlwifi/mvm/ops.c

1  2 
drivers/net/wireless/iwlwifi/mvm/fw-api.h patch | diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/mvm/mac80211.c patch | diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/mvm/mvm.h patch | diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/mvm/ops.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/wireless/iwlwifi/mvm/ops.c
index e3f69a08251d7f5101cac0642b4a40e7a594a3c6,b29c31a41594ecbfd66989e0eaaa020758007aac..7998baca5a8b73707e873e87a514077be1883725
--- 1/drivers/net/wireless/iwlwifi/mvm/ops.c
--- 2/drivers/net/wireless/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/iwlwifi/mvm/ops.c
@@@ -292,7 -292,7 +292,8 @@@ static const char *iwl_mvm_cmd_strings[
        CMD(BT_COEX_PROT_ENV),
        CMD(BT_PROFILE_NOTIFICATION),
        CMD(BT_CONFIG),
+       CMD(MCAST_FILTER_CMD),
 +      CMD(REPLY_BEACON_FILTERING_CMD),
  };
  #undef CMD