diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2009-04-01 11:58:36 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-04-22 22:54:39 +0200 |
| commit | de95a54b1aebe5592cae971ca5e5d9ec6a381a17 (patch) | |
| tree | 55a622d1e61e73cd6426c5e0643ac9fd117a9fe8 /net/wireless/nl80211.c | |
| parent | cfg80211: introduce scan IE limit attribute (diff) | |
| download | linux-de95a54b1aebe5592cae971ca5e5d9ec6a381a17.tar.xz linux-de95a54b1aebe5592cae971ca5e5d9ec6a381a17.zip | |
mac80211: pass all probe request IEs to driver
Instead of just passing the cfg80211-requested IEs, pass
the locally generated ones as well.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to '')
| -rw-r--r-- | net/wireless/nl80211.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 447fa1790b4e..68c51022e9dd 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -2597,7 +2597,8 @@ static int nl80211_trigger_scan(struct sk_buff *skb, struct genl_info *info) if (info->attrs[NL80211_ATTR_IE]) { request->ie_len = nla_len(info->attrs[NL80211_ATTR_IE]); - memcpy(request->ie, nla_data(info->attrs[NL80211_ATTR_IE]), + memcpy((void *)request->ie, + nla_data(info->attrs[NL80211_ATTR_IE]), request->ie_len); } |