diff options
| author | John W. Linville | 2011-04-04 22:10:36 +0200 |
|---|---|---|
| committer | John W. Linville | 2011-04-04 22:10:36 +0200 |
| commit | 18d6a0f5b6693d630a8da9dfd6cac1ea4e5dccab (patch) | |
| tree | fe8405c00398b6b74d76c7dec61196732a4e33b1 /drivers/net/wireless/iwlwifi/iwl-5000.c | |
| parent | ath9k_hw: remove pCap->tx_triglevel_max (diff) | |
| parent | iwlagn: remove deprecated module parameters (diff) | |
| download | kernel-qcow2-linux-18d6a0f5b6693d630a8da9dfd6cac1ea4e5dccab.tar.gz kernel-qcow2-linux-18d6a0f5b6693d630a8da9dfd6cac1ea4e5dccab.tar.xz kernel-qcow2-linux-18d6a0f5b6693d630a8da9dfd6cac1ea4e5dccab.zip | |
Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-5000.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-5000.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c index 3ea31b659d1a..8cab3571047d 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c @@ -348,8 +348,6 @@ static struct iwl_lib_ops iwl5000_lib = { .txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl, .txq_inval_byte_cnt_tbl = iwlagn_txq_inval_byte_cnt_tbl, .txq_set_sched = iwlagn_txq_set_sched, - .txq_agg_enable = iwlagn_txq_agg_enable, - .txq_agg_disable = iwlagn_txq_agg_disable, .txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd, .txq_free_tfd = iwl_hw_txq_free_tfd, .txq_init = iwl_hw_tx_queue_init, @@ -416,8 +414,6 @@ static struct iwl_lib_ops iwl5150_lib = { .txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl, .txq_inval_byte_cnt_tbl = iwlagn_txq_inval_byte_cnt_tbl, .txq_set_sched = iwlagn_txq_set_sched, - .txq_agg_enable = iwlagn_txq_agg_enable, - .txq_agg_disable = iwlagn_txq_agg_disable, .txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd, .txq_free_tfd = iwl_hw_txq_free_tfd, .txq_init = iwl_hw_tx_queue_init, |