diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-08 05:48:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-08 05:48:30 -0400 |
| commit | 22f6dacdfcfdc792d068e9c41234808860498d04 (patch) | |
| tree | 281a7d476f256ea3e2f800177ba685b169cc0540 /net/wireless/scan.c | |
| parent | 928f308f556f4943e50c5064b546f47bce301f02 (diff) | |
| parent | 9b05126baa146fc3f41360164141d4e1b3ea93c4 (diff) | |
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, | |||
| 395 | memcpy(ies, res->pub.information_elements, ielen); | 395 | memcpy(ies, res->pub.information_elements, ielen); |
| 396 | found->ies_allocated = true; | 396 | found->ies_allocated = true; |
| 397 | found->pub.information_elements = ies; | 397 | found->pub.information_elements = ies; |
| 398 | found->pub.len_information_elements = ielen; | ||
| 398 | } | 399 | } |
| 399 | } | 400 | } |
| 400 | } | 401 | } |