diff options
| author | Ioana Ciornei <ciorneiioana@gmail.com> | 2015-03-18 13:26:05 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-20 12:11:45 (GMT) |
| commit | 7078db9dffde19f4ea82acb0c2d8a9f81531e15a (patch) | |
| tree | 479cc83cd7bc7117eb72a1b780c1ea2419e42287 /drivers/staging/wlan-ng | |
| parent | ec523735e4a9969e5469c93c87a25a92f619f118 (diff) | |
| download | linux-7078db9dffde19f4ea82acb0c2d8a9f81531e15a.tar.xz | |
staging: prism2sta: Replace memcpy with ether_add_copy
Replace memcpy() with ether_addr_copy() since addresses are __aligned(2).
The 2 structures are aligned to u16 as showed below:
typedef struct hfa384x_authenticateStation_data {
u8 address[ETH_ALEN]; /* 0 6 */
u16 status; /* 6 2 */
u16 algorithm; /* 8 2 */
} __packed hfa384x_authenticateStation_data_t;
Total size: 10
typedef struct hfa384x_AuthRequest {
u8 sta_addr[ETH_ALEN]; /* 0 6 */
u16 algorithm; /* 6 2 */
} __packed hfa384x_AuthReq_t;
Total size: 8
Signed-off-by: Ioana Ciornei <ciorneiioana@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wlan-ng')
| -rw-r--r-- | drivers/staging/wlan-ng/prism2sta.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c index 854571f..ddb294e 100644 --- a/drivers/staging/wlan-ng/prism2sta.c +++ b/drivers/staging/wlan-ng/prism2sta.c @@ -59,6 +59,7 @@ #include <linux/netdevice.h> #include <linux/workqueue.h> #include <linux/byteorder/generic.h> +#include <linux/etherdevice.h> #include <linux/io.h> #include <linux/delay.h> @@ -1544,7 +1545,7 @@ static void prism2sta_inf_authreq_defer(wlandevice_t *wlandev, ** authentication. */ - memcpy(rec.address, inf->info.authreq.sta_addr, ETH_ALEN); + ether_addr_copy(rec.address, inf->info.authreq.sta_addr); rec.status = P80211ENUM_status_unspec_failure; /* @@ -1657,8 +1658,8 @@ static void prism2sta_inf_authreq_defer(wlandevice_t *wlandev, if (hw->authlist.cnt >= WLAN_AUTH_MAX) { rec.status = P80211ENUM_status_ap_full; } else { - memcpy(hw->authlist.addr[hw->authlist.cnt], - rec.address, ETH_ALEN); + ether_addr_copy(hw->authlist.addr[hw->authlist.cnt], + rec.address); hw->authlist.cnt++; added = 1; } |