lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Conflicts:
	include/net/tcp.h
This commit is contained in:
David S. Miller
2009-05-08 02:48:30 -07:00
parent 928f308f55 9b05126baa
commit 22f6dacdfc
32 changed files with 623 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
net/wireless/scan.c
View File

@ -395,6 +395,7 @@ cfg80211_bss_update(struct cfg80211_registered_device *dev,
memcpy(ies, res->pub.information_elements, ielen);
found->ies_allocated = true;
found->pub.information_elements = ies;
found->pub.len_information_elements = ielen;
}
}
}