| Message ID | 20200523212735.32364-1-pterjan@google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e78e5d18c65362a0e6ca383fad88ef950293fc2c |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | atmel: Use shared constant for rfc1042 header | expand |
Pascal Terjan <pterjan@google.com> wrote: > This is one of the 9 drivers redefining rfc1042_header. > > Signed-off-by: Pascal Terjan <pterjan@google.com> Patch applied to wireless-drivers-next.git, thanks. e78e5d18c653 atmel: Use shared constant for rfc1042 header
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 */
This is one of the 9 drivers redefining rfc1042_header. Signed-off-by: Pascal Terjan <pterjan@google.com> --- drivers/net/wireless/atmel/atmel.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)