2020-05-23 21:28:33

by Pascal Terjan

Subject: [PATCH] atmel: Use shared constant for rfc1042 header

This is one of the 9 drivers redefining rfc1042_header.

Signed-off-by: Pascal Terjan <[email protected]>
---
drivers/net/wireless/atmel/atmel.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/wireless/atmel/atmel.c b/drivers/net/wireless/atmel/atmel.c
index 74538085cfb7..d5875836068c 100644
--- a/drivers/net/wireless/atmel/atmel.c
+++ b/drivers/net/wireless/atmel/atmel.c
@@ -798,7 +798,6 @@ static void tx_update_descriptor(struct atmel_private *priv, int is_bcast,

static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev)
{
- static const u8 SNAP_RFC1024[6] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
struct atmel_private *priv = netdev_priv(dev);
struct ieee80211_hdr header;
unsigned long flags;
@@ -853,7 +852,7 @@ static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev)
}

if (priv->use_wpa)
- memcpy(&header.addr4, SNAP_RFC1024, ETH_ALEN);
+ memcpy(&header.addr4, rfc1042_header, ETH_ALEN);

header.frame_control = cpu_to_le16(frame_ctl);
/* Copy the wireless header into the card */
--
2.27.0.rc0.183.gde8f92d652-goog

2020-05-29 17:17:45

by Kalle Valo

Subject: Re: [PATCH] atmel: Use shared constant for rfc1042 header

Pascal Terjan <[email protected]> wrote:

> This is one of the 9 drivers redefining rfc1042_header.
>
> Signed-off-by: Pascal Terjan <[email protected]>

Patch applied to wireless-drivers-next.git, thanks.

e78e5d18c653 atmel: Use shared constant for rfc1042 header

--
https://patchwork.kernel.org/patch/11567013/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches