diff options
| author |   David S. Miller <davem@davemloft.net> | 2009-05-08 02:48:30 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-08 02:48:30 -0700 |
| commit | 22f6dacdfcfdc792d068e9c41234808860498d04 (patch) | |
| tree | 281a7d476f256ea3e2f800177ba685b169cc0540 /net/wireless/scan.c | |
| parent | smsc911x: fix calculation of res_size for ioremap (diff) | |
| parent | net: remove stale reference to fastroute from Kconfig help text (diff) | |
| download | linux-dev-22f6dacdfcfdc792d068e9c41234808860498d04.tar.xz linux-dev-22f6dacdfcfdc792d068e9c41234808860498d04.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
include/net/tcp.h
Diffstat (limited to 'net/wireless/scan.c')
| -rw-r--r-- | net/wireless/scan.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 723aeb3d9462..dfb53d19fd77 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -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; } } } |