diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-09-21 15:49:14 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-09-21 15:49:14 -0400 |
| commit | b618f6f885579a6237e5bf4582fa6167972ddef4 (patch) | |
| tree | b11508178570b98ce9cb2d76ecebd046a6f0e77c /drivers/net/wireless/iwlwifi/iwl-6000.c | |
| parent | 462fb2af9788a82a534f8184abfde31574e1cfa0 (diff) | |
| parent | 6e5c2b4e8addfaab8ef54dedaf7b607e1585c35b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
arch/arm/mach-omap2/board-omap3pandora.c
drivers/net/wireless/ath/ath5k/base.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-6000.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-6000.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c index 2fdba088bd27..9f43f2770c96 100644 --- a/drivers/net/wireless/iwlwifi/iwl-6000.c +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c | |||
| @@ -329,6 +329,7 @@ static struct iwl_lib_ops iwl6000_lib = { | |||
| 329 | .tx_stats_read = iwl_ucode_tx_stats_read, | 329 | .tx_stats_read = iwl_ucode_tx_stats_read, |
| 330 | .general_stats_read = iwl_ucode_general_stats_read, | 330 | .general_stats_read = iwl_ucode_general_stats_read, |
| 331 | .bt_stats_read = iwl_ucode_bt_stats_read, | 331 | .bt_stats_read = iwl_ucode_bt_stats_read, |
| 332 | .reply_tx_error = iwl_reply_tx_error_read, | ||
| 332 | }, | 333 | }, |
| 333 | .recover_from_tx_stall = iwl_bg_monitor_recover, | 334 | .recover_from_tx_stall = iwl_bg_monitor_recover, |
| 334 | .check_plcp_health = iwl_good_plcp_health, | 335 | .check_plcp_health = iwl_good_plcp_health, |
| @@ -404,6 +405,7 @@ static struct iwl_lib_ops iwl6000g2b_lib = { | |||
| 404 | .tx_stats_read = iwl_ucode_tx_stats_read, | 405 | .tx_stats_read = iwl_ucode_tx_stats_read, |
| 405 | .general_stats_read = iwl_ucode_general_stats_read, | 406 | .general_stats_read = iwl_ucode_general_stats_read, |
| 406 | .bt_stats_read = iwl_ucode_bt_stats_read, | 407 | .bt_stats_read = iwl_ucode_bt_stats_read, |
| 408 | .reply_tx_error = iwl_reply_tx_error_read, | ||
| 407 | }, | 409 | }, |
| 408 | .recover_from_tx_stall = iwl_bg_monitor_recover, | 410 | .recover_from_tx_stall = iwl_bg_monitor_recover, |
| 409 | .check_plcp_health = iwl_good_plcp_health, | 411 | .check_plcp_health = iwl_good_plcp_health, |