staging:r8188eu: move IV/ICV trimming into decrypt() and also place it after rtl88eu_mon_recv_hook()
PATCH 1/7 staging:r8188eu: move IV/ICV trimming into decrypt() and also place it after rtl88eu_mon_recv_hook()
IV/ICV should be trimmed immediately after decoding (this is a decryptor job).
Trim IV/ICV inside decrypt() for SW decrypted frames, for HW decrypted - before rtl88eu_mon_recv_hook().
Adopt frames receive process to work without IV/ICV fields.
--- drivers/staging/rtl8188eu/core/rtw_recv.c | 80 ++++++++++++------------------- 1 file changed, 30 insertions(+), 50 deletions(-)
drivers/staging/rtl8188eu/core/rtw_recv.c +30 -50
@@ -259,12 +259,10 @@ static int recvframe_chkmic(struct adapter *adapter, }/* icv_len included the mic code */ - datalen = precvframe->pkt->len-prxattrib->hdrlen - - prxattrib->iv_len-prxattrib->icv_len-8 ; + datalen = precvframe->pkt->len-prxattrib->hdrlen -8 ; pframe = precvframe->pkt->data; - payload = pframe+prxattrib->hdrlen+prxattrib->iv_len; + payload = pframe+prxattrib->hdrlen; -RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, ("\n prxattrib->iv_len=%d prxattrib->icv_len=%d\n" , prxattrib->iv_len, prxattrib->icv_len));rtw_seccalctkipmic (mickey, pframe, payload, datalen, &miccode[0 ], (unsigned char )prxattrib->priority);/* care the length of the data */
@@ -409,9 +407,15 @@ static struct recv_frame *decryptor(struct adapter *padapter,default :break ; } +if (res != _FAIL) { +memmove (precv_frame->pkt->data + precv_frame->attrib.iv_len, precv_frame->pkt->data, precv_frame->attrib.hdrlen); +skb_pull (precv_frame->pkt, precv_frame->attrib.iv_len); +skb_trim (precv_frame->pkt, precv_frame->pkt->len - precv_frame->attrib.icv_len); + } }else if (prxattrib->bdecrypted ==1 && prxattrib->encrypt >0 && - (psecuritypriv->busetkipkey ==1 || prxattrib->encrypt != _TKIP_)) - psecuritypriv->hw_decrypted = true; + (psecuritypriv->busetkipkey ==1 || prxattrib->encrypt != _TKIP_)) { + psecuritypriv->hw_decrypted = true; + }if (res == _FAIL) {rtw_free_recvframe (return_packet, &padapter->recvpriv.free_recv_queue);
@@ -452,7 +456,7 @@ static struct recv_frame *portctrl(struct adapter *adapter,if (auth_alg ==2 ) {/* get ether_type */ - ptr = ptr + pfhdr->attrib.hdrlen +LLC_HEADER_SIZE + pfhdr->attrib.iv_len; + ptr = ptr + pfhdr->attrib.hdrlen +LLC_HEADER_SIZE ;memcpy (&be_tmp, ptr,2 ); ether_type =ntohs (be_tmp);
@@ -1263,6 +1267,13 @@ static int validate_recv_frame(struct adapter *adapter,*/ rtl88eu_mon_recv_hook (adapter->pmondev, precv_frame); +if (precv_frame->attrib.bdecrypted ==1 && precv_frame->attrib.encrypt >0 && + (adapter->securitypriv.busetkipkey ==1 || precv_frame->attrib.encrypt != _TKIP_)) { +memmove (precv_frame->pkt->data + precv_frame->attrib.iv_len, precv_frame->pkt->data, precv_frame->attrib.hdrlen); +skb_pull (precv_frame->pkt, precv_frame->attrib.iv_len); +skb_trim (precv_frame->pkt, precv_frame->pkt->len - precv_frame->attrib.icv_len); + } + exit:return retval;
@@ -1282,11 +1293,8 @@ static int wlanhdr_to_ethhdr(struct recv_frame *precvframe)u8 *ptr = precvframe->pkt->data;struct rx_pkt_attrib *pattrib = &precvframe->attrib; -if (pattrib->encrypt) -skb_trim (precvframe->pkt, precvframe->pkt->len - pattrib->icv_len); - - psnap = (struct ieee80211_snap_hdr *)(ptr+pattrib->hdrlen + pattrib->iv_len); - psnap_type = ptr+pattrib->hdrlen + pattrib->iv_len+SNAP_SIZE ; + psnap = (struct ieee80211_snap_hdr *)(ptr+pattrib->hdrlen); + psnap_type = ptr+pattrib->hdrlen +SNAP_SIZE ;/* convert hdr + possible LLC headers into Ethernet header */ if ((!memcmp(psnap, rtw_rfc1042_header, SNAP_SIZE) && (!memcmp(psnap_type, SNAP_ETH_TYPE_IPX, 2) == false) &&
@@ -1299,12 +1307,9 @@ static int wlanhdr_to_ethhdr(struct recv_frame *precvframe) bsnaphdr = false; } - rmv_len = pattrib->hdrlen + pattrib->iv_len + (bsnaphdr ?SNAP_SIZE :0 ); + rmv_len = pattrib->hdrlen + (bsnaphdr ?SNAP_SIZE :0 ); len = precvframe->pkt->len - rmv_len; -RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, - ("\n===pattrib->hdrlen: %x, pattrib->iv_len:%x===\n\n" , pattrib->hdrlen, pattrib->iv_len)); -memcpy (&be_tmp, ptr+rmv_len,2 ); eth_type =ntohs (be_tmp);/* pattrib->ether_type */ pattrib->eth_type = eth_type;
@@ -1329,7 +1334,6 @@ static struct recv_frame *recvframe_defrag(struct adapter *adapter, struct __queue *defrag_q) {struct list_head *plist, *phead; -u8 wlanhdr_offset;u8 curfragnum;struct recv_frame *pfhdr, *pnfhdr;struct recv_frame *prframe, *pnextrframe;
@@ -1378,12 +1382,7 @@ static struct recv_frame *recvframe_defrag(struct adapter *adapter,/* copy the 2nd~n fragment frame's payload to the first fragment */ /* get the 2nd~last fragment frame's payload */ - wlanhdr_offset = pnfhdr->attrib.hdrlen + pnfhdr->attrib.iv_len; - -skb_pull (pnextrframe->pkt, wlanhdr_offset); - -/* append to first fragment frame's tail (if privacy frame, pull the ICV) */ -skb_trim (prframe->pkt, prframe->pkt->len - pfhdr->attrib.icv_len); +skb_pull (pnextrframe->pkt, pnfhdr->attrib.hdrlen);/* memcpy */ memcpy(skb_tail_pointer(pfhdr->pkt), pnfhdr->pkt->data,
@@ -1391,7 +1390,7 @@ static struct recv_frame *recvframe_defrag(struct adapter *adapter,skb_put (prframe->pkt, pnfhdr->pkt->len); - pfhdr->attrib.icv_len = pnfhdr->attrib.icv_len; + pfhdr->attrib.icv_len =0 ; plist = plist->next; }
@@ -1518,11 +1517,6 @@ static int amsdu_to_msdu(struct adapter *padapter, struct recv_frame *prframe) nr_subframes =0 ; pattrib = &prframe->attrib; -skb_pull (prframe->pkt, prframe->attrib.hdrlen); - -if (prframe->attrib.iv_len >0 ) -skb_pull (prframe->pkt, prframe->attrib.iv_len); - a_len = prframe->pkt->len; pdata = prframe->pkt->data;
@@ -1892,24 +1886,6 @@ static int process_recv_indicatepkts(struct adapter *padapter,return retval; } -static int recv_func_prehandle (struct adapter *padapter, -struct recv_frame *rframe) -{ -int ret = _SUCCESS; -struct __queue *pfree_recv_queue = &padapter->recvpriv.free_recv_queue; - -/* check the frame crtl field and decache */ - ret =validate_recv_frame (padapter, rframe); -if (ret != _SUCCESS) { -RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, ("recv_func: validate_recv_frame fail! drop pkt\n" )); -rtw_free_recvframe (rframe, pfree_recv_queue);/* free this recv_frame */ - goto exit; - } - -exit: -return ret; -} -static int recv_func_posthandle (struct adapter *padapter,struct recv_frame *prframe) {
@@ -1962,6 +1938,7 @@ static int recv_func(struct adapter *padapter, struct recv_frame *rframe)struct rx_pkt_attrib *prxattrib = &rframe->attrib;struct security_priv *psecuritypriv = &padapter->securitypriv;struct mlme_priv *mlmepriv = &padapter->mlmepriv; +struct __queue *pfree_recv_queue = &padapter->recvpriv.free_recv_queue;/* check if need to handle uc_swdec_pending_queue*/ if (check_fwstate (mlmepriv,WIFI_STATION_STATE ) && psecuritypriv->busetkipkey) {
@@ -1973,9 +1950,12 @@ static int recv_func(struct adapter *padapter, struct recv_frame *rframe) } } - ret =recv_func_prehandle (padapter, rframe); - -if (ret == _SUCCESS) { +/* check the frame crtl field and decache */ + ret =validate_recv_frame (padapter, rframe); +if (ret != _SUCCESS) { +RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, ("recv_func: validate_recv_frame fail! drop pkt\n" )); +rtw_free_recvframe (rframe, pfree_recv_queue);/* free this recv_frame */ + }else {/* check if need to enqueue into uc_swdec_pending_queue*/ if (check_fwstate(mlmepriv, WIFI_STATION_STATE) && !IS_MCAST(prxattrib->ra) && prxattrib->encrypt > 0 &&
Signature · 1 line
2.10.2
PATCH 2/7 staging:r8188eu: use different mon_recv_decrypted() inside rtl88eu_mon_recv_hook() and rtl88eu_mon_xmit_hook().
Create mon_recv_decrypted_recv() to change rtl88eu_mon_recv_hook() without affect to rtl88eu_mon_xmit_hook().
--- drivers/staging/rtl8188eu/os_dep/mon.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)
drivers/staging/rtl8188eu/os_dep/mon.c +22 -1
@@ -66,6 +66,27 @@ static void mon_recv_decrypted(struct net_device *dev, const u8 *data,netif_rx (skb); } +static void mon_recv_decrypted_recv (struct net_device *dev,const u8 *data, +int data_len,int iv_len,int icv_len) +{ +struct sk_buff *skb; + + skb =netdev_alloc_skb (dev, data_len); +if (!skb) +return ; +memcpy (skb_put (skb, data_len), data, data_len); + +/* +* Frame data is not encrypted. Strip off protection so +* userspace doesn't think that it is. +*/ +unprotect_frame (skb, iv_len, icv_len); + + skb->ip_summed =CHECKSUM_UNNECESSARY ; + skb->protocol =eth_type_trans (skb, dev); +netif_rx (skb); +} +static void mon_recv_encrypted (struct net_device *dev,const u8 *data,int data_len) {
@@ -99,7 +120,7 @@ void rtl88eu_mon_recv_hook(struct net_device *dev, struct recv_frame *frame)SET_ICE_IV_LEN (iv_len, icv_len, attr->encrypt);if (attr->bdecrypted) -mon_recv_decrypted (dev, data, data_len, iv_len, icv_len); +mon_recv_decrypted_recv (dev, data, data_len, iv_len, icv_len);else mon_recv_encrypted (dev, data, data_len); }
Signature · 1 line
2.10.2
PATCH 3/7 staging:r8188eu: inline unprotect_frame() in mon_recv_decrypted_recv()
In reply to Ivan SafonovIt is useful to remove IV/ICV from rtl88eu_mon_recv_hook(). Also unprotect_frame() will be very short without skb_(pull|trim).
--- drivers/staging/rtl8188eu/os_dep/mon.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
drivers/staging/rtl8188eu/os_dep/mon.c +15 -1
@@ -70,6 +70,8 @@ static void mon_recv_decrypted_recv(struct net_device *dev, const u8 *data, int data_len, int iv_len, int icv_len) { struct sk_buff *skb; +struct ieee80211_hdr *hdr; +int hdr_len; skb =netdev_alloc_skb (dev, data_len);if (!skb)
@@ -80,7 +82,19 @@ static void mon_recv_decrypted_recv(struct net_device *dev, const u8 *data,* Frame data is not encrypted. Strip off protection so * userspace doesn't think that it is. */ -unprotect_frame (skb, iv_len, icv_len); + + hdr = (struct ieee80211_hdr *)skb->data; + hdr_len =ieee80211_hdrlen (hdr->frame_control); + +if (skb->len < hdr_len + iv_len + icv_len) { +if (ieee80211_has_protected (hdr->frame_control)) { + hdr->frame_control &= ~cpu_to_le16 (IEEE80211_FCTL_PROTECTED ); + +memmove (skb->data + iv_len, skb->data, hdr_len); +skb_pull (skb, iv_len); +skb_trim (skb, skb->len - icv_len); + } + } skb->ip_summed =CHECKSUM_UNNECESSARY ; skb->protocol =eth_type_trans (skb, dev);
Signature · 1 line
2.10.2
PATCH 4/7 staging:r8188eu: trim IV/ICV fields in validate_recv_data_frame()
In reply to Ivan SafonovLength of IV/ICV fields calculated here, so trim these field here too.
--- drivers/staging/rtl8188eu/core/rtw_recv.c | 17 ++++++++++------- drivers/staging/rtl8188eu/os_dep/mon.c | 19 ++++--------------- 2 files changed, 14 insertions(+), 22 deletions(-)
drivers/staging/rtl8188eu/core/rtw_recv.c +10 -7
@@ -1138,6 +1138,8 @@ static int validate_recv_data_frame(struct adapter *adapter, }if (pattrib->privacy) { +struct sk_buff *skb = precv_frame->pkt; +RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, ("validate_recv_data_frame:pattrib->privacy=%x\n" , pattrib->privacy));RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, ("\n ^^^^^^^^^^^IS_MCAST(pattrib->ra(0x%02x))=%d^^^^^^^^^^^^^^^6\n" , pattrib->ra[0 ],IS_MCAST (pattrib->ra)));
@@ -1146,6 +1148,13 @@ static int validate_recv_data_frame(struct adapter *adapter,RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, ("\n pattrib->encrypt=%d\n" , pattrib->encrypt));SET_ICE_IV_LEN (pattrib->iv_len, pattrib->icv_len, pattrib->encrypt); + +if (pattrib->bdecrypted ==1 && pattrib->encrypt >0 ) { +memmove (skb->data + pattrib->iv_len, + skb->data, pattrib->hdrlen); +skb_pull (skb, pattrib->iv_len); +skb_trim (skb, skb->len - pattrib->icv_len); + } }else { pattrib->encrypt =0 ; pattrib->iv_len =0 ;
@@ -1265,14 +1274,8 @@ static int validate_recv_frame(struct adapter *adapter,* Hence forward the frame to the monitor anyway to preserve the order * in which frames were received. */ -rtl88eu_mon_recv_hook (adapter->pmondev, precv_frame); -if (precv_frame->attrib.bdecrypted ==1 && precv_frame->attrib.encrypt >0 && - (adapter->securitypriv.busetkipkey ==1 || precv_frame->attrib.encrypt != _TKIP_)) { -memmove (precv_frame->pkt->data + precv_frame->attrib.iv_len, precv_frame->pkt->data, precv_frame->attrib.hdrlen); -skb_pull (precv_frame->pkt, precv_frame->attrib.iv_len); -skb_trim (precv_frame->pkt, precv_frame->pkt->len - precv_frame->attrib.icv_len); - } +rtl88eu_mon_recv_hook (adapter->pmondev, precv_frame); exit:
drivers/staging/rtl8188eu/os_dep/mon.c +4 -15
@@ -67,7 +67,7 @@ static void mon_recv_decrypted(struct net_device *dev, const u8 *data, }static void mon_recv_decrypted_recv (struct net_device *dev,const u8 *data, -int data_len,int iv_len,int icv_len) +int data_len) {struct sk_buff *skb;struct ieee80211_hdr *hdr;
@@ -86,15 +86,8 @@ static void mon_recv_decrypted_recv(struct net_device *dev, const u8 *data, hdr = (struct ieee80211_hdr *)skb->data; hdr_len =ieee80211_hdrlen (hdr->frame_control); -if (skb->len < hdr_len + iv_len + icv_len) { -if (ieee80211_has_protected (hdr->frame_control)) { - hdr->frame_control &= ~cpu_to_le16 (IEEE80211_FCTL_PROTECTED ); - -memmove (skb->data + iv_len, skb->data, hdr_len); -skb_pull (skb, iv_len); -skb_trim (skb, skb->len - icv_len); - } - } +if (ieee80211_has_protected (hdr->frame_control)) + hdr->frame_control &= ~cpu_to_le16 (IEEE80211_FCTL_PROTECTED ); skb->ip_summed =CHECKSUM_UNNECESSARY ; skb->protocol =eth_type_trans (skb, dev);
@@ -117,7 +110,6 @@ static void mon_recv_encrypted(struct net_device *dev, const u8 *data,void rtl88eu_mon_recv_hook (struct net_device *dev,struct recv_frame *frame) {struct rx_pkt_attrib *attr; -int iv_len, icv_len;int data_len;u8 *data;
@@ -130,11 +122,8 @@ void rtl88eu_mon_recv_hook(struct net_device *dev, struct recv_frame *frame) data = frame->pkt->data; data_len = frame->pkt->len; -/* Broadcast and multicast frames don't have attr->{iv,icv}_len set */ -SET_ICE_IV_LEN (iv_len, icv_len, attr->encrypt); -if (attr->bdecrypted) -mon_recv_decrypted_recv (dev, data, data_len, iv_len, icv_len); +mon_recv_decrypted_recv (dev, data, data_len);else mon_recv_encrypted (dev, data, data_len); }
Signature · 1 line
2.10.2
PATCH 5/7 staging:r8188eu: remove ieee80211_get_hdrlen()
In reply to Ivan Safonovieee80211_get_hdrlen is unused, remove it and all corresponding code.
--- drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 27 -------------------------- drivers/staging/rtl8188eu/include/ieee80211.h | 13 ------------- 2 files changed, 40 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ieee80211.c +0 -27
@@ -972,33 +972,6 @@ int ieee80211_is_empty_essid(const char *essid, int essid_len)return 1 ; } -int ieee80211_get_hdrlen (u16 fc) -{ -int hdrlen =24 ; - -switch (WLAN_FC_GET_TYPE (fc)) { -case RTW_IEEE80211_FTYPE_DATA : -if (fc &RTW_IEEE80211_STYPE_QOS_DATA ) - hdrlen +=2 ; -if ((fc &RTW_IEEE80211_FCTL_FROMDS ) && (fc &RTW_IEEE80211_FCTL_TODS )) - hdrlen +=6 ;/* Addr4 */ -break ; -case RTW_IEEE80211_FTYPE_CTL : -switch (WLAN_FC_GET_STYPE (fc)) { -case RTW_IEEE80211_STYPE_CTS : -case RTW_IEEE80211_STYPE_ACK : - hdrlen =10 ; -break ; -default : - hdrlen =16 ; -break ; - } -break ; - } - -return hdrlen; -} -static int rtw_get_cipher_info (struct wlan_network *pnetwork) {uint wpa_ielen;
drivers/staging/rtl8188eu/include/ieee80211.h +0 -13
@@ -308,10 +308,6 @@ enum eap_type {/* Frame control field constants */ #define RTW_IEEE80211_FCTL_VERS 0x0003 -#define RTW_IEEE80211_FCTL_FTYPE 0x000c -#define RTW_IEEE80211_FCTL_STYPE 0x00f0 -#define RTW_IEEE80211_FCTL_TODS 0x0100 -#define RTW_IEEE80211_FCTL_FROMDS 0x0200#define RTW_IEEE80211_FCTL_MOREFRAGS 0x0400#define RTW_IEEE80211_FCTL_RETRY 0x0800#define RTW_IEEE80211_FCTL_PM 0x1000
@@ -321,8 +317,6 @@ enum eap_type {#define RTW_IEEE80211_FCTL_CTL_EXT 0x0f00#define RTW_IEEE80211_FTYPE_MGMT 0x0000 -#define RTW_IEEE80211_FTYPE_CTL 0x0004 -#define RTW_IEEE80211_FTYPE_DATA 0x0008#define RTW_IEEE80211_FTYPE_EXT 0x000c/* management */
@@ -345,8 +339,6 @@ enum eap_type {#define RTW_IEEE80211_STYPE_BACK 0x0090#define RTW_IEEE80211_STYPE_PSPOLL 0x00A0#define RTW_IEEE80211_STYPE_RTS 0x00B0 -#define RTW_IEEE80211_STYPE_CTS 0x00C0 -#define RTW_IEEE80211_STYPE_ACK 0x00D0#define RTW_IEEE80211_STYPE_CFEND 0x00E0#define RTW_IEEE80211_STYPE_CFENDACK 0x00F0
@@ -359,7 +351,6 @@ enum eap_type {#define RTW_IEEE80211_STYPE_CFACK 0x0050#define RTW_IEEE80211_STYPE_CFPOLL 0x0060#define RTW_IEEE80211_STYPE_CFACKPOLL 0x0070 -#define RTW_IEEE80211_STYPE_QOS_DATA 0x0080#define RTW_IEEE80211_STYPE_QOS_DATA_CFACK 0x0090#define RTW_IEEE80211_STYPE_QOS_DATA_CFPOLL 0x00A0#define RTW_IEEE80211_STYPE_QOS_DATA_CFACKPOLL 0x00B0
@@ -408,9 +399,6 @@ struct ieee80211_snap_hdr {#define SNAP_SIZE sizeof(struct ieee80211_snap_hdr) -#define WLAN_FC_GET_TYPE (fc) ((fc) & RTW_IEEE80211_FCTL_FTYPE) -#define WLAN_FC_GET_STYPE (fc) ((fc) & RTW_IEEE80211_FCTL_STYPE) -#define WLAN_QC_GET_TID (qc) ((qc) & 0x0f)#define WLAN_GET_SEQ_FRAG (seq) ((seq) & RTW_IEEE80211_SCTL_FRAG)
@@ -646,7 +634,6 @@ static inline int is_broadcast_mac_addr(const u8 *addr)/* Baron move to ieee80211.c */ int ieee80211_is_empty_essid (const char *essid,int essid_len); -int ieee80211_get_hdrlen (u16 fc);/* Action category code */ enum rtw_ieee80211_category {
Signature · 1 line
2.10.2
PATCH 6/7 staging:r8188eu: remove ieee80211_is_empty_essid()
In reply to Ivan Safonovieee80211_is_empty_essid() is unused, remove it.
--- drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 17 ----------------- drivers/staging/rtl8188eu/include/ieee80211.h | 3 --- 2 files changed, 20 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ieee80211.c +0 -17
@@ -955,23 +955,6 @@ void rtw_macaddr_cfg(u8 *mac_addr)DBG_88E ("rtw_macaddr_cfg MAC Address = %pM\n" , (mac_addr)); } -/* Baron adds to avoid FreeBSD warning */ -int ieee80211_is_empty_essid (const char *essid,int essid_len) -{ -/* Single white space is for Linksys APs */ -if (essid_len ==1 && essid[0 ] ==' ' ) -return 1 ; - -/* Otherwise, if the entire essid is 0, we assume it is hidden */ -while (essid_len) { - essid_len--; -if (essid[essid_len] !='\0' ) -return 0 ; - } - -return 1 ; -} -static int rtw_get_cipher_info (struct wlan_network *pnetwork) {uint wpa_ielen;
drivers/staging/rtl8188eu/include/ieee80211.h +0 -3
@@ -632,9 +632,6 @@ static inline int is_broadcast_mac_addr(const u8 *addr)#define IEEE_G (1<<2)#define IEEE_MODE_MASK (IEEE_A|IEEE_B|IEEE_G) -/* Baron move to ieee80211.c */ -int ieee80211_is_empty_essid (const char *essid,int essid_len); -/* Action category code */ enum rtw_ieee80211_category {RTW_WLAN_CATEGORY_SPECTRUM_MGMT =0 ,
Signature · 1 line
2.10.2
PATCH 7/7 staging:r8188eu: remove unused definitions from include/ieee80211.h
In reply to Ivan SafonovRemove unused RTW_IEEE80211_FCTL_*, RTW_IEEE80211_FTYPE_*, RTW_IEEE80211_STYPE_*, IEEE80211_STATMASK_*, IEEE80211_DEFAULT_*, BEACON_PROBE_SSID_ID_POSITION, MFIE_TYPE_*, IEEE80211_DTIM_* and IEEE80211_PS_*.
--- drivers/staging/rtl8188eu/include/ieee80211.h | 91 --------------------------- 1 file changed, 91 deletions(-)
drivers/staging/rtl8188eu/include/ieee80211.h +0 -91
@@ -306,59 +306,6 @@ enum eap_type {#define MIN_FRAG_THRESHOLD 256U#define MAX_FRAG_THRESHOLD 2346U -/* Frame control field constants */ -#define RTW_IEEE80211_FCTL_VERS 0x0003 -#define RTW_IEEE80211_FCTL_MOREFRAGS 0x0400 -#define RTW_IEEE80211_FCTL_RETRY 0x0800 -#define RTW_IEEE80211_FCTL_PM 0x1000 -#define RTW_IEEE80211_FCTL_MOREDATA 0x2000 -#define RTW_IEEE80211_FCTL_PROTECTED 0x4000 -#define RTW_IEEE80211_FCTL_ORDER 0x8000 -#define RTW_IEEE80211_FCTL_CTL_EXT 0x0f00 - -#define RTW_IEEE80211_FTYPE_MGMT 0x0000 -#define RTW_IEEE80211_FTYPE_EXT 0x000c - -/* management */ -#define RTW_IEEE80211_STYPE_ASSOC_REQ 0x0000 -#define RTW_IEEE80211_STYPE_ASSOC_RESP 0x0010 -#define RTW_IEEE80211_STYPE_REASSOC_REQ 0x0020 -#define RTW_IEEE80211_STYPE_REASSOC_RESP 0x0030 -#define RTW_IEEE80211_STYPE_PROBE_REQ 0x0040 -#define RTW_IEEE80211_STYPE_PROBE_RESP 0x0050 -#define RTW_IEEE80211_STYPE_BEACON 0x0080 -#define RTW_IEEE80211_STYPE_ATIM 0x0090 -#define RTW_IEEE80211_STYPE_DISASSOC 0x00A0 -#define RTW_IEEE80211_STYPE_AUTH 0x00B0 -#define RTW_IEEE80211_STYPE_DEAUTH 0x00C0 -#define RTW_IEEE80211_STYPE_ACTION 0x00D0 - -/* control */ -#define RTW_IEEE80211_STYPE_CTL_EXT 0x0060 -#define RTW_IEEE80211_STYPE_BACK_REQ 0x0080 -#define RTW_IEEE80211_STYPE_BACK 0x0090 -#define RTW_IEEE80211_STYPE_PSPOLL 0x00A0 -#define RTW_IEEE80211_STYPE_RTS 0x00B0 -#define RTW_IEEE80211_STYPE_CFEND 0x00E0 -#define RTW_IEEE80211_STYPE_CFENDACK 0x00F0 - -/* data */ -#define RTW_IEEE80211_STYPE_DATA 0x0000 -#define RTW_IEEE80211_STYPE_DATA_CFACK 0x0010 -#define RTW_IEEE80211_STYPE_DATA_CFPOLL 0x0020 -#define RTW_IEEE80211_STYPE_DATA_CFACKPOLL 0x0030 -#define RTW_IEEE80211_STYPE_NULLFUNC 0x0040 -#define RTW_IEEE80211_STYPE_CFACK 0x0050 -#define RTW_IEEE80211_STYPE_CFPOLL 0x0060 -#define RTW_IEEE80211_STYPE_CFACKPOLL 0x0070 -#define RTW_IEEE80211_STYPE_QOS_DATA_CFACK 0x0090 -#define RTW_IEEE80211_STYPE_QOS_DATA_CFPOLL 0x00A0 -#define RTW_IEEE80211_STYPE_QOS_DATA_CFACKPOLL 0x00B0 -#define RTW_IEEE80211_STYPE_QOS_NULLFUNC 0x00C0 -#define RTW_IEEE80211_STYPE_QOS_CFACK 0x00D0 -#define RTW_IEEE80211_STYPE_QOS_CFPOLL 0x00E0 -#define RTW_IEEE80211_STYPE_QOS_CFACKPOLL 0x00F0 -/* sequence control field */ #define RTW_IEEE80211_SCTL_FRAG 0x000F#define RTW_IEEE80211_SCTL_SEQ 0xFFF0
@@ -411,14 +358,6 @@ struct ieee80211_snap_hdr {#define IEEE80211_DATA_HDR3_LEN 24#define IEEE80211_DATA_HDR4_LEN 30 - -#define IEEE80211_STATMASK_SIGNAL (1<<0) -#define IEEE80211_STATMASK_RSSI (1<<1) -#define IEEE80211_STATMASK_NOISE (1<<2) -#define IEEE80211_STATMASK_RATE (1<<3) -#define IEEE80211_STATMASK_WEMASK 0x7 - -#define IEEE80211_CCK_MODULATION (1<<0)#define IEEE80211_OFDM_MODULATION (1<<1)
@@ -476,9 +415,6 @@ struct ieee80211_snap_hdr { IEEE80211_OFDM_RATE_36MB_MASK | \ IEEE80211_OFDM_RATE_48MB_MASK | \ IEEE80211_OFDM_RATE_54MB_MASK) -#define IEEE80211_DEFAULT_RATES_MASK \ - (IEEE80211_OFDM_DEFAULT_RATES_MASK | \ - IEEE80211_CCK_DEFAULT_RATES_MASK)#define IEEE80211_NUM_OFDM_RATES 8#define IEEE80211_NUM_CCK_RATES 4
@@ -509,25 +445,6 @@ struct ieee80211_snap_hdr {#define WEP_KEYS 4#define WEP_KEY_LEN 13 -#define BEACON_PROBE_SSID_ID_POSITION 12 - -/* Management Frame Information Element Types */ -#define MFIE_TYPE_SSID 0 -#define MFIE_TYPE_RATES 1 -#define MFIE_TYPE_FH_SET 2 -#define MFIE_TYPE_DS_SET 3 -#define MFIE_TYPE_CF_SET 4 -#define MFIE_TYPE_TIM 5 -#define MFIE_TYPE_IBSS_SET 6 -#define MFIE_TYPE_CHALLENGE 16 -#define MFIE_TYPE_ERP 42 -#define MFIE_TYPE_RSN 48 -#define MFIE_TYPE_RATES_EX 50 -#define MFIE_TYPE_GENERIC 221 - -#define IEEE80211_DEFAULT_TX_ESSID "Penguin" -#define IEEE80211_DEFAULT_BASIC_RATE 10 -/* SWEEP TABLE ENTRIES NUMBER*/ #define MAX_SWEEP_TAB_ENTRIES 42#define MAX_SWEEP_TAB_ENTRIES_PER_PACKET 7
@@ -554,14 +471,6 @@ struct ieee80211_snap_hdr {#define NETWORK_HAS_OFDM (1<<1)#define NETWORK_HAS_CCK (1<<2) -#define IEEE80211_DTIM_MBCAST 4 -#define IEEE80211_DTIM_UCAST 2 -#define IEEE80211_DTIM_VALID 1 -#define IEEE80211_DTIM_INVALID 0 - -#define IEEE80211_PS_DISABLED 0 -#define IEEE80211_PS_UNICAST IEEE80211_DTIM_UCAST -#define IEEE80211_PS_MBCAST IEEE80211_DTIM_MBCAST#define IW_ESSID_MAX_SIZE 32/* join_res:
Signature · 1 line
2.10.2