diff options
author | David S. Miller <davem@davemloft.net> | 2009-12-04 22:25:15 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-04 22:25:15 +0100 |
commit | 8f56874bd7e8bee73ed6a1cf80dcec2753616262 (patch) | |
tree | aebd15dea662ef5efd89402b8fd92fec540a98eb /drivers/net/wireless/rt2x00/rt2x00dev.c | |
parent | tcp: fix a timewait refcnt race (diff) | |
parent | iwmc3200wifi: Enable wimax core through module parameter (diff) | |
download | linux-8f56874bd7e8bee73ed6a1cf80dcec2753616262.tar.xz linux-8f56874bd7e8bee73ed6a1cf80dcec2753616262.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00dev.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00dev.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index 4a4b7e42fe6e..06c43ca39bf8 100644 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c @@ -684,6 +684,11 @@ static int rt2x00lib_probe_hw(struct rt2x00_dev *rt2x00dev) rt2x00dev->hw->queues = rt2x00dev->ops->tx_queues; /* + * Initialize extra TX headroom required. + */ + rt2x00dev->hw->extra_tx_headroom = rt2x00dev->ops->extra_tx_headroom; + + /* * Register HW. */ status = ieee80211_register_hw(rt2x00dev->hw); |