diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-07-12 23:21:48 +0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-07-12 23:21:48 +0400 |
commit | 8a50ace27134c8ef2b9ca4c47dd91cb733f52a53 (patch) | |
tree | cb43f5d627f53645dc19b3a70ef0d0cf0263a684 /drivers/net/wireless/iwlwifi/dvm/main.c | |
parent | d07d152892aadd8dc3209ecef6788dfc83475676 (diff) | |
parent | 3ec4588231914344834805a6828551cd5c65afd8 (diff) | |
download | linux-8a50ace27134c8ef2b9ca4c47dd91cb733f52a53.tar.xz |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/main.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/main.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c index 612f05d757db..84d3db5aa506 100644 --- a/drivers/net/wireless/iwlwifi/dvm/main.c +++ b/drivers/net/wireless/iwlwifi/dvm/main.c @@ -1232,7 +1232,6 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, struct iwl_trans_config trans_cfg; static const u8 no_reclaim_cmds[] = { REPLY_RX_PHY_CMD, - REPLY_RX, REPLY_RX_MPDU_CMD, REPLY_COMPRESSED_BA, STATISTICS_NOTIFICATION, |