diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-09 20:13:23 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-09 20:13:23 +0200 |
| commit | 327723edebbbd621ed35b0d63073685eb225563e (patch) | |
| tree | 5983bf544284c4bd11028e198c937f86be358dc4 /drivers/net/wireless/iwlwifi/iwl-3945.c | |
| parent | ipmr: dont corrupt lists (diff) | |
| parent | mac80211: fix deauth before assoc (diff) | |
| download | linux-327723edebbbd621ed35b0d63073685eb225563e.tar.xz linux-327723edebbbd621ed35b0d63073685eb225563e.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-3945.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c index 068f7f8435c5..c44a303e62ed 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.c +++ b/drivers/net/wireless/iwlwifi/iwl-3945.c @@ -2852,6 +2852,7 @@ static struct iwl_lib_ops iwl3945_lib = { .isr = iwl_isr_legacy, .config_ap = iwl3945_config_ap, .manage_ibss_station = iwl3945_manage_ibss_station, + .recover_from_tx_stall = iwl_bg_monitor_recover, .check_plcp_health = iwl3945_good_plcp_health, .debugfs_ops = { |