staging: rtl8192e: Replace struct rtllib_hdr_3addr
cover staging: rtl8192e: Replace struct rtllib_hdr_3addr
Replace struct rtllib_hdr_3addr and and similar structs. Replace management subframe types constants with IEEE80211_* and similar constants.
Tested with rtl8192e (WLL6130-D99) in Mode n (12.2 MB/s) Transferred this patch over wlan connection of rtl8192e.
---
Here some tests regarding sizes of structs and one pointername change:printk("size rtllib_hdr_3addr: %ld\n",sizeof(struct rtllib_hdr_3addr)); printk("size ieee80211_hdr_3addr: %ld\n",sizeof(struct ieee80211_hdr_3addr));
[ 7413.371188] size rtllib_hdr_3addr: 24 [ 7413.371196] size ieee80211_hdr_3addr: 24
delba = (struct rtllib_hdr_3addr *)skb->data;delba_ph = (struct ieee80211_hdr_3addr *)skb->data; pDelBaParamSet = (union delba_param_set *)&delba->payload[2]; pDelBaParamSet_ph = (union delba_param_set *)&delba_ph->seq_ctrl + 2; int ph_payload = pDelBaParamSet - pDelBaParamSet_ph; printk("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!diff: %d\n", ph_payload);
[ 5608.787297] !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!diff: 0
printk("ieee80211_hdr %ld\n",sizeof(struct ieee80211_hdr)); printk("rtllib_hdr_4addr %ld\n",sizeof(struct rtllib_hdr_4addr));
[ 8182.169990] ieee80211_hdr 30 [ 8182.170023] rtllib_hdr_4addr 30
printk("ieee80211_pspoll %ld\n",sizeof(struct ieee80211_pspoll)); printk("rtllib_pspoll_hdr %ld\n",sizeof(struct rtllib_pspoll_hdr));
[12277.846879] ieee80211_pspoll 16 [12277.846900] rtllib_pspoll_hdr 16
Philipp Hortmann (16):
staging: rtl8192e: Replace struct rtllib_hdr_1addr with ieee80211_hdr
staging: rtl8192e: Replace struct rtllib_hdr_3addr in rtllib_rx.c
staging: rtl8192e: Replace struct rtllib_hdr_3addr in rtl819x_BAProc.c
staging: rtl8192e: Replace struct rtllib_hdr_3addr in rtllib_softmac.c
staging: rtl8192e: Replace struct rtllib_hdr_3addr in r8192E_dev.c
staging: rtl8192e: Replace struct rtllib_hdr_3addr in structs of
rtllib.h
staging: rtl8192e: Remove unused struct rtllib_hdr and two enums
staging: rtl8192e: Replace struct rtllib_hdr_4addr in rtllib_crypt*.c
staging: rtl8192e: Remove struct rtllib_hdr_4addr
staging: rtl8192e: Remove struct rtllib_hdr_3addrqos
staging: rtl8192e: Remove struct rtllib_hdr_4addrqos
staging: rtl8192e: Remove struct rtllib_pspoll_hdr
staging: rtl8192e: Replace management subframe types with
IEEE80211_STYPE_*
staging: rtl8192e: Replace control subframe types with
IEEE80211_STYPE_*
staging: rtl8192e: Replace usage of RTLLIB_FCTL_DSTODS with function
staging: rtl8192e: Replace frame control constants with
IEEE80211_FCTL_*.../staging/rtl8192e/rtl8192e/r8192E_dev.c | 18 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 8 +- drivers/staging/rtl8192e/rtl819x_BAProc.c | 48 ++-- drivers/staging/rtl8192e/rtllib.h | 183 ++-------------- drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 17 +- drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 40 ++-- drivers/staging/rtl8192e/rtllib_rx.c | 206 +++++++++--------- drivers/staging/rtl8192e/rtllib_softmac.c | 100 ++++----- drivers/staging/rtl8192e/rtllib_tx.c | 36 +-- 9 files changed, 257 insertions(+), 399 deletions(-)
Signature · 1 line
2.42.0
PATCH 1/16 staging: rtl8192e: Replace struct rtllib_hdr_1addr with ieee80211_hdr
Replace struct rtllib_hdr_1addr with struct ieee80211_hdr to avoid proprietary struct.
--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 8 ++++---- drivers/staging/rtl8192e/rtllib.h | 7 ------- drivers/staging/rtl8192e/rtllib_tx.c | 2 +- 3 files changed, 5 insertions(+), 12 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +4 -4
@@ -1470,7 +1470,7 @@ static short _rtl92e_tx(struct net_device *dev, struct sk_buff *skb)struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE );struct tx_desc *pdesc =NULL ; -struct rtllib_hdr_1addr *header =NULL ; +struct ieee80211_hdr *header =NULL ;u8 *pda_addr =NULL ;int idx;u32 fwinfo_size =0 ;
@@ -1479,7 +1479,7 @@ static short _rtl92e_tx(struct net_device *dev, struct sk_buff *skb) fwinfo_size =sizeof (struct tx_fwinfo_8190pci ); - header = (struct rtllib_hdr_1addr *)(((u8 *)skb->data) + fwinfo_size); + header = (struct ieee80211_hdr *)(((u8 *)skb->data) + fwinfo_size); pda_addr = header->addr1;if (!is_broadcast_ether_addr (pda_addr) && !is_multicast_ether_addr (pda_addr))
@@ -1725,7 +1725,7 @@ void rtl92e_copy_mpdu_stats(struct rtllib_rx_stats *psrc_stats,static void _rtl92e_rx_normal (struct net_device *dev) {struct r8192_priv *priv =rtllib_priv (dev); -struct rtllib_hdr_1addr *rtllib_hdr =NULL ; +struct ieee80211_hdr *rtllib_hdr =NULL ;bool unicast_packet = false;u32 skb_len =0 ;int rx_queue_idx =RX_MPDU_QUEUE ;
@@ -1764,7 +1764,7 @@ static void _rtl92e_rx_normal(struct net_device *dev)skb_reserve (skb, stats.RxDrvInfoSize + stats.RxBufShift);skb_trim (skb, skb->len -S_CRC_LEN ); - rtllib_hdr = (struct rtllib_hdr_1addr *)skb->data; + rtllib_hdr = (struct ieee80211_hdr *)skb->data;if (!is_multicast_ether_addr (rtllib_hdr->addr1)) {/* unicast packet */ unicast_packet = true;
drivers/staging/rtl8192e/rtllib.h +0 -7
@@ -685,13 +685,6 @@ struct rtllib_hdr {u8 payload[]; } __packed; -struct rtllib_hdr_1addr { -__le16 frame_ctl; -__le16 duration_id; -u8 addr1[ETH_ALEN ]; -u8 payload[]; -} __packed; -struct rtllib_hdr_3addr {__le16 frame_ctl;__le16 duration_id;
drivers/staging/rtl8192e/rtllib_tx.c +1 -1
@@ -268,7 +268,7 @@ static void rtllib_tx_query_agg_cap(struct rtllib_device *ieee, {struct rt_hi_throughput *ht_info = ieee->ht_info;struct tx_ts_record *pTxTs =NULL ; -struct rtllib_hdr_1addr *hdr = (struct rtllib_hdr_1addr *)skb->data; +struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;if (rtllib_act_scanning (ieee, false))return ;
Signature · 1 line
2.42.0
PATCH 2/16 staging: rtl8192e: Replace struct rtllib_hdr_3addr in rtllib_rx.c
In reply to Philipp HortmannReplace struct rtllib_hdr_3addr with struct ieee80211_hdr_3addr to avoid proprietary struct.
--- drivers/staging/rtl8192e/rtllib_rx.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/staging/rtl8192e/rtllib_rx.c +5 -5
@@ -210,7 +210,7 @@ rtllib_rx_frame_mgmt(struct rtllib_device *ieee, struct sk_buff *skb,* this is not mandatory.... but seems that the probe * response parser uses it */ -struct rtllib_hdr_3addr *hdr = (struct rtllib_hdr_3addr *)skb->data; +struct ieee80211_hdr_3addr *hdr = (struct ieee80211_hdr_3addr *)skb->data; rx_stats->len = skb->len;rtllib_rx_mgt (ieee, skb, rx_stats);
@@ -753,10 +753,10 @@ static u8 parse_subframe(struct rtllib_device *ieee, struct sk_buff *skb,struct rtllib_rx_stats *rx_stats, struct rtllib_rxb *rxb, u8 *src, u8 *dst) { - struct rtllib_hdr_3addr *hdr = (struct rtllib_hdr_3addr *)skb->data; -u16 fc =le16_to_cpu (hdr->frame_ctl); + struct ieee80211_hdr_3addr *hdr = (struct ieee80211_hdr_3addr *)skb->data; +u16 fc =le16_to_cpu (hdr->frame_control); -u16 LLCOffset =sizeof (struct rtllib_hdr_3addr ); +u16 LLCOffset =sizeof (struct ieee80211_hdr_3addr );u16 ChkLength;bool bIsAggregateFrame = false;u16 nSubframe_Length;
@@ -764,7 +764,7 @@ static u8 parse_subframe(struct rtllib_device *ieee, struct sk_buff *skb,u16 SeqNum =0 ;struct sk_buff *sub_skb;/* just for debug purpose */ - SeqNum =WLAN_GET_SEQ_SEQ (le16_to_cpu (hdr->seq_ctl)); + SeqNum =WLAN_GET_SEQ_SEQ (le16_to_cpu (hdr->seq_ctrl));if ((RTLLIB_QOS_HAS_SEQ (fc)) && (((union frameqos *)(skb->data +RTLLIB_3ADDR_LEN ))->field.reserved)) bIsAggregateFrame = true;
Signature · 1 line
2.42.0
PATCH 3/16 staging: rtl8192e: Replace struct rtllib_hdr_3addr in rtl819x_BAProc.c
In reply to Philipp HortmannReplace struct rtllib_hdr_3addr with struct ieee80211_hdr_3addr to avoid proprietary struct.
--- drivers/staging/rtl8192e/rtl819x_BAProc.c | 48 +++++++++++------------ 1 file changed, 24 insertions(+), 24 deletions(-)
drivers/staging/rtl8192e/rtl819x_BAProc.c +24 -24
@@ -68,7 +68,7 @@ static struct sk_buff *rtllib_ADDBA(struct rtllib_device *ieee, u8 *Dst, u16 StatusCode, u8 type) {struct sk_buff *skb =NULL ; -struct rtllib_hdr_3addr *BAReq =NULL ; +struct ieee80211_hdr_3addr *BAReq =NULL ;u8 *tag =NULL ;u16 len = ieee->tx_headroom +9 ;
@@ -79,21 +79,21 @@ static struct sk_buff *rtllib_ADDBA(struct rtllib_device *ieee, u8 *Dst,netdev_warn (ieee->dev,"pBA is NULL\n" );return NULL ; } - skb =dev_alloc_skb (len +sizeof (struct rtllib_hdr_3addr )); + skb =dev_alloc_skb (len +sizeof (struct ieee80211_hdr_3addr ));if (!skb)return NULL ; -memset (skb->data,0 ,sizeof (struct rtllib_hdr_3addr )); +memset (skb->data,0 ,sizeof (struct ieee80211_hdr_3addr ));skb_reserve (skb, ieee->tx_headroom); - BAReq =skb_put (skb,sizeof (struct rtllib_hdr_3addr )); + BAReq =skb_put (skb,sizeof (struct ieee80211_hdr_3addr ));ether_addr_copy (BAReq->addr1, Dst);ether_addr_copy (BAReq->addr2, ieee->dev->dev_addr);ether_addr_copy (BAReq->addr3, ieee->current_network.bssid); - BAReq->frame_ctl =cpu_to_le16 (RTLLIB_STYPE_MANAGE_ACT ); + BAReq->frame_control =cpu_to_le16 (RTLLIB_STYPE_MANAGE_ACT ); tag =skb_put (skb,9 ); *tag++ =ACT_CAT_BA ;
@@ -129,7 +129,7 @@ static struct sk_buff *rtllib_DELBA(struct rtllib_device *ieee, u8 *dst, {union delba_param_set DelbaParamSet;struct sk_buff *skb =NULL ; -struct rtllib_hdr_3addr *Delba =NULL ; +struct ieee80211_hdr_3addr *Delba =NULL ;u8 *tag =NULL ;u16 len =6 + ieee->tx_headroom;
@@ -142,18 +142,18 @@ static struct sk_buff *rtllib_DELBA(struct rtllib_device *ieee, u8 *dst, DelbaParamSet.field.initiator = (TxRxSelect ==TX_DIR ) ?1 :0 ; DelbaParamSet.field.tid = pBA->ba_param_set.field.tid; - skb =dev_alloc_skb (len +sizeof (struct rtllib_hdr_3addr )); + skb =dev_alloc_skb (len +sizeof (struct ieee80211_hdr_3addr ));if (!skb)return NULL ;skb_reserve (skb, ieee->tx_headroom); - Delba =skb_put (skb,sizeof (struct rtllib_hdr_3addr )); + Delba =skb_put (skb,sizeof (struct ieee80211_hdr_3addr ));ether_addr_copy (Delba->addr1, dst);ether_addr_copy (Delba->addr2, ieee->dev->dev_addr);ether_addr_copy (Delba->addr3, ieee->current_network.bssid); - Delba->frame_ctl =cpu_to_le16 (RTLLIB_STYPE_MANAGE_ACT ); + Delba->frame_control =cpu_to_le16 (RTLLIB_STYPE_MANAGE_ACT ); tag =skb_put (skb,6 );
@@ -213,7 +213,7 @@ static void rtllib_send_DELBA(struct rtllib_device *ieee, u8 *dst,int rtllib_rx_ADDBAReq (struct rtllib_device *ieee,struct sk_buff *skb) { -struct rtllib_hdr_3addr *req =NULL ; +struct ieee80211_hdr_3addr *req =NULL ;u16 rc =0 ;u8 *dst =NULL , *pDialogToken =NULL , *tag =NULL ;struct ba_record *pBA =NULL ;
@@ -222,10 +222,10 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb)union sequence_control *pBaStartSeqCtrl =NULL ;struct rx_ts_record *ts =NULL ; -if (skb->len <sizeof (struct rtllib_hdr_3addr ) +9 ) { +if (skb->len <sizeof (struct ieee80211_hdr_3addr ) +9 ) {netdev_warn (ieee->dev,"Invalid skb len in BAREQ(%d / %d)\n" , (int )skb->len, - (int )(sizeof (struct rtllib_hdr_3addr ) +9 )); + (int )(sizeof (struct ieee80211_hdr_3addr ) +9 ));return -1 ; }
@@ -234,10 +234,10 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb) skb->data, skb->len);#endif - req = (struct rtllib_hdr_3addr *)skb->data; + req = (struct ieee80211_hdr_3addr *)skb->data; tag = (u8 *)req; dst = (u8 *)(&req->addr2[0 ]); - tag +=sizeof (struct rtllib_hdr_3addr ); + tag +=sizeof (struct ieee80211_hdr_3addr ); pDialogToken = tag +2 ; pBaParamSet = (union ba_param_set *)(tag +3 ); pBaTimeoutVal = (u16 *)(tag +5 );
@@ -302,7 +302,7 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb)int rtllib_rx_ADDBARsp (struct rtllib_device *ieee,struct sk_buff *skb) { -struct rtllib_hdr_3addr *rsp =NULL ; +struct ieee80211_hdr_3addr *rsp =NULL ;struct ba_record *pPendingBA, *pAdmittedBA;struct tx_ts_record *pTS =NULL ;u8 *dst =NULL , *pDialogToken =NULL , *tag =NULL ;
@@ -310,16 +310,16 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb)union ba_param_set *pBaParamSet =NULL ;u16 ReasonCode; -if (skb->len <sizeof (struct rtllib_hdr_3addr ) +9 ) { +if (skb->len <sizeof (struct ieee80211_hdr_3addr ) +9 ) {netdev_warn (ieee->dev,"Invalid skb len in BARSP(%d / %d)\n" , (int )skb->len, - (int )(sizeof (struct rtllib_hdr_3addr ) +9 )); + (int )(sizeof (struct ieee80211_hdr_3addr ) +9 ));return -1 ; } - rsp = (struct rtllib_hdr_3addr *)skb->data; + rsp = (struct ieee80211_hdr_3addr *)skb->data; tag = (u8 *)rsp; dst = (u8 *)(&rsp->addr2[0 ]); - tag +=sizeof (struct rtllib_hdr_3addr ); + tag +=sizeof (struct ieee80211_hdr_3addr ); pDialogToken = tag +2 ; pStatusCode = (u16 *)(tag +3 ); pBaParamSet = (union ba_param_set *)(tag +5 );
@@ -401,14 +401,14 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb)int rtllib_rx_DELBA (struct rtllib_device *ieee,struct sk_buff *skb) { -struct rtllib_hdr_3addr *delba =NULL ; +struct ieee80211_hdr_3addr *delba =NULL ;union delba_param_set *pDelBaParamSet =NULL ;u8 *dst =NULL ; -if (skb->len <sizeof (struct rtllib_hdr_3addr ) +6 ) { +if (skb->len <sizeof (struct ieee80211_hdr_3addr ) +6 ) {netdev_warn (ieee->dev,"Invalid skb len in DELBA(%d / %d)\n" , (int )skb->len, - (int )(sizeof (struct rtllib_hdr_3addr ) +6 )); + (int )(sizeof (struct ieee80211_hdr_3addr ) +6 ));return -1 ; }
@@ -425,9 +425,9 @@ int rtllib_rx_DELBA(struct rtllib_device *ieee, struct sk_buff *skb)print_hex_dump_bytes ("%s: " ,DUMP_PREFIX_NONE , skb->data, __func__, skb->len);#endif - delba = (struct rtllib_hdr_3addr *)skb->data; + delba = (struct ieee80211_hdr_3addr *)skb->data; dst = (u8 *)(&delba->addr2[0 ]); - pDelBaParamSet = (union delba_param_set *)&delba->payload[2 ]; + pDelBaParamSet = (union delba_param_set *)&delba->seq_ctrl +2 ;if (pDelBaParamSet->field.initiator ==1 ) {struct rx_ts_record *ts;
Signature · 1 line
2.42.0
PATCH 4/16 staging: rtl8192e: Replace struct rtllib_hdr_3addr in rtllib_softmac.c
In reply to Philipp HortmannReplace struct rtllib_hdr_3addr with struct ieee80211_hdr_3addr to avoid proprietary struct.
--- drivers/staging/rtl8192e/rtllib_softmac.c | 50 +++++++++++------------ 1 file changed, 25 insertions(+), 25 deletions(-)
drivers/staging/rtl8192e/rtllib_softmac.c +25 -25
@@ -187,8 +187,8 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct rtllib_device *ieee) {unsigned long flags;short single = ieee->softmac_features &IEEE_SOFTMAC_SINGLE_QUEUE ; -struct rtllib_hdr_3addr *header = - (struct rtllib_hdr_3addr *)skb->data; +struct ieee80211_hdr_3addr *header = + (struct ieee80211_hdr_3addr *)skb->data;struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb +8 );
@@ -197,7 +197,7 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct rtllib_device *ieee)/* called with 2nd param 0, no mgmt lock required */ rtllib_sta_wakeup (ieee,0 ); -if (ieee80211_is_beacon (header->frame_ctl)) +if (ieee80211_is_beacon (header->frame_control)) tcb_desc->queue_index =BEACON_QUEUE ;else tcb_desc->queue_index =MGNT_QUEUE ;
@@ -213,7 +213,7 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct rtllib_device *ieee)if (ieee->queue_stop) {enqueue_mgmt (ieee, skb); }else { - header->seq_ctl =cpu_to_le16 (ieee->seq_ctrl[0 ] <<4 ); + header->seq_ctrl =cpu_to_le16 (ieee->seq_ctrl[0 ] <<4 );if (ieee->seq_ctrl[0 ] ==0xFFF ) ieee->seq_ctrl[0 ] =0 ;
@@ -230,7 +230,7 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct rtllib_device *ieee)spin_unlock_irqrestore (&ieee->lock, flags);spin_lock_irqsave (&ieee->mgmt_tx_lock, flags); - header->seq_ctl =cpu_to_le16 (ieee->seq_ctrl[0 ] <<4 ); + header->seq_ctrl =cpu_to_le16 (ieee->seq_ctrl[0 ] <<4 );if (ieee->seq_ctrl[0 ] ==0xFFF ) ieee->seq_ctrl[0 ] =0 ;
@@ -264,12 +264,12 @@ softmac_ps_mgmt_xmit(struct sk_buff *skb, struct rtllib_device *ieee) {short single = ieee->softmac_features &IEEE_SOFTMAC_SINGLE_QUEUE ; -struct rtllib_hdr_3addr *header = - (struct rtllib_hdr_3addr *)skb->data; +struct ieee80211_hdr_3addr *header = + (struct ieee80211_hdr_3addr *)skb->data;u16 fc, type, stype;struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb +8 ); - fc =le16_to_cpu (header->frame_ctl); + fc =le16_to_cpu (header->frame_control); type =WLAN_FC_GET_TYPE (fc); stype =WLAN_FC_GET_STYPE (fc);
@@ -287,7 +287,7 @@ softmac_ps_mgmt_xmit(struct sk_buff *skb, tcb_desc->tx_use_drv_assinged_rate =1 ;if (single) {if (type !=RTLLIB_FTYPE_CTL ) { - header->seq_ctl =cpu_to_le16 (ieee->seq_ctrl[0 ] <<4 ); + header->seq_ctrl =cpu_to_le16 (ieee->seq_ctrl[0 ] <<4 );if (ieee->seq_ctrl[0 ] ==0xFFF ) ieee->seq_ctrl[0 ] =0 ;
@@ -300,7 +300,7 @@ softmac_ps_mgmt_xmit(struct sk_buff *skb, }else {if (type !=RTLLIB_FTYPE_CTL ) { - header->seq_ctl =cpu_to_le16 (ieee->seq_ctrl[0 ] <<4 ); + header->seq_ctrl =cpu_to_le16 (ieee->seq_ctrl[0 ] <<4 );if (ieee->seq_ctrl[0 ] ==0xFFF ) ieee->seq_ctrl[0 ] =0 ;
@@ -912,21 +912,21 @@ static struct sk_buff *rtllib_probe_resp(struct rtllib_device *ieee,static struct sk_buff *rtllib_null_func (struct rtllib_device *ieee,short pwr) {struct sk_buff *skb; -struct rtllib_hdr_3addr *hdr; +struct ieee80211_hdr_3addr *hdr; - skb =dev_alloc_skb (sizeof (struct rtllib_hdr_3addr ) + ieee->tx_headroom); + skb =dev_alloc_skb (sizeof (struct ieee80211_hdr_3addr ) + ieee->tx_headroom);if (!skb)return NULL ;skb_reserve (skb, ieee->tx_headroom); - hdr =skb_put (skb,sizeof (struct rtllib_hdr_3addr )); + hdr =skb_put (skb,sizeof (struct ieee80211_hdr_3addr ));ether_addr_copy (hdr->addr1, ieee->current_network.bssid);ether_addr_copy (hdr->addr2, ieee->dev->dev_addr);ether_addr_copy (hdr->addr3, ieee->current_network.bssid); - hdr->frame_ctl =cpu_to_le16 (RTLLIB_FTYPE_DATA | + hdr->frame_control =cpu_to_le16 (RTLLIB_FTYPE_DATA |RTLLIB_STYPE_NULLFUNC |RTLLIB_FCTL_TODS | (pwr ?RTLLIB_FCTL_PM :0 ));
@@ -1311,7 +1311,7 @@ static void rtllib_auth_challenge(struct rtllib_device *ieee, u8 *challenge, "Sending authentication challenge response\n");rtllib_encrypt_fragment (ieee, skb, -sizeof (struct rtllib_hdr_3addr )); +sizeof (struct ieee80211_hdr_3addr ));softmac_mgmt_xmit (skb, ieee);mod_timer (&ieee->associate_timer, jiffies + (HZ /2 ));
@@ -1620,11 +1620,11 @@ static short probe_rq_parse(struct rtllib_device *ieee, struct sk_buff *skb,u8 *skbend;u8 *ssid =NULL ;u8 ssidlen =0 ; -struct rtllib_hdr_3addr *header = - (struct rtllib_hdr_3addr *)skb->data; +struct ieee80211_hdr_3addr *header = + (struct ieee80211_hdr_3addr *)skb->data;bool bssid_match; -if (skb->len <sizeof (struct rtllib_hdr_3addr )) +if (skb->len <sizeof (struct ieee80211_hdr_3addr ))return -1 ;/* corrupted */ bssid_match =
@@ -1637,7 +1637,7 @@ static short probe_rq_parse(struct rtllib_device *ieee, struct sk_buff *skb, skbend = (u8 *)skb->data + skb->len; - tag = skb->data +sizeof (struct rtllib_hdr_3addr ); + tag = skb->data +sizeof (struct ieee80211_hdr_3addr );while (tag +1 < skbend) {if (*tag ==0 ) {
@@ -1953,8 +1953,8 @@ rtllib_rx_assoc_resp(struct rtllib_device *ieee, struct sk_buff *skb,int aid;u8 *ies;struct rtllib_assoc_response_frame *assoc_resp; -struct rtllib_hdr_3addr *header = (struct rtllib_hdr_3addr *)skb->data; -u16 frame_ctl =le16_to_cpu (header->frame_ctl); +struct ieee80211_hdr_3addr *header = (struct ieee80211_hdr_3addr *)skb->data; +u16 frame_ctl =le16_to_cpu (header->frame_control);netdev_dbg (ieee->dev,"received [RE]ASSOCIATION RESPONSE (%d)\n" ,WLAN_FC_GET_STYPE (frame_ctl));
@@ -2092,7 +2092,7 @@ rtllib_rx_auth(struct rtllib_device *ieee, struct sk_buff *skb,static inline int rtllib_rx_deauth (struct rtllib_device *ieee,struct sk_buff *skb) { -struct rtllib_hdr_3addr *header = (struct rtllib_hdr_3addr *)skb->data; +struct ieee80211_hdr_3addr *header = (struct ieee80211_hdr_3addr *)skb->data;u16 frame_ctl;if (memcmp (header->addr3, ieee->current_network.bssid,ETH_ALEN ) !=0 )
@@ -2104,7 +2104,7 @@ rtllib_rx_deauth(struct rtllib_device *ieee, struct sk_buff *skb)if ((ieee->softmac_features &IEEE_SOFTMAC_ASSOCIATE ) && ieee->link_state ==MAC80211_LINKED && (ieee->iw_mode ==IW_MODE_INFRA )) { - frame_ctl =le16_to_cpu (header->frame_ctl); + frame_ctl =le16_to_cpu (header->frame_control); netdev_info(ieee->dev, "==========>received disassoc/deauth(%x) frame, reason code:%x\n", WLAN_FC_GET_STYPE(frame_ctl),
@@ -2128,13 +2128,13 @@ inline int rtllib_rx_frame_softmac(struct rtllib_device *ieee, struct rtllib_rx_stats *rx_stats, u16 type, u16 stype) { - struct rtllib_hdr_3addr *header = (struct rtllib_hdr_3addr *)skb->data; + struct ieee80211_hdr_3addr *header = (struct ieee80211_hdr_3addr *)skb->data;u16 frame_ctl;if (!ieee->proto_started)return 0 ; - frame_ctl =le16_to_cpu (header->frame_ctl); + frame_ctl =le16_to_cpu (header->frame_control);switch (WLAN_FC_GET_STYPE (frame_ctl)) {case RTLLIB_STYPE_ASSOC_RESP :case RTLLIB_STYPE_REASSOC_RESP :
Signature · 1 line
2.42.0
PATCH 5/16 staging: rtl8192e: Replace struct rtllib_hdr_3addr in r8192E_dev.c
In reply to Philipp HortmannReplace struct rtllib_hdr_3addr with struct ieee80211_hdr_3addr to avoid proprietary struct in r8192E_dev.c, rtllib_tx.c and in functions of rtllib.h.
--- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 14 +++++++------- drivers/staging/rtl8192e/rtllib.h | 6 +++--- drivers/staging/rtl8192e/rtllib_tx.c | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +7 -7
@@ -1411,12 +1411,12 @@ static void _rtl92e_process_phyinfo(struct r8192_priv *priv, u8 *buffer,static u32 slide_beacon_adc_pwdb_index;static u32 slide_beacon_adc_pwdb_statistics;static u32 last_beacon_adc_pwdb; -struct rtllib_hdr_3addr *hdr; +struct ieee80211_hdr_3addr *hdr;u16 sc;unsigned int seq; - hdr = (struct rtllib_hdr_3addr *)buffer; - sc =le16_to_cpu (hdr->seq_ctl); + hdr = (struct ieee80211_hdr_3addr *)buffer; + sc =le16_to_cpu (hdr->seq_ctrl); seq =WLAN_GET_SEQ_SEQ (sc); curr_st->Seq_Num = seq;if (!prev_st->bIsAMPDU)
@@ -1561,7 +1561,7 @@ static void _rtl92e_translate_rx_signal_stats(struct net_device *dev,struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv (dev);bool bpacket_match_bssid, bpacket_toself;bool bPacketBeacon = false; -struct rtllib_hdr_3addr *hdr; +struct ieee80211_hdr_3addr *hdr;bool bToSelfBA = false;static struct rtllib_rx_stats previous_stats;u16 fc, type;
@@ -1570,8 +1570,8 @@ static void _rtl92e_translate_rx_signal_stats(struct net_device *dev, tmp_buf = skb->data + pstats->RxDrvInfoSize + pstats->RxBufShift; - hdr = (struct rtllib_hdr_3addr *)tmp_buf; - fc =le16_to_cpu (hdr->frame_ctl); + hdr = (struct ieee80211_hdr_3addr *)tmp_buf; + fc =le16_to_cpu (hdr->frame_control); type =WLAN_FC_GET_TYPE (fc); praddr = hdr->addr1;
@@ -1584,7 +1584,7 @@ static void _rtl92e_translate_rx_signal_stats(struct net_device *dev, (!pstats->bHwError) && (!pstats->bCRC) && (!pstats->bICV)); bpacket_toself = bpacket_match_bssid &&/* check this */ ether_addr_equal (praddr, priv->rtllib->dev->dev_addr); -if (ieee80211_is_beacon (hdr->frame_ctl)) +if (ieee80211_is_beacon (hdr->frame_control)) bPacketBeacon = true;_rtl92e_process_phyinfo (priv, tmp_buf, &previous_stats, pstats); _rtl92e_query_rxphystatus(priv, pstats, pdesc, pdrvinfo,
drivers/staging/rtl8192e/rtllib.h +3 -3
@@ -931,11 +931,11 @@ static inline const char *eap_get_type(int type)static inline u8 Frame_QoSTID (u8 *buf) { -struct rtllib_hdr_3addr *hdr; +struct ieee80211_hdr_3addr *hdr;u16 fc; - hdr = (struct rtllib_hdr_3addr *)buf; - fc =le16_to_cpu (hdr->frame_ctl); + hdr = (struct ieee80211_hdr_3addr *)buf; + fc =le16_to_cpu (hdr->frame_control);return (u8)((union frameqos *)(buf + (((fc &RTLLIB_FCTL_TODS ) && (fc &RTLLIB_FCTL_FROMDS )) ?30 :24 )))->field.tid; }
drivers/staging/rtl8192e/rtllib_tx.c +1 -1
@@ -853,7 +853,7 @@ static int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev) ieee->seq_ctrl[0 ]++; } }else { -if (unlikely (skb->len <sizeof (struct rtllib_hdr_3addr ))) { +if (unlikely (skb->len <sizeof (struct ieee80211_hdr_3addr ))) {netdev_warn (ieee->dev,"skb too small (%d).\n" , skb->len); goto success;
Signature · 1 line
2.42.0
PATCH 6/16 staging: rtl8192e: Replace struct rtllib_hdr_3addr in structs of rtllib.h
In reply to Philipp HortmannReplace struct rtllib_hdr_3addr with struct ieee80211_hdr_3addr to avoid proprietary struct in structs of rtllib.h.
--- drivers/staging/rtl8192e/rtllib.h | 24 +++++++---------------- drivers/staging/rtl8192e/rtllib_rx.c | 2 +- drivers/staging/rtl8192e/rtllib_softmac.c | 18 ++++++++--------- 3 files changed, 17 insertions(+), 27 deletions(-)
drivers/staging/rtl8192e/rtllib.h +7 -17
@@ -685,16 +685,6 @@ struct rtllib_hdr {u8 payload[]; } __packed; -struct rtllib_hdr_3addr { -__le16 frame_ctl; -__le16 duration_id; -u8 addr1[ETH_ALEN ]; -u8 addr2[ETH_ALEN ]; -u8 addr3[ETH_ALEN ]; -__le16 seq_ctl; -u8 payload[]; -} __packed; -struct rtllib_hdr_4addr {__le16 frame_ctl;__le16 duration_id;
@@ -736,7 +726,7 @@ struct rtllib_info_element { } __packed;struct rtllib_authentication { -struct rtllib_hdr_3addr header; +struct ieee80211_hdr_3addr header;__le16 algorithm;__le16 transaction;__le16 status;
@@ -745,23 +735,23 @@ struct rtllib_authentication { } __packed;struct rtllib_disauth { -struct rtllib_hdr_3addr header; +struct ieee80211_hdr_3addr header;__le16 reason; } __packed;struct rtllib_disassoc { -struct rtllib_hdr_3addr header; +struct ieee80211_hdr_3addr header;__le16 reason; } __packed;struct rtllib_probe_request { -struct rtllib_hdr_3addr header; +struct ieee80211_hdr_3addr header;/* SSID, supported rates */ struct rtllib_info_element info_element[]; } __packed;struct rtllib_probe_response { -struct rtllib_hdr_3addr header; +struct ieee80211_hdr_3addr header;u32 time_stamp[2 ];__le16 beacon_interval;__le16 capability;
@@ -775,7 +765,7 @@ struct rtllib_probe_response {#define rtllib_beacon rtllib_probe_responsestruct rtllib_assoc_request_frame { -struct rtllib_hdr_3addr header; +struct ieee80211_hdr_3addr header;__le16 capability;__le16 listen_interval;/* SSID, supported rates, RSN */
@@ -783,7 +773,7 @@ struct rtllib_assoc_request_frame { } __packed;struct rtllib_assoc_response_frame { -struct rtllib_hdr_3addr header; +struct ieee80211_hdr_3addr header;__le16 capability;__le16 status;__le16 aid;
drivers/staging/rtl8192e/rtllib_rx.c +1 -1
@@ -2483,7 +2483,7 @@ static inline void rtllib_process_probe_response(short renew;struct rtllib_network *network =kzalloc (sizeof (struct rtllib_network ),GFP_ATOMIC ); -__le16 frame_ctl = beacon->header.frame_ctl; +__le16 frame_ctl = beacon->header.frame_control;if (!network)return ;
drivers/staging/rtl8192e/rtllib_softmac.c +9 -9
@@ -331,7 +331,7 @@ static inline struct sk_buff *rtllib_probe_req(struct rtllib_device *ieee)skb_reserve (skb, ieee->tx_headroom); req =skb_put (skb,sizeof (struct rtllib_probe_request )); - req->header.frame_ctl =cpu_to_le16 (RTLLIB_STYPE_PROBE_REQ ); + req->header.frame_control =cpu_to_le16 (RTLLIB_STYPE_PROBE_REQ ); req->header.duration_id =0 ;eth_broadcast_addr (req->header.addr1);
@@ -739,9 +739,9 @@ rtllib_authentication_req(struct rtllib_network *beacon, auth =skb_put (skb,sizeof (struct rtllib_authentication )); - auth->header.frame_ctl =cpu_to_le16 (RTLLIB_STYPE_AUTH ); + auth->header.frame_control =cpu_to_le16 (RTLLIB_STYPE_AUTH );if (challengelen) - auth->header.frame_ctl |=cpu_to_le16 (RTLLIB_FCTL_WEP ); + auth->header.frame_control |=cpu_to_le16 (RTLLIB_FCTL_WEP ); auth->header.duration_id =cpu_to_le16 (0x013a );ether_addr_copy (auth->header.addr1, beacon->bssid);
@@ -860,7 +860,7 @@ static struct sk_buff *rtllib_probe_resp(struct rtllib_device *ieee,if (encrypt) beacon_buf->capability |=cpu_to_le16 (WLAN_CAPABILITY_PRIVACY ); - beacon_buf->header.frame_ctl =cpu_to_le16 (RTLLIB_STYPE_PROBE_RESP ); + beacon_buf->header.frame_control =cpu_to_le16 (RTLLIB_STYPE_PROBE_RESP ); beacon_buf->info_element[0 ].id =MFIE_TYPE_SSID ; beacon_buf->info_element[0 ].len = ssid_len;
@@ -1076,7 +1076,7 @@ rtllib_association_req(struct rtllib_network *beacon, hdr =skb_put (skb,sizeof (struct rtllib_assoc_request_frame ) +2 ); - hdr->header.frame_ctl =cpu_to_le16 (RTLLIB_STYPE_ASSOC_REQ ); + hdr->header.frame_control =cpu_to_le16 (RTLLIB_STYPE_ASSOC_REQ ); hdr->header.duration_id =cpu_to_le16 (37 );ether_addr_copy (hdr->header.addr1, beacon->bssid);ether_addr_copy (hdr->header.addr2, ieee->dev->dev_addr);
@@ -2488,7 +2488,7 @@ static struct sk_buff *rtllib_get_beacon_(struct rtllib_device *ieee)return NULL ; b = (struct rtllib_probe_response *)skb->data; - b->header.frame_ctl =cpu_to_le16 (RTLLIB_STYPE_BEACON ); + b->header.frame_control =cpu_to_le16 (RTLLIB_STYPE_BEACON );return skb; }
@@ -2503,7 +2503,7 @@ struct sk_buff *rtllib_get_beacon(struct rtllib_device *ieee)return NULL ; b = (struct rtllib_probe_response *)skb->data; - b->header.seq_ctl =cpu_to_le16 (ieee->seq_ctrl[0 ] <<4 ); + b->header.seq_ctrl =cpu_to_le16 (ieee->seq_ctrl[0 ] <<4 );if (ieee->seq_ctrl[0 ] ==0xFFF ) ieee->seq_ctrl[0 ] =0 ;
@@ -2730,7 +2730,7 @@ rtllib_disauth_skb(struct rtllib_network *beacon,skb_reserve (skb, ieee->tx_headroom); disauth =skb_put (skb,sizeof (struct rtllib_disauth )); - disauth->header.frame_ctl =cpu_to_le16 (RTLLIB_STYPE_DEAUTH ); + disauth->header.frame_control =cpu_to_le16 (RTLLIB_STYPE_DEAUTH ); disauth->header.duration_id =0 ;ether_addr_copy (disauth->header.addr1, beacon->bssid);
@@ -2757,7 +2757,7 @@ rtllib_disassociate_skb(struct rtllib_network *beacon,skb_reserve (skb, ieee->tx_headroom); disass =skb_put (skb,sizeof (struct rtllib_disassoc )); - disass->header.frame_ctl =cpu_to_le16 (RTLLIB_STYPE_DISASSOC ); + disass->header.frame_control =cpu_to_le16 (RTLLIB_STYPE_DISASSOC ); disass->header.duration_id =0 ;ether_addr_copy (disass->header.addr1, beacon->bssid);
Signature · 1 line
2.42.0
PATCH 7/16 staging: rtl8192e: Remove unused struct rtllib_hdr and two enums
In reply to Philipp HortmannRemove struct rtllib_hdr, enum rt_ps_mode and enum fw_cmd_io_type as those are not used.
--- drivers/staging/rtl8192e/rtllib.h | 40 ------------------------------- 1 file changed, 40 deletions(-)
drivers/staging/rtl8192e/rtllib.h +0 -40
@@ -679,12 +679,6 @@ struct rtllib_pspoll_hdr {u8 ta[ETH_ALEN ]; } __packed; -struct rtllib_hdr { -__le16 frame_ctl; -__le16 duration_id; -u8 payload[]; -} __packed; -struct rtllib_hdr_4addr {__le16 frame_ctl;__le16 duration_id;
@@ -1157,13 +1151,6 @@ enum fsync_state {SW_Fsync }; -enum rt_ps_mode { - eActive, - eMaxPs, - eFastPs, - eAutoPs, -}; -enum ips_callback_function {IPS_CALLBACK_NONE =0 ,IPS_CALLBACK_MGNT_LINK_REQUEST =1 ,
@@ -1220,33 +1207,6 @@ enum scan_op_backup_opt {SCAN_OPT_MAX }; -enum fw_cmd_io_type { -FW_CMD_DIG_ENABLE =0 , -FW_CMD_DIG_DISABLE =1 , -FW_CMD_DIG_HALT =2 , -FW_CMD_DIG_RESUME =3 , -FW_CMD_HIGH_PWR_ENABLE =4 , -FW_CMD_HIGH_PWR_DISABLE =5 , -FW_CMD_RA_RESET =6 , -FW_CMD_RA_ACTIVE =7 , -FW_CMD_RA_REFRESH_N =8 , -FW_CMD_RA_REFRESH_BG =9 , -FW_CMD_RA_INIT =10 , -FW_CMD_IQK_ENABLE =11 , -FW_CMD_TXPWR_TRACK_ENABLE =12 , -FW_CMD_TXPWR_TRACK_DISABLE =13 , -FW_CMD_TXPWR_TRACK_THERMAL =14 , -FW_CMD_PAUSE_DM_BY_SCAN =15 , -FW_CMD_RESUME_DM_BY_SCAN =16 , -FW_CMD_RA_REFRESH_N_COMB =17 , -FW_CMD_RA_REFRESH_BG_COMB =18 , -FW_CMD_ANTENNA_SW_ENABLE =19 , -FW_CMD_ANTENNA_SW_DISABLE =20 , -FW_CMD_TX_FEEDBACK_CCX_ENABLE =21 , -FW_CMD_LPS_ENTER =22 , -FW_CMD_LPS_LEAVE =23 , -}; -#define RT_MAX_LD_SLOT_NUM 10struct rt_link_detect {u32 NumRecvBcnInPeriod;
Signature · 1 line
2.42.0
PATCH 8/16 staging: rtl8192e: Replace struct rtllib_hdr_4addr in rtllib_crypt*.c
In reply to Philipp HortmannReplace struct rtllib_hdr_4addr with struct ieee80211_hdr to avoid proprietary code in rtllib_crypt_tkip.c and rtllib_crypt_ccmp.c.
--- drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 14 ++++----- drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 32 ++++++++++---------- 2 files changed, 23 insertions(+), 23 deletions(-)
drivers/staging/rtl8192e/rtllib_crypt_ccmp.c +7 -7
@@ -83,7 +83,7 @@ static void rtllib_ccmp_deinit(void *priv)kfree (priv); } -static int ccmp_init_iv_and_aad (struct rtllib_hdr_4addr *hdr, +static int ccmp_init_iv_and_aad (struct ieee80211_hdr *hdr,u8 *pn,u8 *iv,u8 *aad) {u8 *pos, qc =0 ;
@@ -91,7 +91,7 @@ static int ccmp_init_iv_and_aad(struct rtllib_hdr_4addr *hdr,u16 fc;int a4_included, qc_included; - fc =le16_to_cpu (hdr->frame_ctl); + fc =le16_to_cpu (hdr->frame_control); a4_included = ((fc & (RTLLIB_FCTL_TODS |RTLLIB_FCTL_FROMDS )) == (RTLLIB_FCTL_TODS |RTLLIB_FCTL_FROMDS ));
@@ -134,7 +134,7 @@ static int ccmp_init_iv_and_aad(struct rtllib_hdr_4addr *hdr,memcpy (&aad[2 ], &hdr->addr1,ETH_ALEN );memcpy (&aad[8 ], &hdr->addr2,ETH_ALEN );memcpy (&aad[14 ], &hdr->addr3,ETH_ALEN ); - pos = (u8 *)&hdr->seq_ctl; + pos = (u8 *)&hdr->seq_ctrl; aad[20 ] = pos[0 ] &0x0f ; aad[21 ] =0 ;/* all bits masked */ memset (aad +22 ,0 ,8 );
@@ -153,7 +153,7 @@ static int rtllib_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv)struct rtllib_ccmp_data *key = priv;int i;u8 *pos; -struct rtllib_hdr_4addr *hdr; +struct ieee80211_hdr *hdr;struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE ); if (skb_headroom(skb) < CCMP_HDR_LEN ||
@@ -182,7 +182,7 @@ static int rtllib_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv) *pos++ = key->tx_pn[1 ]; *pos++ = key->tx_pn[0 ]; - hdr = (struct rtllib_hdr_4addr *)skb->data; + hdr = (struct ieee80211_hdr *)skb->data;if (!tcb_desc->bHwSec) {struct aead_request *req;struct scatterlist sg[2 ];
@@ -220,7 +220,7 @@ static int rtllib_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv) {struct rtllib_ccmp_data *key = priv;u8 keyidx, *pos; -struct rtllib_hdr_4addr *hdr; +struct ieee80211_hdr *hdr;struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE );u8 pn[6 ];
@@ -230,7 +230,7 @@ static int rtllib_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)return -1 ; } - hdr = (struct rtllib_hdr_4addr *)skb->data; + hdr = (struct ieee80211_hdr *)skb->data; pos = skb->data + hdr_len; keyidx = pos[3 ];if (!(keyidx & (1 <<5 ))) {
drivers/staging/rtl8192e/rtllib_crypt_tkip.c +16 -16
@@ -255,7 +255,7 @@ static int rtllib_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv)struct rtllib_tkip_data *tkey = priv;int len;u8 *pos; -struct rtllib_hdr_4addr *hdr; +struct ieee80211_hdr *hdr;struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE );int ret =0 ;
@@ -266,7 +266,7 @@ static int rtllib_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv) skb->len < hdr_len)return -1 ; - hdr = (struct rtllib_hdr_4addr *)skb->data; + hdr = (struct ieee80211_hdr *)skb->data;if (!tcb_desc->bHwSec) {if (!tkey->tx_phase1_done) {
@@ -330,7 +330,7 @@ static int rtllib_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)u8 keyidx, *pos;u32 iv32;u16 iv16; -struct rtllib_hdr_4addr *hdr; +struct ieee80211_hdr *hdr;struct cb_desc *tcb_desc = (struct cb_desc *)(skb->cb +MAX_DEV_ADDR_SIZE );u8 rc4key[16 ];
@@ -341,7 +341,7 @@ static int rtllib_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)if (skb->len < hdr_len +8 +4 )return -1 ; - hdr = (struct rtllib_hdr_4addr *)skb->data; + hdr = (struct ieee80211_hdr *)skb->data; pos = skb->data + hdr_len; keyidx = pos[3 ];if (!(keyidx & (1 <<5 ))) {
@@ -465,10 +465,10 @@ static int michael_mic(struct crypto_shash *tfm_michael, u8 *key, u8 *hdr,static void michael_mic_hdr (struct sk_buff *skb,u8 *hdr) { -struct rtllib_hdr_4addr *hdr11; +struct ieee80211_hdr *hdr11; - hdr11 = (struct rtllib_hdr_4addr *)skb->data; -switch (le16_to_cpu (hdr11->frame_ctl) & + hdr11 = (struct ieee80211_hdr *)skb->data; +switch (le16_to_cpu (hdr11->frame_control) & (RTLLIB_FCTL_FROMDS |RTLLIB_FCTL_TODS )) {case RTLLIB_FCTL_TODS :ether_addr_copy (hdr, hdr11->addr3);/* DA */
@@ -501,9 +501,9 @@ static int rtllib_michael_mic_add(struct sk_buff *skb, int hdr_len, void *priv) {struct rtllib_tkip_data *tkey = priv;u8 *pos; -struct rtllib_hdr_4addr *hdr; +struct ieee80211_hdr *hdr; - hdr = (struct rtllib_hdr_4addr *)skb->data; + hdr = (struct ieee80211_hdr *)skb->data;if (skb_tailroom (skb) <8 || skb->len < hdr_len) { netdev_dbg(skb->dev,
@@ -514,7 +514,7 @@ static int rtllib_michael_mic_add(struct sk_buff *skb, int hdr_len, void *priv)michael_mic_hdr (skb, tkey->tx_hdr); -if (RTLLIB_QOS_HAS_SEQ (le16_to_cpu (hdr->frame_ctl))) +if (RTLLIB_QOS_HAS_SEQ (le16_to_cpu (hdr->frame_control))) tkey->tx_hdr[12 ] = *(skb->data + hdr_len -2 ) &0x07 ; pos =skb_put (skb,8 ); if (michael_mic(tkey->tx_tfm_michael, &tkey->key[16], tkey->tx_hdr,
@@ -525,7 +525,7 @@ static int rtllib_michael_mic_add(struct sk_buff *skb, int hdr_len, void *priv) }static void rtllib_michael_mic_failure (struct net_device *dev, -struct rtllib_hdr_4addr *hdr, +struct ieee80211_hdr *hdr,int keyidx) {union iwreq_data wrqu;
@@ -550,15 +550,15 @@ static int rtllib_michael_mic_verify(struct sk_buff *skb, int keyidx, {struct rtllib_tkip_data *tkey = priv;u8 mic[8 ]; -struct rtllib_hdr_4addr *hdr; +struct ieee80211_hdr *hdr; - hdr = (struct rtllib_hdr_4addr *)skb->data; + hdr = (struct ieee80211_hdr *)skb->data;if (!tkey->key_set)return -1 ;michael_mic_hdr (skb, tkey->rx_hdr); -if (RTLLIB_QOS_HAS_SEQ (le16_to_cpu (hdr->frame_ctl))) +if (RTLLIB_QOS_HAS_SEQ (le16_to_cpu (hdr->frame_control))) tkey->rx_hdr[12 ] = *(skb->data + hdr_len -2 ) &0x07 ; if (michael_mic(tkey->rx_tfm_michael, &tkey->key[24], tkey->rx_hdr,
@@ -566,9 +566,9 @@ static int rtllib_michael_mic_verify(struct sk_buff *skb, int keyidx,return -1 ;if (memcmp (mic, skb->data + skb->len -8 ,8 ) !=0 ) { -struct rtllib_hdr_4addr *hdr; +struct ieee80211_hdr *hdr; - hdr = (struct rtllib_hdr_4addr *)skb->data; + hdr = (struct ieee80211_hdr *)skb->data;netdev_dbg (skb->dev,"Michael MIC verification failed for MSDU from %pM keyidx=%d\n" , hdr->addr2, keyidx);
Signature · 1 line
2.42.0
PATCH 9/16 staging: rtl8192e: Remove struct rtllib_hdr_4addr
In reply to Philipp HortmannReplace struct rtllib_hdr_4addr with struct ieee80211_hdr to avoid proprietary code.
--- drivers/staging/rtl8192e/rtllib.h | 11 ---- drivers/staging/rtl8192e/rtllib_rx.c | 96 ++++++++++++++-------------- 2 files changed, 48 insertions(+), 59 deletions(-)
drivers/staging/rtl8192e/rtllib.h +0 -11
@@ -679,17 +679,6 @@ struct rtllib_pspoll_hdr {u8 ta[ETH_ALEN ]; } __packed; -struct rtllib_hdr_4addr { -__le16 frame_ctl; -__le16 duration_id; -u8 addr1[ETH_ALEN ]; -u8 addr2[ETH_ALEN ]; -u8 addr3[ETH_ALEN ]; -__le16 seq_ctl; -u8 addr4[ETH_ALEN ]; -u8 payload[]; -} __packed; -struct rtllib_hdr_3addrqos {__le16 frame_ctl;__le16 duration_id;
drivers/staging/rtl8192e/rtllib_rx.c +48 -48
266 lines not on this page · raw message
Signature · 1 line
2.42.0
PATCH 10/16 staging: rtl8192e: Remove struct rtllib_hdr_3addrqos
In reply to Philipp HortmannReplace struct rtllib_hdr_3addrqos with struct ieee80211_qos_hdr to avoid proprietary code.
--- drivers/staging/rtl8192e/rtllib.h | 11 ----------- drivers/staging/rtl8192e/rtllib_rx.c | 18 +++++++++--------- drivers/staging/rtl8192e/rtllib_tx.c | 22 +++++++++++----------- 3 files changed, 20 insertions(+), 31 deletions(-)
drivers/staging/rtl8192e/rtllib.h +0 -11
@@ -679,17 +679,6 @@ struct rtllib_pspoll_hdr {u8 ta[ETH_ALEN ]; } __packed; -struct rtllib_hdr_3addrqos { -__le16 frame_ctl; -__le16 duration_id; -u8 addr1[ETH_ALEN ]; -u8 addr2[ETH_ALEN ]; -u8 addr3[ETH_ALEN ]; -__le16 seq_ctl; -__le16 qos_ctl; -u8 payload[]; -} __packed; -struct rtllib_hdr_4addrqos {__le16 frame_ctl;__le16 duration_id;
drivers/staging/rtl8192e/rtllib_rx.c +9 -9
@@ -93,7 +93,7 @@ rtllib_frag_cache_get(struct rtllib_device *ieee,unsigned int frag =WLAN_GET_SEQ_FRAG (sc);unsigned int seq =WLAN_GET_SEQ_SEQ (sc);struct rtllib_frag_entry *entry; -struct rtllib_hdr_3addrqos *hdr_3addrqos; +struct ieee80211_qos_hdr *hdr_3addrqos;struct rtllib_hdr_4addrqos *hdr_4addrqos;u8 tid;
@@ -104,8 +104,8 @@ rtllib_frag_cache_get(struct rtllib_device *ieee, tid =UP2AC (tid); tid++; }else if (RTLLIB_QOS_HAS_SEQ (fc)) { - hdr_3addrqos = (struct rtllib_hdr_3addrqos *)hdr; - tid =le16_to_cpu (hdr_3addrqos->qos_ctl) &RTLLIB_QCTL_TID ; + hdr_3addrqos = (struct ieee80211_qos_hdr *)hdr; + tid =le16_to_cpu (hdr_3addrqos->qos_ctrl) &RTLLIB_QCTL_TID ; tid =UP2AC (tid); tid++; }else {
@@ -162,7 +162,7 @@ static int rtllib_frag_cache_invalidate(struct rtllib_device *ieee,u16 sc =le16_to_cpu (hdr->seq_ctrl);unsigned int seq =WLAN_GET_SEQ_SEQ (sc);struct rtllib_frag_entry *entry; -struct rtllib_hdr_3addrqos *hdr_3addrqos; +struct ieee80211_qos_hdr *hdr_3addrqos;struct rtllib_hdr_4addrqos *hdr_4addrqos;u8 tid;
@@ -173,8 +173,8 @@ static int rtllib_frag_cache_invalidate(struct rtllib_device *ieee, tid =UP2AC (tid); tid++; }else if (RTLLIB_QOS_HAS_SEQ (fc)) { - hdr_3addrqos = (struct rtllib_hdr_3addrqos *)hdr; - tid =le16_to_cpu (hdr_3addrqos->qos_ctl) &RTLLIB_QCTL_TID ; + hdr_3addrqos = (struct ieee80211_qos_hdr *)hdr; + tid =le16_to_cpu (hdr_3addrqos->qos_ctrl) &RTLLIB_QCTL_TID ; tid =UP2AC (tid); tid++; }else {
@@ -355,7 +355,7 @@ static int is_duplicate_packet(struct rtllib_device *ieee,u16 frag =WLAN_GET_SEQ_FRAG (sc);u16 *last_seq, *last_frag;unsigned long *last_time; -struct rtllib_hdr_3addrqos *hdr_3addrqos; +struct ieee80211_qos_hdr *hdr_3addrqos;struct rtllib_hdr_4addrqos *hdr_4addrqos;u8 tid;
@@ -366,8 +366,8 @@ static int is_duplicate_packet(struct rtllib_device *ieee, tid =UP2AC (tid); tid++; }else if (RTLLIB_QOS_HAS_SEQ (fc)) { - hdr_3addrqos = (struct rtllib_hdr_3addrqos *)header; - tid =le16_to_cpu (hdr_3addrqos->qos_ctl) &RTLLIB_QCTL_TID ; + hdr_3addrqos = (struct ieee80211_qos_hdr *)header; + tid =le16_to_cpu (hdr_3addrqos->qos_ctrl) &RTLLIB_QCTL_TID ; tid =UP2AC (tid); tid++; }else {
drivers/staging/rtl8192e/rtllib_tx.c +11 -11
@@ -544,17 +544,17 @@ static int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)struct rtllib_device *ieee = (struct rtllib_device *)netdev_priv_rsl (dev);struct rtllib_txb *txb =NULL ; -struct rtllib_hdr_3addrqos *frag_hdr; +struct ieee80211_qos_hdr *frag_hdr;int i, bytes_per_frag, nr_frags, bytes_last_frag, frag_size;unsigned long flags;struct net_device_stats *stats = &ieee->stats;int ether_type =0 , encrypt;int bytes, fc, qos_ctl =0 , hdr_len;struct sk_buff *skb_frag; -struct rtllib_hdr_3addrqos header = {/* Ensure zero initialized */ +struct ieee80211_qos_hdr header = {/* Ensure zero initialized */ .duration_id =0 , - .seq_ctl =0 , - .qos_ctl =0 + .seq_ctrl =0 , + .qos_ctrl =0 };int qos_activated = ieee->current_network.qos_data.active;u8 dest[ETH_ALEN ];
@@ -689,7 +689,7 @@ static int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev) bIsMulticast =is_multicast_ether_addr (header.addr1); - header.frame_ctl =cpu_to_le16 (fc); + header.frame_control =cpu_to_le16 (fc);/* Determine fragmentation size based on destination (multicast * and broadcast are not fragmented)
@@ -716,7 +716,7 @@ static int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev) } qos_ctl |= skb->priority; - header.qos_ctl =cpu_to_le16 (qos_ctl &RTLLIB_QOS_TID ); + header.qos_ctrl =cpu_to_le16 (qos_ctl &RTLLIB_QOS_TID ); }else { hdr_len =RTLLIB_3ADDR_LEN ;
@@ -798,7 +798,7 @@ static int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)* MOREFRAGS bit to the frame control */ if (i != nr_frags -1 ) { - frag_hdr->frame_ctl =cpu_to_le16 (fc | + frag_hdr->frame_control =cpu_to_le16 (fc |RTLLIB_FCTL_MOREFRAGS ); bytes = bytes_per_frag;
@@ -807,13 +807,13 @@ static int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev) bytes = bytes_last_frag; }if ((qos_activated) && (!bIsMulticast)) { - frag_hdr->seq_ctl = + frag_hdr->seq_ctrl =cpu_to_le16 (rtllib_query_seqnum (ieee, skb_frag, header.addr1)); - frag_hdr->seq_ctl = -cpu_to_le16 (le16_to_cpu (frag_hdr->seq_ctl) <<4 | i); + frag_hdr->seq_ctrl = +cpu_to_le16 (le16_to_cpu (frag_hdr->seq_ctrl) <<4 | i); }else { - frag_hdr->seq_ctl = + frag_hdr->seq_ctrl =cpu_to_le16 (ieee->seq_ctrl[0 ] <<4 | i); }/* Put a SNAP header on the first fragment */
Signature · 1 line
2.42.0
PATCH 11/16 staging: rtl8192e: Remove struct rtllib_hdr_4addrqos
In reply to Philipp HortmannReplace struct rtllib_hdr_4addrqos with struct ieee80211_qos_hdr_4addr to avoid proprietary code.
--- drivers/staging/rtl8192e/rtllib.h | 12 ------------ drivers/staging/rtl8192e/rtllib_rx.c | 18 +++++++++--------- 2 files changed, 9 insertions(+), 21 deletions(-)
drivers/staging/rtl8192e/rtllib.h +0 -12
@@ -679,18 +679,6 @@ struct rtllib_pspoll_hdr {u8 ta[ETH_ALEN ]; } __packed; -struct rtllib_hdr_4addrqos { -__le16 frame_ctl; -__le16 duration_id; -u8 addr1[ETH_ALEN ]; -u8 addr2[ETH_ALEN ]; -u8 addr3[ETH_ALEN ]; -__le16 seq_ctl; -u8 addr4[ETH_ALEN ]; -__le16 qos_ctl; -u8 payload[]; -} __packed; -struct rtllib_info_element {u8 id;u8 len;
drivers/staging/rtl8192e/rtllib_rx.c +9 -9
@@ -94,13 +94,13 @@ rtllib_frag_cache_get(struct rtllib_device *ieee,unsigned int seq =WLAN_GET_SEQ_SEQ (sc);struct rtllib_frag_entry *entry;struct ieee80211_qos_hdr *hdr_3addrqos; -struct rtllib_hdr_4addrqos *hdr_4addrqos; +struct ieee80211_qos_hdr_4addr *hdr_4addrqos;u8 tid;if (((fc &RTLLIB_FCTL_DSTODS ) ==RTLLIB_FCTL_DSTODS ) &&RTLLIB_QOS_HAS_SEQ (fc)) { - hdr_4addrqos = (struct rtllib_hdr_4addrqos *)hdr; - tid =le16_to_cpu (hdr_4addrqos->qos_ctl) &RTLLIB_QCTL_TID ; + hdr_4addrqos = (struct ieee80211_qos_hdr_4addr *)hdr; + tid =le16_to_cpu (hdr_4addrqos->qos_ctrl) &RTLLIB_QCTL_TID ; tid =UP2AC (tid); tid++; }else if (RTLLIB_QOS_HAS_SEQ (fc)) {
@@ -163,13 +163,13 @@ static int rtllib_frag_cache_invalidate(struct rtllib_device *ieee,unsigned int seq =WLAN_GET_SEQ_SEQ (sc);struct rtllib_frag_entry *entry;struct ieee80211_qos_hdr *hdr_3addrqos; -struct rtllib_hdr_4addrqos *hdr_4addrqos; +struct ieee80211_qos_hdr_4addr *hdr_4addrqos;u8 tid;if (((fc &RTLLIB_FCTL_DSTODS ) ==RTLLIB_FCTL_DSTODS ) &&RTLLIB_QOS_HAS_SEQ (fc)) { - hdr_4addrqos = (struct rtllib_hdr_4addrqos *)hdr; - tid =le16_to_cpu (hdr_4addrqos->qos_ctl) &RTLLIB_QCTL_TID ; + hdr_4addrqos = (struct ieee80211_qos_hdr_4addr *)hdr; + tid =le16_to_cpu (hdr_4addrqos->qos_ctrl) &RTLLIB_QCTL_TID ; tid =UP2AC (tid); tid++; }else if (RTLLIB_QOS_HAS_SEQ (fc)) {
@@ -356,13 +356,13 @@ static int is_duplicate_packet(struct rtllib_device *ieee,u16 *last_seq, *last_frag;unsigned long *last_time;struct ieee80211_qos_hdr *hdr_3addrqos; -struct rtllib_hdr_4addrqos *hdr_4addrqos; +struct ieee80211_qos_hdr_4addr *hdr_4addrqos;u8 tid;if (((fc &RTLLIB_FCTL_DSTODS ) ==RTLLIB_FCTL_DSTODS ) &&RTLLIB_QOS_HAS_SEQ (fc)) { - hdr_4addrqos = (struct rtllib_hdr_4addrqos *)header; - tid =le16_to_cpu (hdr_4addrqos->qos_ctl) &RTLLIB_QCTL_TID ; + hdr_4addrqos = (struct ieee80211_qos_hdr_4addr *)header; + tid =le16_to_cpu (hdr_4addrqos->qos_ctrl) &RTLLIB_QCTL_TID ; tid =UP2AC (tid); tid++; }else if (RTLLIB_QOS_HAS_SEQ (fc)) {
Signature · 1 line
2.42.0
PATCH 12/16 staging: rtl8192e: Remove struct rtllib_pspoll_hdr
In reply to Philipp HortmannReplace struct rtllib_pspoll_hdr with struct ieee80211_pspoll to avoid proprietary code.
--- drivers/staging/rtl8192e/rtllib.h | 7 ------- drivers/staging/rtl8192e/rtllib_softmac.c | 8 ++++---- 2 files changed, 4 insertions(+), 11 deletions(-)
drivers/staging/rtl8192e/rtllib.h +0 -7
@@ -672,13 +672,6 @@ enum rtllib_mfie {* information to determine what type of underlying data type is actually * stored in the data. */ -struct rtllib_pspoll_hdr { -__le16 frame_ctl; -__le16 aid; -u8 bssid[ETH_ALEN ]; -u8 ta[ETH_ALEN ]; -} __packed; -struct rtllib_info_element {u8 id;u8 len;
drivers/staging/rtl8192e/rtllib_softmac.c +4 -4
@@ -936,21 +936,21 @@ static struct sk_buff *rtllib_null_func(struct rtllib_device *ieee, short pwr)static struct sk_buff *rtllib_pspoll_func (struct rtllib_device *ieee) {struct sk_buff *skb; -struct rtllib_pspoll_hdr *hdr; +struct ieee80211_pspoll *hdr; - skb =dev_alloc_skb (sizeof (struct rtllib_pspoll_hdr ) + ieee->tx_headroom); + skb =dev_alloc_skb (sizeof (struct ieee80211_pspoll ) + ieee->tx_headroom);if (!skb)return NULL ;skb_reserve (skb, ieee->tx_headroom); - hdr =skb_put (skb,sizeof (struct rtllib_pspoll_hdr )); + hdr =skb_put (skb,sizeof (struct ieee80211_pspoll ));ether_addr_copy (hdr->bssid, ieee->current_network.bssid);ether_addr_copy (hdr->ta, ieee->dev->dev_addr); hdr->aid =cpu_to_le16 (ieee->assoc_id |0xc000 ); - hdr->frame_ctl =cpu_to_le16 (RTLLIB_FTYPE_CTL |RTLLIB_STYPE_PSPOLL | + hdr->frame_control =cpu_to_le16 (RTLLIB_FTYPE_CTL |RTLLIB_STYPE_PSPOLL |RTLLIB_FCTL_PM );return skb;
Signature · 1 line
2.42.0
PATCH 13/16 staging: rtl8192e: Replace management subframe types with IEEE80211_STYPE_*
In reply to Philipp HortmannReplace management subframe types RTLLIB_STYPE_* with IEEE80211_STYPE_* to avoid proprietary constant names.
--- drivers/staging/rtl8192e/rtl819x_BAProc.c | 4 +-- drivers/staging/rtl8192e/rtllib.h | 14 ----------- drivers/staging/rtl8192e/rtllib_softmac.c | 30 +++++++++++------------ 3 files changed, 17 insertions(+), 31 deletions(-)
drivers/staging/rtl8192e/rtl819x_BAProc.c +2 -2
@@ -93,7 +93,7 @@ static struct sk_buff *rtllib_ADDBA(struct rtllib_device *ieee, u8 *Dst,ether_addr_copy (BAReq->addr2, ieee->dev->dev_addr);ether_addr_copy (BAReq->addr3, ieee->current_network.bssid); - BAReq->frame_control =cpu_to_le16 (RTLLIB_STYPE_MANAGE_ACT ); + BAReq->frame_control =cpu_to_le16 (IEEE80211_STYPE_ACTION ); tag =skb_put (skb,9 ); *tag++ =ACT_CAT_BA ;
@@ -153,7 +153,7 @@ static struct sk_buff *rtllib_DELBA(struct rtllib_device *ieee, u8 *dst,ether_addr_copy (Delba->addr1, dst);ether_addr_copy (Delba->addr2, ieee->dev->dev_addr);ether_addr_copy (Delba->addr3, ieee->current_network.bssid); - Delba->frame_control =cpu_to_le16 (RTLLIB_STYPE_MANAGE_ACT ); + Delba->frame_control =cpu_to_le16 (IEEE80211_STYPE_ACTION ); tag =skb_put (skb,6 );
drivers/staging/rtl8192e/rtllib.h +0 -14
@@ -350,20 +350,6 @@ enum rt_op_mode {#define RTLLIB_FTYPE_CTL 0x0004#define RTLLIB_FTYPE_DATA 0x0008 -/* management */ -#define RTLLIB_STYPE_ASSOC_REQ 0x0000 -#define RTLLIB_STYPE_ASSOC_RESP 0x0010 -#define RTLLIB_STYPE_REASSOC_REQ 0x0020 -#define RTLLIB_STYPE_REASSOC_RESP 0x0030 -#define RTLLIB_STYPE_PROBE_REQ 0x0040 -#define RTLLIB_STYPE_PROBE_RESP 0x0050 -#define RTLLIB_STYPE_BEACON 0x0080 -#define RTLLIB_STYPE_ATIM 0x0090 -#define RTLLIB_STYPE_DISASSOC 0x00A0 -#define RTLLIB_STYPE_AUTH 0x00B0 -#define RTLLIB_STYPE_DEAUTH 0x00C0 -#define RTLLIB_STYPE_MANAGE_ACT 0x00D0 -/* control */ #define RTLLIB_STYPE_PSPOLL 0x00A0#define RTLLIB_STYPE_RTS 0x00B0
drivers/staging/rtl8192e/rtllib_softmac.c +15 -15
@@ -331,7 +331,7 @@ static inline struct sk_buff *rtllib_probe_req(struct rtllib_device *ieee)skb_reserve (skb, ieee->tx_headroom); req =skb_put (skb,sizeof (struct rtllib_probe_request )); - req->header.frame_control =cpu_to_le16 (RTLLIB_STYPE_PROBE_REQ ); + req->header.frame_control =cpu_to_le16 (IEEE80211_STYPE_PROBE_REQ ); req->header.duration_id =0 ;eth_broadcast_addr (req->header.addr1);
@@ -739,7 +739,7 @@ rtllib_authentication_req(struct rtllib_network *beacon, auth =skb_put (skb,sizeof (struct rtllib_authentication )); - auth->header.frame_control =cpu_to_le16 (RTLLIB_STYPE_AUTH ); + auth->header.frame_control =cpu_to_le16 (IEEE80211_STYPE_AUTH );if (challengelen) auth->header.frame_control |=cpu_to_le16 (RTLLIB_FCTL_WEP );
@@ -860,7 +860,7 @@ static struct sk_buff *rtllib_probe_resp(struct rtllib_device *ieee,if (encrypt) beacon_buf->capability |=cpu_to_le16 (WLAN_CAPABILITY_PRIVACY ); - beacon_buf->header.frame_control =cpu_to_le16 (RTLLIB_STYPE_PROBE_RESP ); + beacon_buf->header.frame_control =cpu_to_le16 (IEEE80211_STYPE_PROBE_RESP ); beacon_buf->info_element[0 ].id =MFIE_TYPE_SSID ; beacon_buf->info_element[0 ].len = ssid_len;
@@ -1076,7 +1076,7 @@ rtllib_association_req(struct rtllib_network *beacon, hdr =skb_put (skb,sizeof (struct rtllib_assoc_request_frame ) +2 ); - hdr->header.frame_control =cpu_to_le16 (RTLLIB_STYPE_ASSOC_REQ ); + hdr->header.frame_control =cpu_to_le16 (IEEE80211_STYPE_ASSOC_REQ ); hdr->header.duration_id =cpu_to_le16 (37 );ether_addr_copy (hdr->header.addr1, beacon->bssid);ether_addr_copy (hdr->header.addr2, ieee->dev->dev_addr);
@@ -2136,22 +2136,22 @@ inline int rtllib_rx_frame_softmac(struct rtllib_device *ieee, frame_ctl =le16_to_cpu (header->frame_control);switch (WLAN_FC_GET_STYPE (frame_ctl)) { -case RTLLIB_STYPE_ASSOC_RESP : -case RTLLIB_STYPE_REASSOC_RESP : +case IEEE80211_STYPE_ASSOC_RESP : +case IEEE80211_STYPE_REASSOC_RESP :if (rtllib_rx_assoc_resp (ieee, skb, rx_stats) ==1 )return 1 ;break ; -case RTLLIB_STYPE_ASSOC_REQ : -case RTLLIB_STYPE_REASSOC_REQ : +case IEEE80211_STYPE_ASSOC_REQ : +case IEEE80211_STYPE_REASSOC_REQ :break ; -case RTLLIB_STYPE_AUTH : +case IEEE80211_STYPE_AUTH :rtllib_rx_auth (ieee, skb, rx_stats);break ; -case RTLLIB_STYPE_DISASSOC : -case RTLLIB_STYPE_DEAUTH : +case IEEE80211_STYPE_DISASSOC : +case IEEE80211_STYPE_DEAUTH :rtllib_rx_deauth (ieee, skb);break ; -case RTLLIB_STYPE_MANAGE_ACT : +case IEEE80211_STYPE_ACTION :rtllib_process_action (ieee, skb);break ;default :
@@ -2488,7 +2488,7 @@ static struct sk_buff *rtllib_get_beacon_(struct rtllib_device *ieee)return NULL ; b = (struct rtllib_probe_response *)skb->data; - b->header.frame_control =cpu_to_le16 (RTLLIB_STYPE_BEACON ); + b->header.frame_control =cpu_to_le16 (IEEE80211_STYPE_BEACON );return skb; }
@@ -2730,7 +2730,7 @@ rtllib_disauth_skb(struct rtllib_network *beacon,skb_reserve (skb, ieee->tx_headroom); disauth =skb_put (skb,sizeof (struct rtllib_disauth )); - disauth->header.frame_control =cpu_to_le16 (RTLLIB_STYPE_DEAUTH ); + disauth->header.frame_control =cpu_to_le16 (IEEE80211_STYPE_DEAUTH ); disauth->header.duration_id =0 ;ether_addr_copy (disauth->header.addr1, beacon->bssid);
@@ -2757,7 +2757,7 @@ rtllib_disassociate_skb(struct rtllib_network *beacon,skb_reserve (skb, ieee->tx_headroom); disass =skb_put (skb,sizeof (struct rtllib_disassoc )); - disass->header.frame_control =cpu_to_le16 (RTLLIB_STYPE_DISASSOC ); + disass->header.frame_control =cpu_to_le16 (IEEE80211_STYPE_DISASSOC ); disass->header.duration_id =0 ;ether_addr_copy (disass->header.addr1, beacon->bssid);
Signature · 1 line
2.42.0
PATCH 14/16 staging: rtl8192e: Replace control subframe types with IEEE80211_STYPE_*
In reply to Philipp HortmannReplace control and data subframe types RTLLIB_STYPE_* with IEEE80211_STYPE_* to avoid proprietary constant names.
--- drivers/staging/rtl8192e/rtllib.h | 23 ++++------------------- drivers/staging/rtl8192e/rtllib_rx.c | 12 ++++++------ drivers/staging/rtl8192e/rtllib_softmac.c | 6 +++--- drivers/staging/rtl8192e/rtllib_tx.c | 4 ++-- 4 files changed, 15 insertions(+), 30 deletions(-)
drivers/staging/rtl8192e/rtllib.h +4 -19
@@ -350,21 +350,6 @@ enum rt_op_mode {#define RTLLIB_FTYPE_CTL 0x0004#define RTLLIB_FTYPE_DATA 0x0008 -/* control */ -#define RTLLIB_STYPE_PSPOLL 0x00A0 -#define RTLLIB_STYPE_RTS 0x00B0 -#define RTLLIB_STYPE_CTS 0x00C0 -#define RTLLIB_STYPE_ACK 0x00D0 - -/* data */ -#define RTLLIB_STYPE_DATA 0x0000 -#define RTLLIB_STYPE_DATA_CFACK 0x0010 -#define RTLLIB_STYPE_DATA_CFPOLL 0x0020 -#define RTLLIB_STYPE_DATA_CFACKPOLL 0x0030 -#define RTLLIB_STYPE_NULLFUNC 0x0040 -#define RTLLIB_STYPE_QOS_DATA 0x0080 -#define RTLLIB_STYPE_QOS_NULL 0x00C0 -#define RTLLIB_SCTL_FRAG 0x000F#define RTLLIB_SCTL_SEQ 0xFFF0
@@ -375,8 +360,8 @@ enum rt_op_mode {#define IsDataFrame (pdu) (((pdu[0] & 0x0C) == 0x08) ? true : false)#define IsLegacyDataFrame (pdu) (IsDataFrame(pdu) && (!(pdu[0]&FC_QOS_BIT)))#define IsQoSDataFrame (pframe) \ - ((*(u16 *)pframe&(RTLLIB_STYPE_QOS_DATA|RTLLIB_FTYPE_DATA)) == \ - (RTLLIB_STYPE_QOS_DATA|RTLLIB_FTYPE_DATA)) + ((*(u16 *)pframe&(IEEE80211_STYPE_QOS_DATA|RTLLIB_FTYPE_DATA)) == \ + (IEEE80211_STYPE_QOS_DATA|RTLLIB_FTYPE_DATA))#define Frame_Order (pframe) (*(u16 *)pframe&RTLLIB_FCTL_ORDER)#define SN_LESS (a, b) (((a-b)&0x800) != 0)#define SN_EQUAL (a, b) (a == b)
@@ -1647,8 +1632,8 @@ static inline int rtllib_get_hdrlen(u16 fc)break ;case RTLLIB_FTYPE_CTL :switch (WLAN_FC_GET_STYPE (fc)) { -case RTLLIB_STYPE_CTS : -case RTLLIB_STYPE_ACK : +case IEEE80211_STYPE_CTS : +case IEEE80211_STYPE_ACK : hdrlen =RTLLIB_1ADDR_LEN ;break ;default :
drivers/staging/rtl8192e/rtllib_rx.c +6 -6
@@ -997,12 +997,12 @@ static int rtllib_rx_data_filter(struct rtllib_device *ieee, u16 fc,* hostap_handle_sta_rx() before being dropped here. */ if (!ieee->intel_promiscuous_md_info.promiscuous_on) { -if (stype !=RTLLIB_STYPE_DATA && - stype !=RTLLIB_STYPE_DATA_CFACK && - stype !=RTLLIB_STYPE_DATA_CFPOLL && - stype !=RTLLIB_STYPE_DATA_CFACKPOLL && - stype !=RTLLIB_STYPE_QOS_DATA ) { -if (stype !=RTLLIB_STYPE_NULLFUNC ) +if (stype !=IEEE80211_STYPE_DATA && + stype !=IEEE80211_STYPE_DATA_CFACK && + stype !=IEEE80211_STYPE_DATA_CFPOLL && + stype !=IEEE80211_STYPE_DATA_CFACKPOLL && + stype !=IEEE80211_STYPE_QOS_DATA ) { +if (stype !=IEEE80211_STYPE_NULLFUNC )netdev_dbg (ieee->dev,"RX: dropped data frame with no data (type=0x%02x, subtype=0x%02x)\n" , type, stype);
drivers/staging/rtl8192e/rtllib_softmac.c +3 -3
@@ -273,7 +273,7 @@ softmac_ps_mgmt_xmit(struct sk_buff *skb, type =WLAN_FC_GET_TYPE (fc); stype =WLAN_FC_GET_STYPE (fc); -if (stype !=RTLLIB_STYPE_PSPOLL ) +if (stype !=IEEE80211_STYPE_PSPOLL ) tcb_desc->queue_index =MGNT_QUEUE ;else tcb_desc->queue_index =HIGH_QUEUE ;
@@ -927,7 +927,7 @@ static struct sk_buff *rtllib_null_func(struct rtllib_device *ieee, short pwr)ether_addr_copy (hdr->addr3, ieee->current_network.bssid); hdr->frame_control =cpu_to_le16 (RTLLIB_FTYPE_DATA | -RTLLIB_STYPE_NULLFUNC |RTLLIB_FCTL_TODS | +IEEE80211_STYPE_NULLFUNC |RTLLIB_FCTL_TODS | (pwr ?RTLLIB_FCTL_PM :0 ));return skb;
@@ -950,7 +950,7 @@ static struct sk_buff *rtllib_pspoll_func(struct rtllib_device *ieee)ether_addr_copy (hdr->ta, ieee->dev->dev_addr); hdr->aid =cpu_to_le16 (ieee->assoc_id |0xc000 ); - hdr->frame_control =cpu_to_le16 (RTLLIB_FTYPE_CTL |RTLLIB_STYPE_PSPOLL | + hdr->frame_control =cpu_to_le16 (RTLLIB_FTYPE_CTL |IEEE80211_STYPE_PSPOLL |RTLLIB_FCTL_PM );return skb;
drivers/staging/rtl8192e/rtllib_tx.c +2 -2
@@ -660,9 +660,9 @@ static int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev) fc =RTLLIB_FTYPE_DATA ;if (qos_activated) - fc |=RTLLIB_STYPE_QOS_DATA ; + fc |=IEEE80211_STYPE_QOS_DATA ;else - fc |=RTLLIB_STYPE_DATA ; + fc |=IEEE80211_STYPE_DATA ;if (ieee->iw_mode ==IW_MODE_INFRA ) { fc |=RTLLIB_FCTL_TODS ;
Signature · 1 line
2.42.0
PATCH 15/16 staging: rtl8192e: Replace usage of RTLLIB_FCTL_DSTODS with function
In reply to Philipp HortmannReplace usage of RTLLIB_FCTL_DSTODS with function ieee80211_has_a4() to avoid proprietary code and to increase readability. To achieve this goal it was required to change a parameter of function rtllib_rx_data_filter().
--- drivers/staging/rtl8192e/rtllib.h | 1 - drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 3 +-- drivers/staging/rtl8192e/rtllib_rx.c | 14 +++++++------- 3 files changed, 8 insertions(+), 10 deletions(-)
drivers/staging/rtl8192e/rtllib.h +0 -1
@@ -338,7 +338,6 @@ enum rt_op_mode {#define RTLLIB_FCTL_FRAMETYPE 0x00fc#define RTLLIB_FCTL_TODS 0x0100#define RTLLIB_FCTL_FROMDS 0x0200 -#define RTLLIB_FCTL_DSTODS 0x0300#define RTLLIB_FCTL_MOREFRAGS 0x0400#define RTLLIB_FCTL_RETRY 0x0800#define RTLLIB_FCTL_PM 0x1000
drivers/staging/rtl8192e/rtllib_crypt_ccmp.c +1 -2
@@ -92,8 +92,7 @@ static int ccmp_init_iv_and_aad(struct ieee80211_hdr *hdr,int a4_included, qc_included; fc =le16_to_cpu (hdr->frame_control); - a4_included = ((fc & (RTLLIB_FCTL_TODS |RTLLIB_FCTL_FROMDS )) == - (RTLLIB_FCTL_TODS |RTLLIB_FCTL_FROMDS )); + a4_included =ieee80211_has_a4 (hdr->frame_control); qc_included = ((WLAN_FC_GET_TYPE (fc) ==RTLLIB_FTYPE_DATA ) && (WLAN_FC_GET_STYPE (fc) &0x80 ));
drivers/staging/rtl8192e/rtllib_rx.c +7 -7
@@ -97,7 +97,7 @@ rtllib_frag_cache_get(struct rtllib_device *ieee,struct ieee80211_qos_hdr_4addr *hdr_4addrqos;u8 tid; -if (((fc &RTLLIB_FCTL_DSTODS ) ==RTLLIB_FCTL_DSTODS ) && +if (ieee80211_has_a4 (hdr->frame_control) &&RTLLIB_QOS_HAS_SEQ (fc)) { hdr_4addrqos = (struct ieee80211_qos_hdr_4addr *)hdr; tid =le16_to_cpu (hdr_4addrqos->qos_ctrl) &RTLLIB_QCTL_TID ;
@@ -166,7 +166,7 @@ static int rtllib_frag_cache_invalidate(struct rtllib_device *ieee,struct ieee80211_qos_hdr_4addr *hdr_4addrqos;u8 tid; -if (((fc &RTLLIB_FCTL_DSTODS ) ==RTLLIB_FCTL_DSTODS ) && +if (ieee80211_has_a4 (hdr->frame_control) &&RTLLIB_QOS_HAS_SEQ (fc)) { hdr_4addrqos = (struct ieee80211_qos_hdr_4addr *)hdr; tid =le16_to_cpu (hdr_4addrqos->qos_ctrl) &RTLLIB_QCTL_TID ;
@@ -359,7 +359,7 @@ static int is_duplicate_packet(struct rtllib_device *ieee,struct ieee80211_qos_hdr_4addr *hdr_4addrqos;u8 tid; -if (((fc &RTLLIB_FCTL_DSTODS ) ==RTLLIB_FCTL_DSTODS ) && +if (ieee80211_has_a4 (header->frame_control) &&RTLLIB_QOS_HAS_SEQ (fc)) { hdr_4addrqos = (struct ieee80211_qos_hdr_4addr *)header; tid =le16_to_cpu (hdr_4addrqos->qos_ctrl) &RTLLIB_QCTL_TID ;
@@ -968,16 +968,16 @@ static void rtllib_rx_extract_addr(struct rtllib_device *ieee, } } -static int rtllib_rx_data_filter (struct rtllib_device *ieee,u16 fc, +static int rtllib_rx_data_filter (struct rtllib_device *ieee,struct ieee80211_hdr *hdr,u8 *dst,u8 *src,u8 *bssid,u8 *addr2) {u8 type, stype; - +u16 fc =le16_to_cpu (hdr->frame_control); type =WLAN_FC_GET_TYPE (fc); stype =WLAN_FC_GET_STYPE (fc);/* Filter frames from different BSS */ -if (((fc &RTLLIB_FCTL_DSTODS ) !=RTLLIB_FCTL_DSTODS ) && +if (ieee80211_has_a4 (hdr->frame_control) && !ether_addr_equal (ieee->current_network.bssid, bssid) && !is_zero_ether_addr (ieee->current_network.bssid)) {return -1 ;
@@ -1341,7 +1341,7 @@ static int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb,rtllib_rx_extract_addr (ieee, hdr, dst, src, bssid);/* Filter Data frames */ - ret =rtllib_rx_data_filter (ieee, fc, dst, src, bssid, hdr->addr2); + ret =rtllib_rx_data_filter (ieee, hdr, dst, src, bssid, hdr->addr2);if (ret <0 ) goto rx_dropped;
Signature · 1 line
2.42.0
PATCH 16/16 staging: rtl8192e: Replace frame control constants with IEEE80211_FCTL_*
In reply to Philipp HortmannReplace frame control fields with IEEE80211_FCTL_* to avoid proprietary constant names.
--- .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 4 +-- drivers/staging/rtl8192e/rtllib.h | 27 ++++---------- drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 8 ++--- drivers/staging/rtl8192e/rtllib_rx.c | 36 +++++++++---------- drivers/staging/rtl8192e/rtllib_softmac.c | 8 ++--- drivers/staging/rtl8192e/rtllib_tx.c | 6 ++-- 6 files changed, 38 insertions(+), 51 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +2 -2
@@ -1578,8 +1578,8 @@ static void _rtl92e_translate_rx_signal_stats(struct net_device *dev, bpacket_match_bssid = ((type !=RTLLIB_FTYPE_CTL ) &ðer_addr_equal (priv->rtllib->current_network.bssid, - (fc &RTLLIB_FCTL_TODS ) ? hdr->addr1 : - (fc &RTLLIB_FCTL_FROMDS ) ? hdr->addr2 : + (fc &IEEE80211_FCTL_TODS ) ? hdr->addr1 : + (fc &IEEE80211_FCTL_FROMDS ) ? hdr->addr2 : hdr->addr3) && (!pstats->bHwError) && (!pstats->bCRC) && (!pstats->bICV)); bpacket_toself = bpacket_match_bssid && /* check this */
drivers/staging/rtl8192e/rtllib.h +7 -20
@@ -332,19 +332,6 @@ enum rt_op_mode {#define MIN_FRAG_THRESHOLD 256U#define MAX_FRAG_THRESHOLD 2346U -/* Frame control field constants */ -#define RTLLIB_FCTL_FTYPE 0x000c -#define RTLLIB_FCTL_STYPE 0x00f0 -#define RTLLIB_FCTL_FRAMETYPE 0x00fc -#define RTLLIB_FCTL_TODS 0x0100 -#define RTLLIB_FCTL_FROMDS 0x0200 -#define RTLLIB_FCTL_MOREFRAGS 0x0400 -#define RTLLIB_FCTL_RETRY 0x0800 -#define RTLLIB_FCTL_PM 0x1000 -#define RTLLIB_FCTL_MOREDATA 0x2000 -#define RTLLIB_FCTL_WEP 0x4000 -#define RTLLIB_FCTL_ORDER 0x8000 -#define RTLLIB_FTYPE_MGMT 0x0000#define RTLLIB_FTYPE_CTL 0x0004#define RTLLIB_FTYPE_DATA 0x0008
@@ -361,7 +348,7 @@ enum rt_op_mode {#define IsQoSDataFrame (pframe) \ ((*(u16 *)pframe&(IEEE80211_STYPE_QOS_DATA|RTLLIB_FTYPE_DATA)) == \ (IEEE80211_STYPE_QOS_DATA|RTLLIB_FTYPE_DATA)) -#define Frame_Order (pframe) (*(u16 *)pframe&RTLLIB_FCTL_ORDER) +#define Frame_Order (pframe) (*(u16 *)pframe&IEEE80211_FCTL_ORDER)#define SN_LESS (a, b) (((a-b)&0x800) != 0)#define SN_EQUAL (a, b) (a == b)#define MAX_DEV_ADDR_SIZE 8
@@ -425,9 +412,9 @@ enum _REG_PREAMBLE_MODE {#define SNAP_SIZE sizeof(struct rtllib_snap_hdr) -#define WLAN_FC_GET_TYPE (fc) ((fc) & RTLLIB_FCTL_FTYPE) -#define WLAN_FC_GET_STYPE (fc) ((fc) & RTLLIB_FCTL_STYPE) -#define WLAN_FC_MORE_DATA (fc) ((fc) & RTLLIB_FCTL_MOREDATA) +#define WLAN_FC_GET_TYPE (fc) ((fc) & IEEE80211_FCTL_FTYPE) +#define WLAN_FC_GET_STYPE (fc) ((fc) & IEEE80211_FCTL_STYPE) +#define WLAN_FC_MORE_DATA (fc) ((fc) & IEEE80211_FCTL_MOREDATA)#define WLAN_GET_SEQ_FRAG (seq) ((seq) & RTLLIB_SCTL_FRAG)#define WLAN_GET_SEQ_SEQ (seq) (((seq) & RTLLIB_SCTL_SEQ) >> 4)
@@ -849,8 +836,8 @@ static inline u8 Frame_QoSTID(u8 *buf) hdr = (struct ieee80211_hdr_3addr *)buf; fc =le16_to_cpu (hdr->frame_control); -return (u8)((union frameqos *)(buf + (((fc &RTLLIB_FCTL_TODS ) && - (fc &RTLLIB_FCTL_FROMDS )) ?30 :24 )))->field.tid; +return (u8)((union frameqos *)(buf + (((fc &IEEE80211_FCTL_TODS ) && + (fc &IEEE80211_FCTL_FROMDS )) ?30 :24 )))->field.tid; }struct eapol {
@@ -1624,7 +1611,7 @@ static inline int rtllib_get_hdrlen(u16 fc)switch (WLAN_FC_GET_TYPE (fc)) {case RTLLIB_FTYPE_DATA : -if ((fc &RTLLIB_FCTL_FROMDS ) && (fc &RTLLIB_FCTL_TODS )) +if ((fc &IEEE80211_FCTL_FROMDS ) && (fc &IEEE80211_FCTL_TODS )) hdrlen =RTLLIB_4ADDR_LEN ;/* Addr4 */ if (RTLLIB_QOS_HAS_SEQ (fc)) hdrlen +=2 ;/* QOS ctrl*/
drivers/staging/rtl8192e/rtllib_crypt_tkip.c +4 -4
@@ -469,16 +469,16 @@ static void michael_mic_hdr(struct sk_buff *skb, u8 *hdr) hdr11 = (struct ieee80211_hdr *)skb->data;switch (le16_to_cpu (hdr11->frame_control) & - (RTLLIB_FCTL_FROMDS |RTLLIB_FCTL_TODS )) { -case RTLLIB_FCTL_TODS : + (IEEE80211_FCTL_FROMDS |IEEE80211_FCTL_TODS )) { +case IEEE80211_FCTL_TODS :ether_addr_copy (hdr, hdr11->addr3);/* DA */ ether_addr_copy (hdr +ETH_ALEN , hdr11->addr2);/* SA */ break ; -case RTLLIB_FCTL_FROMDS : +case IEEE80211_FCTL_FROMDS :ether_addr_copy (hdr, hdr11->addr1);/* DA */ ether_addr_copy (hdr +ETH_ALEN , hdr11->addr3);/* SA */ break ; -case RTLLIB_FCTL_FROMDS |RTLLIB_FCTL_TODS : +case IEEE80211_FCTL_FROMDS |IEEE80211_FCTL_TODS :ether_addr_copy (hdr, hdr11->addr3);/* DA */ ether_addr_copy (hdr +ETH_ALEN , hdr11->addr4);/* SA */ break ;
drivers/staging/rtl8192e/rtllib_rx.c +18 -18
@@ -243,13 +243,13 @@ static int rtllib_is_eapol_frame(struct rtllib_device *ieee, fc =le16_to_cpu (hdr->frame_control);/* check that the frame is unicast frame to us */ -if ((fc & (RTLLIB_FCTL_TODS |RTLLIB_FCTL_FROMDS )) == -RTLLIB_FCTL_TODS && +if ((fc & (IEEE80211_FCTL_TODS |IEEE80211_FCTL_FROMDS )) == +IEEE80211_FCTL_TODS &&memcmp (hdr->addr1, dev->dev_addr,ETH_ALEN ) ==0 &&memcmp (hdr->addr3, dev->dev_addr,ETH_ALEN ) ==0 ) {/* ToDS frame with own addr BSSID and DA */ - }else if ((fc & (RTLLIB_FCTL_TODS |RTLLIB_FCTL_FROMDS )) == -RTLLIB_FCTL_FROMDS && + }else if ((fc & (IEEE80211_FCTL_TODS |IEEE80211_FCTL_FROMDS )) == +IEEE80211_FCTL_FROMDS &&memcmp (hdr->addr1, dev->dev_addr,ETH_ALEN ) ==0 ) {/* FromDS frame with own addr as DA */ }else {
@@ -944,18 +944,18 @@ static void rtllib_rx_extract_addr(struct rtllib_device *ieee, {u16 fc =le16_to_cpu (hdr->frame_control); -switch (fc & (RTLLIB_FCTL_FROMDS |RTLLIB_FCTL_TODS )) { -case RTLLIB_FCTL_FROMDS : +switch (fc & (IEEE80211_FCTL_FROMDS |IEEE80211_FCTL_TODS )) { +case IEEE80211_FCTL_FROMDS :ether_addr_copy (dst, hdr->addr1);ether_addr_copy (src, hdr->addr3);ether_addr_copy (bssid, hdr->addr2);break ; -case RTLLIB_FCTL_TODS : +case IEEE80211_FCTL_TODS :ether_addr_copy (dst, hdr->addr3);ether_addr_copy (src, hdr->addr2);ether_addr_copy (bssid, hdr->addr1);break ; -case RTLLIB_FCTL_FROMDS |RTLLIB_FCTL_TODS : +case IEEE80211_FCTL_FROMDS |IEEE80211_FCTL_TODS :ether_addr_copy (dst, hdr->addr3);ether_addr_copy (src, hdr->addr4);ether_addr_copy (bssid, ieee->current_network.bssid);
@@ -986,7 +986,7 @@ static int rtllib_rx_data_filter(struct rtllib_device *ieee, struct ieee80211_hd/* Filter packets sent by an STA that will be forwarded by AP */ if (ieee->intel_promiscuous_md_info.promiscuous_on && ieee->intel_promiscuous_md_info.fltr_src_sta_frame) { -if ((fc &RTLLIB_FCTL_TODS ) && !(fc &RTLLIB_FCTL_FROMDS ) && +if ((fc &IEEE80211_FCTL_TODS ) && !(fc &IEEE80211_FCTL_FROMDS ) && !ether_addr_equal (dst, ieee->current_network.bssid) &ðer_addr_equal (bssid, ieee->current_network.bssid)) {return -1 ;
@@ -1041,7 +1041,7 @@ static int rtllib_rx_get_crypt(struct rtllib_device *ieee, struct sk_buff *skb, (*crypt)->ops->decrypt_mpdu == NULL)) *crypt =NULL ; -if (!*crypt && (fc &RTLLIB_FCTL_WEP )) { +if (!*crypt && (fc &IEEE80211_FCTL_PROTECTED )) {/* This seems to be triggered by some (multicast?) * frames from other than current BSS, so just drop the * frames silently instead of filling system log with
@@ -1076,13 +1076,13 @@ static int rtllib_rx_decrypt(struct rtllib_device *ieee, struct sk_buff *skb, ieee->need_sw_enc =0 ; keyidx =rtllib_rx_frame_decrypt (ieee, skb, crypt); -if ((fc &RTLLIB_FCTL_WEP ) && (keyidx <0 )) { +if ((fc &IEEE80211_FCTL_PROTECTED ) && (keyidx <0 )) {netdev_info (ieee->dev,"%s: decrypt frame error\n" , __func__);return -1 ; } hdr = (struct ieee80211_hdr *)skb->data; -if ((frag !=0 || (fc &RTLLIB_FCTL_MOREFRAGS ))) { +if ((frag !=0 || (fc &IEEE80211_FCTL_MOREFRAGS ))) {int flen;struct sk_buff *frag_skb =rtllib_frag_cache_get (ieee, hdr);
@@ -1091,7 +1091,7 @@ static int rtllib_rx_decrypt(struct rtllib_device *ieee, struct sk_buff *skb,if (!frag_skb) {netdev_dbg (ieee->dev,"Rx cannot get skb from fragment cache (morefrag=%d seq=%u frag=%u)\n" , - (fc &RTLLIB_FCTL_MOREFRAGS ) !=0 , + (fc &IEEE80211_FCTL_MOREFRAGS ) !=0 ,WLAN_GET_SEQ_SEQ (sc), frag);return -1 ; }
@@ -1121,7 +1121,7 @@ static int rtllib_rx_decrypt(struct rtllib_device *ieee, struct sk_buff *skb,dev_kfree_skb_any (skb); skb =NULL ; -if (fc &RTLLIB_FCTL_MOREFRAGS ) { +if (fc &IEEE80211_FCTL_MOREFRAGS ) {/* more fragments expected - leave the skb in fragment * cache for now; it will be delivered to upper layers * after all fragments have been received
@@ -1140,14 +1140,14 @@ static int rtllib_rx_decrypt(struct rtllib_device *ieee, struct sk_buff *skb,/* skb: hdr + (possible reassembled) full MSDU payload; possibly still * encrypted/authenticated */ -if ((fc &RTLLIB_FCTL_WEP ) && +if ((fc &IEEE80211_FCTL_PROTECTED ) &&rtllib_rx_frame_decrypt_msdu (ieee, skb, keyidx, crypt)) {netdev_info (ieee->dev,"%s: ==>decrypt msdu error\n" , __func__);return -1 ; } hdr = (struct ieee80211_hdr *)skb->data; -if (crypt && !(fc &RTLLIB_FCTL_WEP ) && !ieee->open_wep) { +if (crypt && !(fc &IEEE80211_FCTL_PROTECTED ) && !ieee->open_wep) {if (/*ieee->ieee802_1x &&*/ rtllib_is_eapol_frame (ieee, skb, hdrlen)) {/* pass unencrypted EAPOL frames even if encryption is
@@ -1166,7 +1166,7 @@ static int rtllib_rx_decrypt(struct rtllib_device *ieee, struct sk_buff *skb, } } -if (crypt && !(fc &RTLLIB_FCTL_WEP ) && +if (crypt && !(fc &IEEE80211_FCTL_PROTECTED ) &&rtllib_is_eapol_frame (ieee, skb, hdrlen)) {struct eapol *eap = (struct eapol *)(skb->data +24 );
@@ -1174,7 +1174,7 @@ static int rtllib_rx_decrypt(struct rtllib_device *ieee, struct sk_buff *skb, eap_get_type(eap->type)); } -if (crypt && !(fc &RTLLIB_FCTL_WEP ) && !ieee->open_wep && +if (crypt && !(fc &IEEE80211_FCTL_PROTECTED ) && !ieee->open_wep && !rtllib_is_eapol_frame (ieee, skb, hdrlen)) { netdev_dbg(ieee->dev, "dropped unencrypted RX data frame from %pM (drop_unencrypted=1)\n",
drivers/staging/rtl8192e/rtllib_softmac.c +4 -4
@@ -741,7 +741,7 @@ rtllib_authentication_req(struct rtllib_network *beacon, auth->header.frame_control =cpu_to_le16 (IEEE80211_STYPE_AUTH );if (challengelen) - auth->header.frame_control |=cpu_to_le16 (RTLLIB_FCTL_WEP ); + auth->header.frame_control |=cpu_to_le16 (IEEE80211_FCTL_PROTECTED ); auth->header.duration_id =cpu_to_le16 (0x013a );ether_addr_copy (auth->header.addr1, beacon->bssid);
@@ -927,8 +927,8 @@ static struct sk_buff *rtllib_null_func(struct rtllib_device *ieee, short pwr)ether_addr_copy (hdr->addr3, ieee->current_network.bssid); hdr->frame_control =cpu_to_le16 (RTLLIB_FTYPE_DATA | -IEEE80211_STYPE_NULLFUNC |RTLLIB_FCTL_TODS | - (pwr ?RTLLIB_FCTL_PM :0 )); +IEEE80211_STYPE_NULLFUNC |IEEE80211_FCTL_TODS | + (pwr ?IEEE80211_FCTL_PM :0 ));return skb; }
@@ -951,7 +951,7 @@ static struct sk_buff *rtllib_pspoll_func(struct rtllib_device *ieee) hdr->aid =cpu_to_le16 (ieee->assoc_id |0xc000 ); hdr->frame_control =cpu_to_le16 (RTLLIB_FTYPE_CTL |IEEE80211_STYPE_PSPOLL | -RTLLIB_FCTL_PM ); +IEEE80211_FCTL_PM );return skb; }
drivers/staging/rtl8192e/rtllib_tx.c +3 -3
@@ -655,7 +655,7 @@ static int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev) bytes = skb->len +SNAP_SIZE +sizeof (u16);if (encrypt) - fc =RTLLIB_FTYPE_DATA |RTLLIB_FCTL_WEP ; + fc =RTLLIB_FTYPE_DATA |IEEE80211_FCTL_PROTECTED ;else fc =RTLLIB_FTYPE_DATA ;
@@ -665,7 +665,7 @@ static int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev) fc |=IEEE80211_STYPE_DATA ;if (ieee->iw_mode ==IW_MODE_INFRA ) { - fc |=RTLLIB_FCTL_TODS ; + fc |=IEEE80211_FCTL_TODS ;/* To DS: Addr1 = BSSID, Addr2 = SA, * Addr3 = DA */
@@ -799,7 +799,7 @@ static int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)*/ if (i != nr_frags -1 ) { frag_hdr->frame_control =cpu_to_le16 (fc | -RTLLIB_FCTL_MOREFRAGS ); +IEEE80211_FCTL_MOREFRAGS ); bytes = bytes_per_frag; }else {
Signature · 1 line
2.42.0