diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-21 04:39:51 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-21 04:39:51 -0500 |
| commit | 198030782cedf25391e67e7c88b04f87a5eb6563 (patch) | |
| tree | 5b7368c6bf052bcb4bb273497a57900720d36f51 /net/mac80211/ht.c | |
| parent | 4ec71fa2d2c3f1040348f2604f4b8ccc833d1c2e (diff) | |
| parent | 92181f190b649f7ef2b79cbf5c00f26ccc66da2a (diff) | |
Merge branch 'x86/mm' into core/percpu
Conflicts:
arch/x86/mm/fault.c
Diffstat (limited to 'net/mac80211/ht.c')
| -rw-r--r-- | net/mac80211/ht.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c index 5f510a13b9f0..c5c0c5271096 100644 --- a/net/mac80211/ht.c +++ b/net/mac80211/ht.c | |||
| @@ -469,7 +469,7 @@ int ieee80211_start_tx_ba_session(struct ieee80211_hw *hw, u8 *ra, u16 tid) | |||
| 469 | struct ieee80211_sub_if_data *sdata; | 469 | struct ieee80211_sub_if_data *sdata; |
| 470 | u16 start_seq_num; | 470 | u16 start_seq_num; |
| 471 | u8 *state; | 471 | u8 *state; |
| 472 | int ret; | 472 | int ret = 0; |
| 473 | 473 | ||
| 474 | if ((tid >= STA_TID_NUM) || !(hw->flags & IEEE80211_HW_AMPDU_AGGREGATION)) | 474 | if ((tid >= STA_TID_NUM) || !(hw->flags & IEEE80211_HW_AMPDU_AGGREGATION)) |
| 475 | return -EINVAL; | 475 | return -EINVAL; |