]> git.baikalelectronics.ru Git - kernel.git/commitdiff
libertas: Use shared constant for rfc1042 header
authorPascal Terjan <pterjan@google.com>
Sat, 23 May 2020 21:26:28 +0000 (22:26 +0100)
committerKalle Valo <kvalo@codeaurora.org>
Fri, 29 May 2020 17:16:00 +0000 (20:16 +0300)
This is one of the 9 drivers redefining rfc1042_header.

Signed-off-by: Pascal Terjan <pterjan@google.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200523212628.31526-1-pterjan@google.com
drivers/net/wireless/marvell/libertas/rx.c

index 58a1fc433b73f6c3e4c6171e8fc3d5c895447858..f28aa09d1f9e44569debe3a192e55e6204c1f978 100644 (file)
@@ -62,9 +62,6 @@ int lbs_process_rxed_packet(struct lbs_private *priv, struct sk_buff *skb)
        struct rxpd *p_rx_pd;
        int hdrchop;
        struct ethhdr *p_ethhdr;
-       static const u8 rfc1042_eth_hdr[] = {
-               0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00
-       };
 
        BUG_ON(!skb);
 
@@ -102,7 +99,7 @@ int lbs_process_rxed_packet(struct lbs_private *priv, struct sk_buff *skb)
                sizeof(p_rx_pkt->eth803_hdr.src_addr));
 
        if (memcmp(&p_rx_pkt->rfc1042_hdr,
-                  rfc1042_eth_hdr, sizeof(rfc1042_eth_hdr)) == 0) {
+                  rfc1042_header, sizeof(rfc1042_header)) == 0) {
                /*
                 *  Replace the 803 header and rfc1042 header (llc/snap) with an
                 *    EthernetII header, keep the src/dst and snap_type (ethertype)