lkml.org 
[lkml]   [2020]   [May]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH] staging: rtl8723bs: Use shared header constants
    From
    This is one of the 9 drivers redefining rfc1042_header.

    Signed-off-by: Pascal Terjan <pterjan@google.com>
    ---
    drivers/staging/rtl8723bs/core/rtw_recv.c | 15 ++++++---------
    drivers/staging/rtl8723bs/include/rtw_recv.h | 2 --
    drivers/staging/rtl8723bs/os_dep/recv_linux.c | 5 +++--
    3 files changed, 9 insertions(+), 13 deletions(-)

    diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rtl8723bs/core/rtw_recv.c
    index 5245098b9ecf..dc58822924b4 100644
    --- a/drivers/staging/rtl8723bs/core/rtw_recv.c
    +++ b/drivers/staging/rtl8723bs/core/rtw_recv.c
    @@ -10,14 +10,11 @@
    #include <rtw_debug.h>
    #include <linux/jiffies.h>
    #include <rtw_recv.h>
    +#include <net/cfg80211.h>

    static u8 SNAP_ETH_TYPE_IPX[2] = {0x81, 0x37};
    static u8 SNAP_ETH_TYPE_APPLETALK_AARP[2] = {0x80, 0xf3};

    -u8 rtw_rfc1042_header[] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
    -/* Bridge-Tunnel header (for EtherTypes ETH_P_AARP and ETH_P_IPX) */
    -u8 rtw_bridge_tunnel_header[] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 };
    -
    static void rtw_signal_stat_timer_hdl(struct timer_list *t);

    void _rtw_init_sta_recv_priv(struct sta_recv_priv *psta_recvpriv)
    @@ -1625,11 +1622,11 @@ sint wlanhdr_to_ethhdr(union recv_frame *precvframe)
    psnap_type = ptr+pattrib->hdrlen + pattrib->iv_len+SNAP_SIZE;
    /* convert hdr + possible LLC headers into Ethernet header */
    /* eth_type = (psnap_type[0] << 8) | psnap_type[1]; */
    - if ((!memcmp(psnap, rtw_rfc1042_header, SNAP_SIZE) &&
    - (memcmp(psnap_type, SNAP_ETH_TYPE_IPX, 2)) &&
    - (memcmp(psnap_type, SNAP_ETH_TYPE_APPLETALK_AARP, 2))) ||
    - /* eth_type != ETH_P_AARP && eth_type != ETH_P_IPX) || */
    - !memcmp(psnap, rtw_bridge_tunnel_header, SNAP_SIZE)) {
    + if ((!memcmp(psnap, rfc1042_header, SNAP_SIZE) &&
    + memcmp(psnap_type, SNAP_ETH_TYPE_IPX, 2) &&
    + memcmp(psnap_type, SNAP_ETH_TYPE_APPLETALK_AARP, 2)) ||
    + /* eth_type != ETH_P_AARP && eth_type != ETH_P_IPX) || */
    + !memcmp(psnap, bridge_tunnel_header, SNAP_SIZE)) {
    /* remove RFC1042 or Bridge-Tunnel encapsulation and replace EtherType */
    bsnaphdr = true;
    } else
    diff --git a/drivers/staging/rtl8723bs/include/rtw_recv.h b/drivers/staging/rtl8723bs/include/rtw_recv.h
    index 98c3e92245b7..a851b818ef0e 100644
    --- a/drivers/staging/rtl8723bs/include/rtw_recv.h
    +++ b/drivers/staging/rtl8723bs/include/rtw_recv.h
    @@ -38,8 +38,6 @@
    #define RX_MAX_QUEUE 2

    #define MAX_SUBFRAME_COUNT 64
    -extern u8 rtw_rfc1042_header[];
    -extern u8 rtw_bridge_tunnel_header[];

    /* for Rx reordering buffer control */
    struct recv_reorder_ctrl
    diff --git a/drivers/staging/rtl8723bs/os_dep/recv_linux.c b/drivers/staging/rtl8723bs/os_dep/recv_linux.c
    index 2a7b9922b1d4..eb4d1c3008fe 100644
    --- a/drivers/staging/rtl8723bs/os_dep/recv_linux.c
    +++ b/drivers/staging/rtl8723bs/os_dep/recv_linux.c
    @@ -9,6 +9,7 @@
    #include <drv_types.h>
    #include <rtw_debug.h>
    #include <linux/jiffies.h>
    +#include <net/cfg80211.h>

    void rtw_os_free_recvframe(union recv_frame *precvframe)
    {
    @@ -71,9 +72,9 @@ _pkt *rtw_os_alloc_msdu_pkt(union recv_frame *prframe, u16 nSubframe_Length, u8
    eth_type = RTW_GET_BE16(&sub_skb->data[6]);

    if (sub_skb->len >= 8 &&
    - ((!memcmp(sub_skb->data, rtw_rfc1042_header, SNAP_SIZE) &&
    + ((!memcmp(sub_skb->data, rfc1042_header, SNAP_SIZE) &&
    eth_type != ETH_P_AARP && eth_type != ETH_P_IPX) ||
    - !memcmp(sub_skb->data, rtw_bridge_tunnel_header, SNAP_SIZE))) {
    + !memcmp(sub_skb->data, bridge_tunnel_header, SNAP_SIZE))) {
    /*
    * remove RFC1042 or Bridge-Tunnel encapsulation and replace
    * EtherType
    --
    2.27.0.rc0.183.gde8f92d652-goog
    \
     
     \ /
      Last update: 2020-05-23 23:30    [W:2.344 / U:0.472 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site