diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-03-04 19:10:40 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-03-04 19:10:40 (GMT) |
| commit | 85a7045a90052749885e166f40af5e9140032287 (patch) | |
| tree | cb4702d50bbe1d10ab9320ad3f63323b817727f7 /drivers/net/wireless/wl12xx/init.c | |
| parent | 29546a6404e3a4b5d13f0a9586eb5cf1c3b25167 (diff) | |
| parent | e46395a4b3d32d161d8b6d8e4a002972b1faae3e (diff) | |
| download | linux-fsl-qoriq-85a7045a90052749885e166f40af5e9140032287.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
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 62dc983..6072fe4 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) static int wl1271_set_ba_policies(struct wl1271 *wl) { u8 tid_index; - u8 ret = 0; + int ret = 0; /* Reset the BA RX indicators */ wl->ba_rx_bitmap = 0; |