diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-08-28 10:36:09 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-08-28 10:36:09 -0400 |
| commit | b35c809708ad245a36bef94d6fb1e83f6ab850aa (patch) | |
| tree | c6dc6580546c9a5997eae06c8409f986c383d2a4 /drivers/net/wireless/hostap/hostap_ioctl.c | |
| parent | 6e956da2027c767859128b9bfef085cf2a8e233b (diff) | |
| parent | 19c361608ce3e73f352e323262f7e0a8264be3af (diff) | |
| download | blackbird-op-linux-b35c809708ad245a36bef94d6fb1e83f6ab850aa.tar.gz blackbird-op-linux-b35c809708ad245a36bef94d6fb1e83f6ab850aa.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/iwlwifi/pcie/trans.c
net/mac80211/ibss.c
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_ioctl.c')
| -rw-r--r-- | drivers/net/wireless/hostap/hostap_ioctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c index ac074731335a..e5090309824e 100644 --- a/drivers/net/wireless/hostap/hostap_ioctl.c +++ b/drivers/net/wireless/hostap/hostap_ioctl.c @@ -523,9 +523,9 @@ static int prism2_ioctl_giwaplist(struct net_device *dev, data->length = prism2_ap_get_sta_qual(local, addr, qual, IW_MAX_AP, 1); - memcpy(extra, &addr, sizeof(struct sockaddr) * data->length); + memcpy(extra, addr, sizeof(struct sockaddr) * data->length); data->flags = 1; /* has quality information */ - memcpy(extra + sizeof(struct sockaddr) * data->length, &qual, + memcpy(extra + sizeof(struct sockaddr) * data->length, qual, sizeof(struct iw_quality) * data->length); kfree(addr); |
