[PATCH 1/2] staging: rtl8188eu: remove redundant definition of ETH_ALEN

[PATCH 1/2] staging: rtl8188eu: remove redundant definition of ETH_ALEN

[Michael Straube]

ETH_ALEN is defined in linux/if_ether.h which is included by
osdep_service.h, so remove the redundant definition from ieee80211.h.

osdep_service.h:33:#include <linux/etherdevice.h>
etherdevice.h:25:#include <linux/if_ether.h>

Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
 drivers/staging/rtl8188eu/include/ieee80211.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/staging/rtl8188eu/include/ieee80211.h b/drivers/staging/rtl8188eu/include/ieee80211.h
index c60b833ca110..d43aa4304ca5 100644
--- a/drivers/staging/rtl8188eu/include/ieee80211.h
+++ b/drivers/staging/rtl8188eu/include/ieee80211.h
@@ -14,7 +14,6 @@
 
 #define MGMT_QUEUE_NUM 5
 
-#define ETH_ALEN	6
 #define ETH_TYPE_LEN		2
 #define PAYLOAD_TYPE_LEN	1
 
-- 
2.21.0

[PATCH 2/2] staging: rtl8188eu: remove unused definitions from ieee80211.h

[Michael Straube]

MGMT_QUEUE_NUM, ETH_TYPE_LEN and PAYLOAD_TYPE_LEN are defined but
not used in the driver code, so remove them.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
 drivers/staging/rtl8188eu/include/ieee80211.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/drivers/staging/rtl8188eu/include/ieee80211.h b/drivers/staging/rtl8188eu/include/ieee80211.h
index d43aa4304ca5..42ee4ebe90eb 100644
--- a/drivers/staging/rtl8188eu/include/ieee80211.h
+++ b/drivers/staging/rtl8188eu/include/ieee80211.h
@@ -12,11 +12,6 @@
 #include "wifi.h"
 #include <linux/wireless.h>
 
-#define MGMT_QUEUE_NUM 5
-
-#define ETH_TYPE_LEN		2
-#define PAYLOAD_TYPE_LEN	1
-
 #ifdef CONFIG_88EU_AP_MODE
 
 #define RTL_IOCTL_HOSTAPD (SIOCIWFIRSTPRIV + 28)
-- 
2.21.0

Re: [PATCH 1/2] staging: rtl8188eu: remove redundant definition of ETH_ALEN

[Joe Perches]

On Sun, 2019-06-02 at 18:35 +0200, Michael Straube wrote:
> ETH_ALEN is defined in linux/if_ether.h which is included by
> osdep_service.h, so remove the redundant definition from ieee80211.h.
[]
> diff --git a/drivers/staging/rtl8188eu/include/ieee80211.h b/drivers/staging/rtl8188eu/include/ieee80211.h
[]
> @@ -14,7 +14,6 @@
>  
>  #define MGMT_QUEUE_NUM 5
>  
> -#define ETH_ALEN	6
>  #define ETH_TYPE_LEN		2
>  #define PAYLOAD_TYPE_LEN	1

While you're at it:

neither ETH_TYPE_LEN nor PAYLOAD_TYPE_LEN appear to be used.

Re: [PATCH 1/2] staging: rtl8188eu: remove redundant definition of ETH_ALEN

[Michael Straube]

On 2019-06-02 22:07, Joe Perches wrote:
> On Sun, 2019-06-02 at 18:35 +0200, Michael Straube wrote:
>> ETH_ALEN is defined in linux/if_ether.h which is included by
>> osdep_service.h, so remove the redundant definition from ieee80211.h.
> []
>> diff --git a/drivers/staging/rtl8188eu/include/ieee80211.h b/drivers/staging/rtl8188eu/include/ieee80211.h
> []
>> @@ -14,7 +14,6 @@
>>   
>>   #define MGMT_QUEUE_NUM 5
>>   
>> -#define ETH_ALEN	6
>>   #define ETH_TYPE_LEN		2
>>   #define PAYLOAD_TYPE_LEN	1
> 
> While you're at it:
> 
> neither ETH_TYPE_LEN nor PAYLOAD_TYPE_LEN appear to be used.
> 
> 

They are removed in the second patch of the series.