Commit 9bfb54a8 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: remove header file ethernet.h 



The header file ehternet.h defines only two constants.

#define ETHERNET_HEADER_SIZE   14          /*  Ethernet Header Length */
#define LLC_HEADER_SIZE         6          /*  LLC Header Length */

Both are only used in the file core/rtw_recv.c and ETHERNET_HEADER_SIZE
just duplicates the in-kernel constant ETH_HLEN. Replace the usage of
ETHERNET_HEADER_SIZE with ETH_HLEN, move the definition of LLC_HEADER_SIZE
into rtw_rev.h (renamed to LLC_HEADER_LENGTH) and remove the now unused
header file ethernet.h.

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210825100842.13217-1-straube.linux@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 07e7f36d

drivers/staging/rtl8723bs/core/rtw_recv.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -480,7 +480,7 @@ static union recv_frame *portctrl(struct adapter *adapter, union recv_frame *pre 
			prtnframe = precv_frame;

			prtnframe = precv_frame;





			/* get ether_type */

			/* get ether_type */

			ptr = ptr+pfhdr->attrib.hdrlen+pfhdr->attrib.iv_len+LLC_HEADER_SIZE;

			ptr = ptr + pfhdr->attrib.hdrlen + pfhdr->attrib.iv_len + LLC_HEADER_LENGTH;

			memcpy(&be_tmp, ptr, 2);

			memcpy(&be_tmp, ptr, 2);

			ether_type = ntohs(be_tmp);

			ether_type = ntohs(be_tmp);
@@ -1485,7 +1485,7 @@ static signed int validate_recv_frame(struct adapter *adapter, union recv_frame 
			/*  dump eapol */

			/*  dump eapol */

			rtw_hal_get_def_var(adapter, HAL_DEF_DBG_DUMP_RXPKT, &(bDumpRxPkt));

			rtw_hal_get_def_var(adapter, HAL_DEF_DBG_DUMP_RXPKT, &(bDumpRxPkt));

			/*  get ether_type */

			/*  get ether_type */

			memcpy(&eth_type, ptr + pattrib->hdrlen + pattrib->iv_len + LLC_HEADER_SIZE, 2);

			memcpy(&eth_type, ptr + pattrib->hdrlen + pattrib->iv_len + LLC_HEADER_LENGTH, 2);

			eth_type = ntohs((unsigned short) eth_type);

			eth_type = ntohs((unsigned short) eth_type);

#endif

#endif

		}

		}
@@ -1588,7 +1588,7 @@ static int amsdu_to_msdu(struct adapter *padapter, union recv_frame *prframe) 
		/* Offset 12 denote 2 mac address */

		/* Offset 12 denote 2 mac address */

		nSubframe_Length = get_unaligned_be16(pdata + 12);

		nSubframe_Length = get_unaligned_be16(pdata + 12);





		if (a_len < (ETHERNET_HEADER_SIZE + nSubframe_Length))

		if (a_len < ETH_HLEN + nSubframe_Length)

			break;

			break;





		sub_pkt = rtw_os_alloc_msdu_pkt(prframe, nSubframe_Length, pdata);

		sub_pkt = rtw_os_alloc_msdu_pkt(prframe, nSubframe_Length, pdata);

drivers/staging/rtl8723bs/include/drv_types.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -57,7 +57,6 @@ 




#include <linux/ip.h>

#include <linux/ip.h>

#include <linux/if_ether.h>

#include <linux/if_ether.h>

#include <ethernet.h>





#define SPEC_DEV_ID_NONE BIT(0)

#define SPEC_DEV_ID_NONE BIT(0)

#define SPEC_DEV_ID_DISABLE_HT BIT(1)

#define SPEC_DEV_ID_DISABLE_HT BIT(1)

drivers/staging/rtl8723bs/include/ethernet.h

deleted100644 → 0
+0 −14
Original line number Original line Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/******************************************************************************

 *

 * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.

 *

 ******************************************************************************/

/*! \file */

#ifndef __INC_ETHERNET_H

#define __INC_ETHERNET_H



#define ETHERNET_HEADER_SIZE	14		/*  Ethernet Header Length */

#define LLC_HEADER_SIZE		6		/*  LLC Header Length */



#endif /*  #ifndef __INC_ETHERNET_H */

drivers/staging/rtl8723bs/include/rtw_recv.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -35,6 +35,8 @@ 




#define MAX_SUBFRAME_COUNT	64

#define MAX_SUBFRAME_COUNT	64





#define LLC_HEADER_LENGTH	6



/* for Rx reordering buffer control */

/* for Rx reordering buffer control */

struct recv_reorder_ctrl {

struct recv_reorder_ctrl {

	struct adapter	*padapter;

	struct adapter	*padapter;