staging: vt6656: fix Prefer ether_addr_copy() over memcpy() if the Ethernet addresses are __aligned(2)
PATCH 1/1 staging: vt6656: fix Prefer ether_addr_copy() over memcpy() if the Ethernet addresses are __aligned(2)
This patch fixes the following checkpatch.pl warning:
fix Prefer ether_addr_copy() over memcpy()
if the Ethernet addresses are __aligned(2)
Pahole showed that the 2 structs are aligned to u16
struct vnt_mic_hdr {
u8 id; /* 0 1 */
u8 tx_priority; /* 1 1 */
u8 mic_addr2[6]; /* 2 6 */
u8 ccmp_pn[6]; /* 8 6 */
__be16 payload_len; /* 14 2 */
__be16 hlen; /* 16 2 */
__le16 frame_control; /* 18 2 */
u8 addr1[6]; /* 20 6 */
u8 addr2[6]; /* 26 6 */
u8 addr3[6]; /* 32 6 */
__le16 seq_ctrl; /* 38 2 */
u8 addr4[6]; /* 40 6 */
u16 packing; /* 46 2 */ /* size: 48, cachelines: 1, members: 13 */
/* last cacheline: 48 bytes */
};struct ieee80211_hdr {
__le16 frame_control; /* 0 2 */
__le16 duration_id; /* 2 2 */
u8 addr1[6]; /* 4 6 */
u8 addr2[6]; /* 10 6 */
u8 addr3[6]; /* 16 6 */
__le16 seq_ctrl; /* 22 2 */
u8 addr4[6]; /* 24 6 */ /* size: 30, cachelines: 1, members: 7 */
/* last cacheline: 30 bytes */
};Signed-off-by Heba Aamer <[email protected]>
--- drivers/staging/vt6656/rxtx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/vt6656/rxtx.c +1 -1
@@ -738,7 +738,7 @@ static void vnt_fill_txkey(struct vnt_usb_send_context *tx_context, mic_hdr->id =0x59 ; mic_hdr->payload_len =cpu_to_be16 (payload_len); -memcpy (mic_hdr->mic_addr2, hdr->addr2,ETH_ALEN ); +ether_addr_copy (mic_hdr->mic_addr2, hdr->addr2);ieee80211_get_key_tx_seq (tx_key, &seq);
Signature · 1 line
1.7.9.5
Quoted 34 lines · Heba Aamer
This patch fixes the following checkpatch.pl warning:
fix Preferether_addr_copy()overmemcpy()
if the Ethernet addresses are__aligned(2)Pahole showed that the 2 structs are aligned to u16
struct
vnt_mic_hdr{u8 id; /* 0 1 */ u8 tx_priority; /* 1 1 */ u8 mic_addr2[6]; /* 2 6 */ u8 ccmp_pn[6]; /* 8 6 */ __be16 payload_len; /* 14 2 */ __be16 hlen; /* 16 2 */ __le16 frame_control; /* 18 2 */ u8 addr1[6]; /* 20 6 */ u8 addr2[6]; /* 26 6 */ u8 addr3[6]; /* 32 6 */ __le16 seq_ctrl; /* 38 2 */ u8 addr4[6]; /* 40 6 */ u16 packing; /* 46 2 *//* size: 48, cachelines: 1, members: 13 */ /* last cacheline: 48 bytes */ };struct
ieee80211_hdr{__le16 frame_control; /* 0 2 */ __le16 duration_id; /* 2 2 */ u8 addr1[6]; /* 4 6 */ u8 addr2[6]; /* 10 6 */ u8 addr3[6]; /* 16 6 */ __le16 seq_ctrl; /* 22 2 */ u8 addr4[6]; /* 24 6 */
Quoted 5 lines
/* size: 30, cachelines: 1, members: 7 */ /* last cacheline: 30 bytes */ };Signed-off-by Heba Aamer <[email protected]>
Reviewed-by Aya Mahfouz <[email protected]>
Quoted 24 lines
--- drivers/staging/vt6656/rxtx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/staging/vt6656/rxtx.c +1
-1@@ -738,7 +738,7 @@ static void vnt_fill_txkey(struct vnt_usb_send_context *tx_context, mic_hdr->id =0x59 ; mic_hdr->payload_len =cpu_to_be16 (payload_len); -memcpy (mic_hdr->mic_addr2, hdr->addr2,ETH_ALEN ); +ether_addr_copy (mic_hdr->mic_addr2, hdr->addr2);ieee80211_get_key_tx_seq (tx_key, &seq);Signature · 6 lines
1.7.9.5 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel