diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-04 15:48:25 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-04 15:48:25 -0500 |
| commit | d72751ede1b9bf993d7bd3377305c8e9e36a3cc4 (patch) | |
| tree | 27abaa49de7ff666dbf6bbcb0d7bae2b9f029a2d /drivers/net/wireless/wl12xx/init.c | |
| parent | 0a0e9ae1bd788bc19adc4d4ae08c98b233697402 (diff) | |
| parent | 85a7045a90052749885e166f40af5e9140032287 (diff) | |
Merge branch 'for-davem' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/wl12xx/init.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/init.c b/drivers/net/wireless/wl12xx/init.c index 62dc9839dd3..6072fe45713 100644 --- a/drivers/net/wireless/wl12xx/init.c +++ b/drivers/net/wireless/wl12xx/init.c | |||
| @@ -483,7 +483,7 @@ static void wl1271_check_ba_support(struct wl1271 *wl) | |||
| 483 | static int wl1271_set_ba_policies(struct wl1271 *wl) | 483 | static int wl1271_set_ba_policies(struct wl1271 *wl) |
| 484 | { | 484 | { |
| 485 | u8 tid_index; | 485 | u8 tid_index; |
| 486 | u8 ret = 0; | 486 | int ret = 0; |
| 487 | 487 | ||
| 488 | /* Reset the BA RX indicators */ | 488 | /* Reset the BA RX indicators */ |
| 489 | wl->ba_rx_bitmap = 0; | 489 | wl->ba_rx_bitmap = 0; |