xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Browse Source 
Conflicts:
	arch/arm/mach-omap2/board-omap3pandora.c
	drivers/net/wireless/ath/ath5k/base.c
This commit is contained in:
John W. Linville
2010-09-21 15:49:14 -04:00
parent 462fb2af97 6e5c2b4e8a
commit b618f6f885
155 changed files with 17206 additions and 3270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/libertas/cfg.c
View File

@@ -481,7 +481,6 @@ static int lbs_ret_scan(struct lbs_private *priv, unsigned long dummy,
struct cmd_ds_802_11_scan_rsp *scanresp = (void *)resp;
int bsssize;
const u8 *pos;
u16 nr_sets;
const u8 *tsfdesc;
int tsfsize;
int i;
@@ -490,12 +489,11 @@ static int lbs_ret_scan(struct lbs_private *priv, unsigned long dummy,
lbs_deb_enter(LBS_DEB_CFG80211);
bsssize = get_unaligned_le16(&scanresp->bssdescriptsize);
nr_sets = le16_to_cpu(scanresp->nr_sets);
lbs_deb_scan("scan response: %d BSSs (%d bytes); resp size %d bytes\n",
nr_sets, bsssize, le16_to_cpu(resp->size));
scanresp->nr_sets, bsssize, le16_to_cpu(resp->size));
if (nr_sets == 0) {
if (scanresp->nr_sets == 0) {
ret = 0;
goto done;
}