diff options
| author |   David S. Miller <davem@davemloft.net> | 2011-01-27 16:00:37 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-27 16:00:37 -0800 |
| commit | 8571a19c4ac140f1a507f3e7eb716892afa27109 (patch) | |
| tree | 55ef6a0ab68d6388177d3290a7fd6bc3f12a381f /drivers/net/wireless/mac80211_hwsim.c | |
| parent | sungem: Use net_device's internal stats (diff) | |
| parent | ath9k: fix misplaced debug code (diff) | |
| download | linux-dev-8571a19c4ac140f1a507f3e7eb716892afa27109.tar.xz linux-dev-8571a19c4ac140f1a507f3e7eb716892afa27109.zip | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/mac80211_hwsim.c')
| -rw-r--r-- | drivers/net/wireless/mac80211_hwsim.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index 454f045ddff3..5d39b2840584 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c @@ -943,7 +943,8 @@ static int mac80211_hwsim_testmode_cmd(struct ieee80211_hw *hw, static int mac80211_hwsim_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif, enum ieee80211_ampdu_mlme_action action, - struct ieee80211_sta *sta, u16 tid, u16 *ssn) + struct ieee80211_sta *sta, u16 tid, u16 *ssn, + u8 buf_size) { switch (action) { case IEEE80211_AMPDU_TX_START: |