staging: rtl8188eu: core: rtw_xmit: Use macros instead of constants
PATCH 1/1 staging: rtl8188eu: core: rtw_xmit: Use macros instead of constants
Replace the 0x888e with ETH_P_PAE and 0x0806 with ETH_P_ARP. These macros can be found in drivers/staging/rtl8192e/rtllib.h
Hexadecimal numbers are not case sensitive,
therefore 0x888e is equal with 0x888E.
The modifications improve the readability of the code.
--- drivers/staging/rtl8188eu/core/rtw_xmit.c | 12 ++++++------ drivers/staging/rtl8192e/rtllib.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-)
drivers/staging/rtl8188eu/core/rtw_xmit.c +6 -6
@@ -402,7 +402,7 @@ static void set_qos(struct pkt_file *ppktfile, struct pkt_attrib *pattrib)_rtw_pktfile_read (ppktfile, (u8 *)&ip_hdr,sizeof (ip_hdr));/* user_prio = (ntohs(ip_hdr.tos) >> 5) & 0x3; */ user_prio = ip_hdr.tos >>5 ; - }else if (pattrib->ether_type ==0x888e ) { + }else if (pattrib->ether_type ==ETH_P_PAE ) {/* "When priority processing of data frames is supported, */ /* a STA's SME should send EAPOL-Key frames at the highest priority." */ user_prio =7 ;
@@ -469,15 +469,15 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p } } } - }else if (pattrib->ether_type ==0x888e ) { + }else if (pattrib->ether_type ==ETH_P_PAE ) {DBG_88E_LEVEL (_drv_info_,"send eapol packet\n" ); } -if ((pattrib->ether_type ==0x888e ) || (pattrib->dhcp_pkt ==1 )) +if ((pattrib->ether_type ==ETH_P_PAE ) || (pattrib->dhcp_pkt ==1 ))rtw_set_scan_deny (padapter,3000 );/* If EAPOL , ARP , OR DHCP packet, driver must be in active mode. */ -if ((pattrib->ether_type ==0x0806 ) || (pattrib->ether_type ==0x888e ) || (pattrib->dhcp_pkt ==1 )) +if ((pattrib->ether_type ==ETH_P_ARP ) || (pattrib->ether_type ==ETH_P_PAE ) || (pattrib->dhcp_pkt ==1 ))rtw_lps_ctrl_wk_cmd (padapter,LPS_CTRL_SPECIAL_PACKET ,1 ); bmcast =IS_MCAST (pattrib->ra);
@@ -531,8 +531,8 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p pattrib->encrypt =0 ; -if ((pattrib->ether_type !=0x888e ) && !check_fwstate (pmlmepriv,WIFI_MP_STATE )) { -RT_TRACE (_module_rtl871x_xmit_c_, _drv_err_, ("\npsta->ieee8021x_blocked == true, pattrib->ether_type(%.4x) != 0x888e\n" , pattrib->ether_type)); +if ((pattrib->ether_type !=ETH_P_PAE ) && !check_fwstate (pmlmepriv,WIFI_MP_STATE )) { +RT_TRACE (_module_rtl871x_xmit_c_, _drv_err_, ("\npsta->ieee8021x_blocked == true, pattrib->ether_type(%.4x) != ETH_P_PAE\n" , pattrib->ether_type)); res = _FAIL; goto exit; }
drivers/staging/rtl8192e/rtllib.h +1 -1
@@ -521,7 +521,7 @@ enum wireless_mode { };#ifndef ETH_P_PAE -#define ETH_P_PAE 0x888E/* Port Access Entity (IEEE 802.1X) */ +#define ETH_P_PAE 0x888E/* Port Access Entity (IEEE 802.1X) */ #define ETH_P_IP 0x0800/* Internet Protocol packet */ #define ETH_P_ARP 0x0806/* Address Resolution packet */ #endif /* ETH_P_PAE */
Signature · 1 line
2.7.4
Quoted 5 lines · Georgiana Rodica Chelu
Replace the
0x888ewithETH_P_PAEand0x0806withETH_P_ARP. These macros can be found indrivers/staging/rtl8192e/rtllib.hHexadecimal numbers are not case sensitive,
therefore0x888eis equal with0x888E.
It could be good to cite some evidence that these are really the right values, and don't just coincidentally have the same value. You could look for ether_type being combined with these values elsewhere in the kernel (not just staging).
julia
Quoted 75 lines
The modifications improve the readability of the code.
Signed-off-by Georgiana Rodica Chelu <[email protected]>--- drivers/staging/rtl8188eu/core/rtw_xmit.c | 12 ++++++------ drivers/staging/rtl8192e/rtllib.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-)drivers/staging/rtl8188eu/core/rtw_xmit.c +6
-6@@ -402,7 +402,7 @@ static void set_qos(struct pkt_file *ppktfile, struct pkt_attrib *pattrib)_rtw_pktfile_read (ppktfile, (u8 *)&ip_hdr,sizeof (ip_hdr));/* user_prio = (ntohs(ip_hdr.tos) >> 5) & 0x3; */ user_prio = ip_hdr.tos >>5 ; - }else if (pattrib->ether_type ==0x888e ) { + }else if (pattrib->ether_type ==ETH_P_PAE ) {/* "When priority processing of data frames is supported, */ /* a STA's SME should send EAPOL-Key frames at the highest priority." */ user_prio =7 ;@@ -469,15 +469,15 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p } } } - }else if (pattrib->ether_type ==0x888e ) { + }else if (pattrib->ether_type ==ETH_P_PAE ) {DBG_88E_LEVEL (_drv_info_,"send eapol packet\n" ); } -if ((pattrib->ether_type ==0x888e ) || (pattrib->dhcp_pkt ==1 )) +if ((pattrib->ether_type ==ETH_P_PAE ) || (pattrib->dhcp_pkt ==1 ))rtw_set_scan_deny (padapter,3000 );/* If EAPOL , ARP , OR DHCP packet, driver must be in active mode. */ -if ((pattrib->ether_type ==0x0806 ) || (pattrib->ether_type ==0x888e ) || (pattrib->dhcp_pkt ==1 )) +if ((pattrib->ether_type ==ETH_P_ARP ) || (pattrib->ether_type ==ETH_P_PAE ) || (pattrib->dhcp_pkt ==1 ))rtw_lps_ctrl_wk_cmd (padapter,LPS_CTRL_SPECIAL_PACKET ,1 ); bmcast =IS_MCAST (pattrib->ra);@@ -531,8 +531,8 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p pattrib->encrypt =0 ; -if ((pattrib->ether_type !=0x888e ) && !check_fwstate (pmlmepriv,WIFI_MP_STATE )) { -RT_TRACE (_module_rtl871x_xmit_c_, _drv_err_, ("\npsta->ieee8021x_blocked == true, pattrib->ether_type(%.4x) != 0x888e\n" , pattrib->ether_type)); +if ((pattrib->ether_type !=ETH_P_PAE ) && !check_fwstate (pmlmepriv,WIFI_MP_STATE )) { +RT_TRACE (_module_rtl871x_xmit_c_, _drv_err_, ("\npsta->ieee8021x_blocked == true, pattrib->ether_type(%.4x) != ETH_P_PAE\n" , pattrib->ether_type)); res = _FAIL; goto exit; }drivers/staging/rtl8192e/rtllib.h +1
-2@@ -521,7 +521,7 @@ enum wireless_mode { };#ifndef ETH_P_PAE -#define ETH_P_PAE 0x888E/* Port Access Entity (IEEE 802.1X) */ +#define ETH_P_PAE 0x888E/* Port Access Entity (IEEE 802.1X) */ #define ETH_P_IP 0x0800/* Internet Protocol packet */ #define ETH_P_ARP 0x0806/* Address Resolution packet */ #endif /* ETH_P_PAE */ --2.7.4
--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20160928210715.GA26545%40fireworks.
For more options, visit https://groups.google.com/d/optout.
I have some doubts about changing the constant with a string in the 531 line. My opinion is to let this line unchanged.
Any help?
Also, I forgot to replace the constant from 398 line, so I will submit the second version of the patch soon.
Georgiana
Quoted 97 lines · Georgiana Chelu
Replace the
0x888ewithETH_P_PAEand0x0806withETH_P_ARP. These macros can be found indrivers/staging/rtl8192e/rtllib.hHexadecimal numbers are not case sensitive,
therefore0x888eis equal with0x888E.The modifications improve the readability of the code.
Signed-off-by Georgiana Rodica Chelu <[email protected]>---
drivers/staging/rtl8188eu/core/rtw_xmit.c | 12 ++++++------ drivers/staging/rtl8192e/rtllib.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-)drivers/staging/rtl8188eu/core/rtw_xmit.c +1
-1@@ -402,7 +402,7 @@ static void set_qos(struct pkt_file *ppktfile, struct pkt_attrib *pattrib) _rtw_pktfile_read(ppktfile, (u8 *)&ip_hdr, sizeof(ip_hdr));/* user_prio = (ntohs(ip_hdr.tos) >> 5) & 0x3; */ user_prio = ip_hdr.tos >>5 ; - }else if (pattrib->ether_type ==0x888e ) { + }else if (pattrib->ether_type ==ETH_P_PAE ) {/* "When priority processing of data frames is supported, */
/* a STA's SME should send EAPOL-Key frames at the highest priority." */ user_prio = 7;drivers/staging/rtl8188eu/core/rtw_xmit.c +0
-0@@ -469,15 +469,15 @@ static s32 update_attrib(struct adapter *padapter,struct
sk_buff*pkt, struct p} } }drivers/staging/rtl8188eu/core/rtw_xmit.c +2
-2- }else if (pattrib->ether_type ==0x888e ) { + }else if (pattrib->ether_type ==ETH_P_PAE ) {DBG_88E_LEVEL (_drv_info_,"send eapol packet\n" ); } -if ((pattrib->ether_type ==0x888e ) || (pattrib->dhcp_pkt ==1 )) + if ((pattrib->ether_type == ETH_P_PAE) || (pattrib->dhcp_pkt ==1))
rtw_set_scan_deny(padapter, 3000); /* If EAPOL , ARP , OR DHCP packet, driver must be in active mode. */ - if ((pattrib->ether_type == 0x0806) || (pattrib->ether_type == 0x888e) || (pattrib->dhcp_pkt == 1)) + if ((pattrib->ether_type == ETH_P_ARP) || (pattrib->ether_type ==
ETH_P_PAE) || (pattrib->dhcp_pkt== 1))
rtw_lps_ctrl_wk_cmd(padapter,LPS_CTRL_SPECIAL_PACKET,
1);bmcast = IS_MCAST(pattrib->ra);drivers/staging/rtl8188eu/core/rtw_xmit.c +0
-0@@ -531,8 +531,8 @@ static s32 update_attrib(struct adapter *padapter,struct
sk_buff*pkt, struct ppattrib->encrypt = 0;- if ((
pattrib->ether_type!=0x888e) &&
!check_fwstate(pmlmepriv,WIFI_MP_STATE)) {
- RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
("\npsta->ieee8021x_blocked == true,pattrib->ether_type(%.4x)!= 0x888e\n",pattrib->ether_type));
+ if ((pattrib->ether_type!=ETH_P_PAE) &&
!check_fwstate(pmlmepriv,WIFI_MP_STATE)) {
+ RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_,
("\npsta->ieee8021x_blocked == true,pattrib->ether_type(%.4x)!=ETH_P_PAE\n", pattrib->ether_type)); res = _FAIL; goto exit; }drivers/staging/rtl8192e/rtllib.h +1
-1@@ -521,7 +521,7 @@ enum wireless_mode { };#ifndef ETH_P_PAE -#define ETH_P_PAE 0x888E/* Port Access Entity (IEEE 802.1X) */ +#define ETH_P_PAE 0x888E/* Port Access Entity (IEEE 802.1X) */
#defineETH_P_IP0x0800/* Internet Protocol
packet */
#defineETH_P_ARP0x0806/* Address Resolution
packet */
#endif /*ETH_P_PAE*/Signature · 1 line
2.7.4
Quoted 6 lines · Georgiana Chelu
I have some doubts about changing the constant with a string in the 531 line. My opinion is to let this line unchanged.
Any help?
Maybe move ETH_P_PAE into the argument list? Then if this value changes for some reason in the future, the code will be robust.
You could also reformat the code in that hunk that you are changing so that it better respects the 80 character limit. If it seems unnatural, you don't have to respect that perfectly, but there is no need for the code to extend as far to the right as it does now.
julia
Quoted 91 lines
Also, I forgot to replace the constant from 398 line, so I will submit the second version of the patch soon.
Georgiana
On Thursday, 29 September 2016 00:07:17 UTC+3, Georgiana Chelu wrote:
Replace the 0x888e with ETH_P_PAE and 0x0806 with ETH_P_ARP. These macros can be found in drivers/staging/rtl8192e/rtllib.h Hexadecimal numbers are not case sensitive, therefore 0x888e is equal with 0x888E. The modifications improve the readability of the code. Signed-off-by: Georgiana Rodica Chelu <[email protected]> --- drivers/staging/rtl8188eu/core/rtw_xmit.c | 12 ++++++------ drivers/staging/rtl8192e/rtllib.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/rtl8188eu/core/rtw_xmit.c b/drivers/staging/rtl8188eu/core/rtw_xmit.c index 1392899..0f8b8e0 100644 --- a/drivers/staging/rtl8188eu/core/rtw_xmit.c +++ b/drivers/staging/rtl8188eu/core/rtw_xmit.c @@ -402,7 +402,7 @@ static void set_qos(struct pkt_file *ppktfile, struct pkt_attrib *pattrib) _rtw_pktfile_read(ppktfile, (u8 *)&ip_hdr, sizeof(ip_hdr)); /* user_prio = (ntohs(ip_hdr.tos) >> 5) & 0x3; */ user_prio = ip_hdr.tos >> 5; - } else if (pattrib->ether_type == 0x888e) { + } else if (pattrib->ether_type == ETH_P_PAE) { /* "When priority processing of data frames is supported, */ /* a STA's SME should send EAPOL-Key frames at the highest priority." */ user_prio = 7; @@ -469,15 +469,15 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p } } } - } else if (pattrib->ether_type == 0x888e) { + } else if (pattrib->ether_type == ETH_P_PAE) { DBG_88E_LEVEL(_drv_info_, "send eapol packet\n"); } - if ((pattrib->ether_type == 0x888e) || (pattrib->dhcp_pkt == 1)) + if ((pattrib->ether_type == ETH_P_PAE) || (pattrib->dhcp_pkt == 1)) rtw_set_scan_deny(padapter, 3000); /* If EAPOL , ARP , OR DHCP packet, driver must be in active mode. */ - if ((pattrib->ether_type == 0x0806) || (pattrib->ether_type == 0x888e) || (pattrib->dhcp_pkt == 1)) + if ((pattrib->ether_type == ETH_P_ARP) || (pattrib->ether_type == ETH_P_PAE) || (pattrib->dhcp_pkt == 1)) rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_SPECIAL_PACKET, 1); bmcast = IS_MCAST(pattrib->ra); @@ -531,8 +531,8 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p pattrib->encrypt = 0; - if ((pattrib->ether_type != 0x888e) && !check_fwstate(pmlmepriv, WIFI_MP_STATE)) { - RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("\npsta->ieee8021x_blocked == true, pattrib->ether_type(%.4x) != 0x888e\n", pattrib->ether_type)); + if ((pattrib->ether_type != ETH_P_PAE) && !check_fwstate(pmlmepriv, WIFI_MP_STATE)) { + RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("\npsta->ieee8021x_blocked == true, pattrib->ether_type(%.4x) != ETH_P_PAE\n", pattrib->ether_type)); res = _FAIL; goto exit; } diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index 38247fa..b895a53 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -521,7 +521,7 @@ enum wireless_mode { }; #ifndef ETH_P_PAE -#define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */ +#define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */ #define ETH_P_IP 0x0800 /* Internet Protocol packet */ #define ETH_P_ARP 0x0806 /* Address Resolution packet */ #endif /* ETH_P_PAE */ -- 2.7.4--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/a1722811-0eb9-4e28-af52-e234cd6e7107%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.