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

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:

	net/netfilter/nf_conntrack_proto_tcp.c
This commit is contained in:
David S. Miller
2008-07-14 20:23:54 -07:00
parent 4c88949800 9076689ab0
commit 2aec609fb4
22 changed files with 306 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/libertas/scan.c
View File

@@ -567,11 +567,11 @@ static int lbs_process_bss(struct bss_descriptor *bss,
pos += 8;
/* beacon interval is 2 bytes long */
bss->beaconperiod = le16_to_cpup((void *) pos);
bss->beaconperiod = get_unaligned_le16(pos);
pos += 2;
/* capability information is 2 bytes long */
bss->capability = le16_to_cpup((void *) pos);
bss->capability = get_unaligned_le16(pos);
lbs_deb_scan("process_bss: capabilities 0x%04x\n", bss->capability);
pos += 2;