staging: rtl8188eu: Use get_unaligned_be16() instead of RTW_GET_BE16()
PATCH 29/42 staging: rtl8188eu: Use get_unaligned_be16() instead of RTW_GET_BE16()
--- drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 8 ++++---- drivers/staging/rtl8188eu/core/rtw_recv.c | 4 ++-- drivers/staging/rtl8188eu/include/osdep_service.h | 2 -- 3 files changed, 6 insertions(+), 8 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ieee80211.c +4 -4
@@ -807,8 +807,8 @@ u8 *rtw_get_wps_attr(u8 *wps_ie, uint wps_ielen, u16 target_attr_id , u8 *buf_atwhile (attr_ptr - wps_ie < wps_ielen) {/* 4 = 2(Attribute ID) + 2(Length) */ -u16 attr_id =RTW_GET_BE16 (attr_ptr); -u16 attr_data_len =RTW_GET_BE16 (attr_ptr +2 ); +u16 attr_id =get_unaligned_be16 (attr_ptr); +u16 attr_data_len =get_unaligned_be16 (attr_ptr +2 );u16 attr_len = attr_data_len +4 ;if (attr_id == target_attr_id) {
@@ -1156,8 +1156,8 @@ void dump_wps_ie(u8 *ie, u32 ie_len) pos +=6 ;while (pos-ie < ie_len) { - id =RTW_GET_BE16 (pos); - len =RTW_GET_BE16 (pos +2 ); + id =get_unaligned_be16 (pos); + len =get_unaligned_be16 (pos +2 );DBG_88E ("%s ID:0x%04x, LEN:%u\n" , __func__, id, len); pos += (4 +len); }
drivers/staging/rtl8188eu/core/rtw_recv.c +2 -2
@@ -1644,7 +1644,7 @@ static int amsdu_to_msdu(struct adapter *padapter, struct recv_frame *prframe)while (a_len >ETH_HLEN ) {/* Offset 12 denote 2 mac address */ - nSubframe_Length =RTW_GET_BE16 (pdata +12 ); + nSubframe_Length =get_unaligned_be16 (pdata +12 );if (a_len < (ETHERNET_HEADER_SIZE + nSubframe_Length)) {DBG_88E ("nRemain_Length is %d and nSubframe_Length is : %d\n" , a_len, nSubframe_Length);
@@ -1699,7 +1699,7 @@ static int amsdu_to_msdu(struct adapter *padapter, struct recv_frame *prframe)for (i =0 ; i < nr_subframes; i++) { sub_skb = subframes[i];/* convert hdr + possible LLC headers into Ethernet header */ - eth_type =RTW_GET_BE16 (&sub_skb->data[6 ]); + eth_type =get_unaligned_be16 (&sub_skb->data[6 ]); if (sub_skb->len >= 8 && ((!memcmp(sub_skb->data, rtw_rfc1042_header, SNAP_SIZE) && eth_type != ETH_P_AARP && eth_type != ETH_P_IPX) ||
drivers/staging/rtl8188eu/include/osdep_service.h +0 -2
@@ -252,8 +252,6 @@ u64 rtw_modular64(u64 x, u64 y);/* Macros for handling unaligned memory accesses */ -#define RTW_GET_BE16 (a) ((u16) (((a)[0] << 8) | (a)[1])) -#define RTW_GET_LE16 (a) ((u16) (((a)[1] << 8) | (a)[0]))#define RTW_PUT_LE16 (a, val) \ do { \
Signature · 1 line
1.7.10.4
PATCH 30/42 staging: rtl8188eu: Remove unused inline function bitshift()
--- drivers/staging/rtl8188eu/include/osdep_service.h | 10 ---------- 1 file changed, 10 deletions(-)
drivers/staging/rtl8188eu/include/osdep_service.h +0 -10
@@ -215,16 +215,6 @@ static inline u32 _RND256(u32 sz)return val; } -static inline u32 bitshift (u32 bitmask) -{ -u32 i; - -for (i =0 ; i <=31 ; i++) -if (((bitmask>>i) &0x1 ) ==1 ) -break ; -return i; -} -struct rtw_netdev_priv_indicator {void *priv;u32 sizeof_priv;
Signature · 1 line
1.7.10.4
PATCH 31/42 staging: rtl8188eu: Use get_unaligned_le16() instead of RTW_GET_LE16()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_ap.c | 4 ++-- drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 8 ++++---- drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 6 +++--- drivers/staging/rtl8188eu/include/osdep_service.h | 1 - 4 files changed, 9 insertions(+), 10 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ap.c +2 -2
@@ -900,10 +900,10 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)/* beacon interval */ p =rtw_get_beacon_interval_from_ie (ie);/* 8: TimeStamp, 2: Beacon Interval 2:Capability */ - pbss_network->Configuration.BeaconPeriod =RTW_GET_LE16 (p); + pbss_network->Configuration.BeaconPeriod =get_unaligned_le16 (p);/* capability */ - cap =RTW_GET_LE16 (ie); + cap =get_unaligned_le16 (ie);/* SSID */ p =rtw_get_ie (ie + _BEACON_IE_OFFSET_, _SSID_IE_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_));
drivers/staging/rtl8188eu/core/rtw_ieee80211.c +4 -4
@@ -551,7 +551,7 @@ int rtw_parse_wpa_ie(u8 *wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwis/* pairwise_cipher */ if (left >=2 ) { - count =RTW_GET_LE16 (pos); + count =get_unaligned_le16 (pos); pos +=2 ; left -=2 ;
@@ -619,7 +619,7 @@ int rtw_parse_wpa2_ie(u8 *rsn_ie, int rsn_ie_len, int *group_cipher, int *pairwi/* pairwise_cipher */ if (left >=2 ) { - count =RTW_GET_LE16 (pos); + count =get_unaligned_le16 (pos); pos +=2 ; left -=2 ;
@@ -1179,7 +1179,7 @@ void dump_p2p_ie(u8 *ie, u32 ie_len) pos +=6 ;while (pos-ie < ie_len) { id = *pos; - len =RTW_GET_LE16 (pos+1 ); + len =get_unaligned_le16 (pos+1 );DBG_88E ("%s ID:%u, LEN:%u\n" , __func__, id, len); pos += (3 +len); }
@@ -1253,7 +1253,7 @@ u8 *rtw_get_p2p_attr(u8 *p2p_ie, uint p2p_ielen, u8 target_attr_id , u8 *buf_attwhile (attr_ptr - p2p_ie < p2p_ielen) {/* 3 = 1(Attribute ID) + 2(Length) */ u8 attr_id = *attr_ptr; -u16 attr_data_len =RTW_GET_LE16 (attr_ptr +1 ); +u16 attr_data_len =get_unaligned_le16 (attr_ptr +1 );u16 attr_len = attr_data_len +3 ;if (attr_id == target_attr_id) {
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c +3 -3
@@ -1053,7 +1053,7 @@ unsigned int OnAssocReq(struct adapter *padapter, struct recv_frame *precv_frame goto asoc_class2_error; } - capab_info =RTW_GET_LE16 (pframe +WLAN_HDR_A3_LEN ); + capab_info =get_unaligned_le16 (pframe +WLAN_HDR_A3_LEN ); left = pkt_len - (IEEE80211_3ADDR_LEN + ie_offset); pos = pframe + (IEEE80211_3ADDR_LEN + ie_offset);
@@ -1788,7 +1788,7 @@ unsigned int OnAction_back(struct adapter *padapter, struct recv_frame *precv_frissue_action_BA (padapter, addr,RTW_WLAN_ACTION_ADDBA_RESP ,37 );/* reject ADDBA Req */ break ;case RTW_WLAN_ACTION_ADDBA_RESP :/* ADDBA response */ - status =RTW_GET_LE16 (&frame_body[3 ]); + status =get_unaligned_le16 (&frame_body[3 ]); tid = ((frame_body[5 ] >>2 ) &0x7 );if (status ==0 ) {/* successful */ DBG_88E ("agg_enable for TID=%d\n" , tid);
@@ -1802,7 +1802,7 @@ unsigned int OnAction_back(struct adapter *padapter, struct recv_frame *precv_frif ((frame_body[3 ] &BIT (3 )) ==0 ) { psta->htpriv.agg_enable_bitmap &= ~(1 << ((frame_body[3 ] >>4 ) &0xf )); psta->htpriv.candidate_tid_bitmap &= ~(1 << ((frame_body[3 ] >>4 ) &0xf )); - reason_code =RTW_GET_LE16 (&frame_body[4 ]); + reason_code =get_unaligned_le16 (&frame_body[4 ]); }else if ((frame_body[3 ] &BIT (3 )) ==BIT (3 )) { tid = (frame_body[3 ] >>4 ) &0x0F ; preorder_ctrl = &psta->recvreorder_ctrl[tid];
drivers/staging/rtl8188eu/include/osdep_service.h +0 -1
@@ -242,7 +242,6 @@ u64 rtw_modular64(u64 x, u64 y);/* Macros for handling unaligned memory accesses */ -#define RTW_GET_LE16 (a) ((u16) (((a)[1] << 8) | (a)[0]))#define RTW_PUT_LE16 (a, val) \ do { \ (a)[1] = ((u16) (val)) >> 8; \
Signature · 1 line
1.7.10.4
PATCH 32/42 staging: rtl8188eu: Use cpu_to_le16() insted of RTW_PUT_LE16()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 7 +++--- drivers/staging/rtl8188eu/core/rtw_p2p.c | 24 +++++++-------------- drivers/staging/rtl8188eu/include/osdep_service.h | 6 ------ 3 files changed, 11 insertions(+), 26 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ieee80211.c +3 -4
@@ -206,8 +206,8 @@ inline u8 *rtw_set_ie_mesh_ch_switch_parm(u8 *buf, u32 *buf_len, u8 ttl, ie_data[0 ] = ttl; ie_data[1 ] = flags; -RTW_PUT_LE16 ((u8 *)&ie_data[2 ], reason); -RTW_PUT_LE16 ((u8 *)&ie_data[4 ], precedence); + *(u16 *)(ie_data+2 ) =cpu_to_le16 (reason); + *(u16 *)(ie_data+4 ) =cpu_to_le16 (precedence);return rtw_set_ie (buf,0x118 ,6 , ie_data, buf_len); }
@@ -1310,8 +1310,7 @@ u32 rtw_set_p2p_attr_content(u8 *pbuf, u8 attr_id, u16 attr_len, u8 *pdata_attr) *pbuf = attr_id; -/* u16*)(pbuf + 1) = cpu_to_le16(attr_len); */ -RTW_PUT_LE16 (pbuf +1 , attr_len); + *(u16 *)(pbuf +1 ) =cpu_to_le16 (attr_len);if (pdata_attr)memcpy (pbuf +3 , pdata_attr, attr_len);
drivers/staging/rtl8188eu/core/rtw_p2p.c +8 -16
@@ -487,8 +487,7 @@ u32 build_probe_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) p2pie[p2pielen++] =P2P_ATTR_CAPABILITY ;/* Length: */ -/* u16*) (p2pie + p2pielen) = cpu_to_le16(0x0002); */ -RTW_PUT_LE16 (p2pie + p2pielen,0x0002 ); + *(u16 *) (p2pie + p2pielen) =cpu_to_le16 (0x0002 ); p2pielen +=2 ;/* Value: */
@@ -516,19 +515,16 @@ u32 build_probe_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) p2pie[p2pielen++] =P2P_ATTR_EX_LISTEN_TIMING ;/* Length: */ -/* u16*) (p2pie + p2pielen) = cpu_to_le16(0x0004); */ -RTW_PUT_LE16 (p2pie + p2pielen,0x0004 ); + *(u16 *) (p2pie + p2pielen) =cpu_to_le16 (0x0004 ); p2pielen +=2 ;/* Value: */ /* Availability Period */ -/* u16*) (p2pie + p2pielen) = cpu_to_le16(0xFFFF); */ -RTW_PUT_LE16 (p2pie + p2pielen,0xFFFF ); + *(u16 *) (p2pie + p2pielen) =cpu_to_le16 (0xFFFF ); p2pielen +=2 ;/* Availability Interval */ -/* u16*) (p2pie + p2pielen) = cpu_to_le16(0xFFFF); */ -RTW_PUT_LE16 (p2pie + p2pielen,0xFFFF ); + *(u16 *) (p2pie + p2pielen) =cpu_to_le16 (0xFFFF ); p2pielen +=2 ;
@@ -544,8 +540,7 @@ u32 build_probe_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)/* Length: */ /* 21 -> P2P Device Address (6bytes) + Config Methods (2bytes) + Primary Device Type (8bytes) */ /* + NumofSecondDevType (1byte) + WPS Device Name ID field (2bytes) + WPS Device Name Len field (2bytes) */ -/* u16*) (p2pie + p2pielen) = cpu_to_le16(21 + pwdinfo->device_name_len); */ -RTW_PUT_LE16 (p2pie + p2pielen,21 + pwdinfo->device_name_len); + *(u16 *) (p2pie + p2pielen) =cpu_to_le16 (21 + pwdinfo->device_name_len); p2pielen +=2 ;/* Value: */
@@ -624,8 +619,7 @@ u32 build_prov_disc_request_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf, u8 p2pie[p2pielen++] =P2P_ATTR_CAPABILITY ;/* Length: */ -/* u16*) (p2pie + p2pielen) = cpu_to_le16(0x0002); */ -RTW_PUT_LE16 (p2pie + p2pielen,0x0002 ); + *(u16 *) (p2pie + p2pielen) =cpu_to_le16 (0x0002 ); p2pielen +=2 ;/* Value: */
@@ -646,8 +640,7 @@ u32 build_prov_disc_request_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf, u8/* Length: */ /* 21 -> P2P Device Address (6bytes) + Config Methods (2bytes) + Primary Device Type (8bytes) */ /* + NumofSecondDevType (1byte) + WPS Device Name ID field (2bytes) + WPS Device Name Len field (2bytes) */ -/* u16*) (p2pie + p2pielen) = cpu_to_le16(21 + pwdinfo->device_name_len); */ -RTW_PUT_LE16 (p2pie + p2pielen,21 + pwdinfo->device_name_len); + *(u16 *) (p2pie + p2pielen) =cpu_to_le16 (21 + pwdinfo->device_name_len); p2pielen +=2 ;/* Value: */
@@ -703,8 +696,7 @@ u32 build_prov_disc_request_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf, u8 p2pie[p2pielen++] =P2P_ATTR_GROUP_ID ;/* Length: */ -/* u16*) (p2pie + p2pielen) = cpu_to_le16(ETH_ALEN + ussidlen); */ -RTW_PUT_LE16 (p2pie + p2pielen,ETH_ALEN + ussidlen); + *(u16 *) (p2pie + p2pielen) =cpu_to_le16 (ETH_ALEN + ussidlen); p2pielen +=2 ;/* Value: */
drivers/staging/rtl8188eu/include/osdep_service.h +0 -6
@@ -242,12 +242,6 @@ u64 rtw_modular64(u64 x, u64 y);/* Macros for handling unaligned memory accesses */ -#define RTW_PUT_LE16 (a, val) \ - do { \ - (a)[1] = ((u16) (val)) >> 8; \ - (a)[0] = ((u16) (val)) & 0xff; \ - } while (0) -#define RTW_GET_BE24 (a) ((((u32) (a)[0]) << 16) | (((u32) (a)[1]) << 8) | \ ((u32) (a)[2]))
Signature · 1 line
1.7.10.4
PATCH 33/42 staging: rtl8188eu: osdep_service.h: Remove unused function definations
In reply to navin patidar--- drivers/staging/rtl8188eu/include/osdep_service.h | 3 --- 1 file changed, 3 deletions(-)
drivers/staging/rtl8188eu/include/osdep_service.h +0 -3
@@ -159,8 +159,6 @@ u8 *_rtw_malloc(u32 sz);void *rtw_malloc2d (int h,int w,int size); -void _rtw_memcpy (void *dec,void *sour,u32 sz); -u32 _rtw_down_sema (struct semaphore *sema);void _rtw_init_queue (struct __queue *pqueue);
@@ -260,6 +258,5 @@ bool rtw_cbuf_empty(struct rtw_cbuf *cbuf);bool rtw_cbuf_push (struct rtw_cbuf *cbuf,void *buf);void *rtw_cbuf_pop (struct rtw_cbuf *cbuf);struct rtw_cbuf *rtw_cbuf_alloc (u32 size); -int wifirate2_ratetbl_inx (unsigned char rate);#endif
Signature · 1 line
1.7.10.4
PATCH 34/42 staging: rtl8188eu: Remove unused inline function _RND256()
In reply to navin patidar--- drivers/staging/rtl8188eu/include/osdep_service.h | 8 -------- 1 file changed, 8 deletions(-)
drivers/staging/rtl8188eu/include/osdep_service.h +0 -8
@@ -205,14 +205,6 @@ static inline u32 _RND128(u32 sz)return val; } -static inline u32 _RND256 (u32 sz) -{ -u32 val; - - val = ((sz >>8 ) + ((sz &255 ) ?1 :0 )) <<8 ; -return val; -} -struct rtw_netdev_priv_indicator {void *priv;u32 sizeof_priv;
Signature · 1 line
1.7.10.4
PATCH 35/42 staging: rtl8188eu: Use round_up() instead of _RND128()
In reply to navin patidar--- drivers/staging/rtl8188eu/include/osdep_service.h | 8 -------- drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-)
drivers/staging/rtl8188eu/include/osdep_service.h +0 -8
@@ -197,14 +197,6 @@ static inline u32 _RND8(u32 sz)return val; } -static inline u32 _RND128 (u32 sz) -{ -u32 val; - - val = ((sz >>7 ) + ((sz &127 ) ?1 :0 )) <<7 ; -return val; -} -struct rtw_netdev_priv_indicator {void *priv;u32 sizeof_priv;
drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c +1 -1
@@ -160,7 +160,7 @@ static int recvbuf2recvframe(struct adapter *adapt, struct sk_buff *pskb)switch (haldata->UsbRxAggMode) {case USB_RX_AGG_DMA :case USB_RX_AGG_MIX : - pkt_offset = (u16 )_RND128 (pkt_offset); + pkt_offset = (u16 )round_up (pkt_offset,128 );break ;case USB_RX_AGG_USB : pkt_offset = (u16 )_RND4 (pkt_offset);
Signature · 1 line
1.7.10.4
PATCH 36/42 staging: rtl8188eu: Use round_up() instead of _RND8()
In reply to navin patidar--- drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 2 +- drivers/staging/rtl8188eu/include/osdep_service.h | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c +1 -1
@@ -493,7 +493,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmitp pfirstframe = pxmitframe; len =xmitframe_need_length (pfirstframe) +TXDESC_SIZE + (pfirstframe->pkt_offset*PACKET_OFFSET_SZ ); pbuf_tail = len; - pbuf =_RND8 (pbuf_tail); + pbuf =round_up (pbuf_tail,8 );/* check pkt amount in one bulk */ desc_cnt =0 ;
drivers/staging/rtl8188eu/include/osdep_service.h +0 -8
@@ -189,14 +189,6 @@ static inline u32 _RND4(u32 sz)return val; } -static inline u32 _RND8 (u32 sz) -{ -u32 val; - - val = ((sz >>3 ) + ((sz &7 ) ?1 :0 )) <<3 ; -return val; -} -struct rtw_netdev_priv_indicator {void *priv;u32 sizeof_priv;
Signature · 1 line
1.7.10.4
PATCH 37/42 staging: rtl8188eu: Use round_up() instead of _RND4()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_cmd.c | 2 +- drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 4 ++-- drivers/staging/rtl8188eu/include/osdep_service.h | 8 -------- drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 2 +- 4 files changed, 4 insertions(+), 12 deletions(-)
drivers/staging/rtl8188eu/core/rtw_cmd.c +1 -1
@@ -324,7 +324,7 @@ _next: pcmdpriv->cmd_issued_cnt++; - pcmd->cmdsz =_RND4 ((pcmd->cmdsz));/* _RND4 */ + pcmd->cmdsz =round_up (pcmd->cmdsz,4 );memcpy (pcmdbuf, pcmd->parmbuf, pcmd->cmdsz);
drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c +2 -2
@@ -544,7 +544,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmitp len =xmitframe_need_length (pxmitframe) +TXDESC_SIZE + (pxmitframe->pkt_offset*PACKET_OFFSET_SZ ); -if (_RND8 (pbuf + len) >MAX_XMITBUF_SZ ) { +if (round_up (pbuf + len,8 ) >MAX_XMITBUF_SZ ) { pxmitframe->agg_num =1 ; pxmitframe->pkt_offset =1 ;break ;
@@ -567,7 +567,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmitp/* handle pointer and stop condition */ pbuf_tail = pbuf + len; - pbuf =_RND8 (pbuf_tail); + pbuf =round_up (pbuf_tail,8 ); pfirstframe->agg_num++;if (MAX_TX_AGG_PACKET_NUMBER == pfirstframe->agg_num)
drivers/staging/rtl8188eu/include/osdep_service.h +0 -8
@@ -181,14 +181,6 @@ static inline void flush_signals_thread(void)#define _RND (sz, r) ((((sz)+((r)-1))/(r))*(r))#define RND4 (x) (((x >> 2) + (((x & 3) == 0) ? 0 : 1)) << 2) -static inline u32 _RND4 (u32 sz) -{ -u32 val; - - val = ((sz >>2 ) + ((sz &3 ) ?1 :0 )) <<2 ; -return val; -} -struct rtw_netdev_priv_indicator {void *priv;u32 sizeof_priv;
drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c +1 -1
@@ -163,7 +163,7 @@ static int recvbuf2recvframe(struct adapter *adapt, struct sk_buff *pskb) pkt_offset = (u16 )round_up (pkt_offset,128 );break ;case USB_RX_AGG_USB : - pkt_offset = (u16 )_RND4 (pkt_offset); + pkt_offset = (u16 )round_up (pkt_offset,4 );break ;case USB_RX_AGG_DISABLE :default :
Signature · 1 line
1.7.10.4
PATCH 38/42 staging: rtl8188eu: osdep_service.h: Remove unused macros
In reply to navin patidar--- drivers/staging/rtl8188eu/include/osdep_service.h | 4 ---- 1 file changed, 4 deletions(-)
drivers/staging/rtl8188eu/include/osdep_service.h +0 -4
@@ -109,9 +109,6 @@ static inline int rtw_netif_queue_stopped(struct net_device *pnetdev)netif_tx_queue_stopped (netdev_get_tx_queue (pnetdev,3 )); } -#ifndef BIT -#define BIT (x) (1 << (x)) -#endif #define BIT0 0x00000001#define BIT1 0x00000002
@@ -178,7 +175,6 @@ static inline void flush_signals_thread(void)flush_signals (current); } -#define _RND (sz, r) ((((sz)+((r)-1))/(r))*(r))#define RND4 (x) (((x >> 2) + (((x & 3) == 0) ? 0 : 1)) << 2)struct rtw_netdev_priv_indicator {
Signature · 1 line
1.7.10.4
PATCH 39/42 staging: rtl8188eu: Use round_up() instead of RND4()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_security.c | 6 +++--- drivers/staging/rtl8188eu/core/rtw_xmit.c | 4 ++-- drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 2 +- drivers/staging/rtl8188eu/include/osdep_service.h | 2 -- 4 files changed, 6 insertions(+), 8 deletions(-)
drivers/staging/rtl8188eu/core/rtw_security.c +3 -3
@@ -189,7 +189,7 @@ void rtw_wep_encrypt(struct adapter *padapter, u8 *pxmitframe)arcfour_encrypt (&mycontext, payload+length, crc,4 ); pframe += pxmitpriv->frag_len; - pframe = (u8 *)RND4 ((size_t )(pframe)); + pframe = (u8 *)round_up ((size_t )(pframe),4 ); } } }
@@ -628,7 +628,7 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)arcfour_encrypt (&mycontext, payload+length, crc,4 ); pframe += pxmitpriv->frag_len; - pframe = (u8 *)RND4 ((size_t )(pframe)); + pframe = (u8 *)round_up ((size_t )(pframe),4 ); } } }else {
@@ -1242,7 +1242,7 @@ u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe)aes_cipher (prwskey, pattrib->hdrlen, pframe, length); pframe += pxmitpriv->frag_len; - pframe = (u8 *)RND4 ((size_t )(pframe)); + pframe = (u8 *)round_up ((size_t )(pframe),8 ); } } }else {
drivers/staging/rtl8188eu/core/rtw_xmit.c +2 -2
@@ -692,7 +692,7 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr payload = pframe;for (curfragnum =0 ; curfragnum < pattrib->nr_frags; curfragnum++) { - payload = (u8 *)RND4 ((size_t )(payload)); + payload = (u8 *)round_up ((size_t )(payload),4 ); RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("=== curfragnum=%d, pframe = 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x,!!!\n", curfragnum, *payload, *(payload+1),
@@ -1099,7 +1099,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct addr = (size_t )(pframe); - mem_start = (unsigned char *)RND4 (addr) + hw_hdr_offset; + mem_start = (unsigned char *)round_up (addr,4 ) + hw_hdr_offset;memcpy (mem_start, pbuf_start + hw_hdr_offset, pattrib->hdrlen); }
drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c +1 -1
@@ -401,7 +401,7 @@ static s32 rtw_dump_xframe(struct adapter *adapt, struct xmit_frame *pxmitframe) mem_addr += w_sz; - mem_addr = (u8 *)RND4 (((size_t )(mem_addr))); + mem_addr = (u8 *)round_up ((size_t )mem_addr,4 ); }rtw_free_xmitframe (pxmitpriv, pxmitframe);
drivers/staging/rtl8188eu/include/osdep_service.h +0 -2
@@ -175,8 +175,6 @@ static inline void flush_signals_thread(void)flush_signals (current); } -#define RND4 (x) (((x >> 2) + (((x & 3) == 0) ? 0 : 1)) << 2) -struct rtw_netdev_priv_indicator {void *priv;u32 sizeof_priv;
Signature · 1 line
1.7.10.4
PATCH 40/42 staging: rtl8188eu: Remove function thread_enter()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_cmd.c | 3 +-- drivers/staging/rtl8188eu/core/rtw_mp.c | 2 +- drivers/staging/rtl8188eu/include/osdep_service.h | 5 ----- 3 files changed, 2 insertions(+), 8 deletions(-)
drivers/staging/rtl8188eu/core/rtw_cmd.c +1 -2
@@ -285,8 +285,7 @@ int rtw_cmd_thread(void *context)struct adapter *padapter = (struct adapter *)context;struct cmd_priv *pcmdpriv = &(padapter->cmdpriv); - -thread_enter ("RTW_CMD_THREAD" ); +allow_signal (SIGTERM ); pcmdbuf = pcmdpriv->cmd_buf;
drivers/staging/rtl8188eu/core/rtw_mp.c +1 -1
@@ -597,7 +597,7 @@ static int mp_xmit_packet_thread(void *context) padapter = pmp_priv->papdater; pxmitpriv = &(padapter->xmitpriv); -thread_enter ("RTW_MP_THREAD" ); +allow_signal (SIGTERM );/* DBG_88E("%s:pkTx Start\n", __func__); */ while (1 ) {
drivers/staging/rtl8188eu/include/osdep_service.h +0 -5
@@ -164,11 +164,6 @@ u32 rtw_systime_to_ms(u32 systime);u32 rtw_ms_to_systime (u32 ms);s32 rtw_get_passing_time_ms (u32 start); -static inline void thread_enter (char *name) -{ -allow_signal (SIGTERM ); -} -static inline void flush_signals_thread (void ) {if (signal_pending (current))
Signature · 1 line
1.7.10.4
PATCH 41/42 staging: rtl8188eu: Remove function flush_signals_thread()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_cmd.c | 3 ++- drivers/staging/rtl8188eu/core/rtw_mp.c | 3 ++- drivers/staging/rtl8188eu/include/osdep_service.h | 6 ------ 3 files changed, 4 insertions(+), 8 deletions(-)
drivers/staging/rtl8188eu/core/rtw_cmd.c +2 -1
@@ -359,7 +359,8 @@ post_process:rtw_free_cmd_obj (pcmd); } -flush_signals_thread (); +if (signal_pending (current)) +flush_signals (current); goto _next; }
drivers/staging/rtl8188eu/core/rtw_mp.c +2 -1
@@ -629,7 +629,8 @@ static int mp_xmit_packet_thread(void *context) (pmptx->count == pmptx->sended)) goto exit; -flush_signals_thread (); +if (signal_pending (current)) +flush_signals (current); } exit:
drivers/staging/rtl8188eu/include/osdep_service.h +0 -6
@@ -164,12 +164,6 @@ u32 rtw_systime_to_ms(u32 systime);u32 rtw_ms_to_systime (u32 ms);s32 rtw_get_passing_time_ms (u32 start); -static inline void flush_signals_thread (void ) -{ -if (signal_pending (current)) -flush_signals (current); -} -struct rtw_netdev_priv_indicator {void *priv;u32 sizeof_priv;
Signature · 1 line
1.7.10.4
PATCH 42/42 staging: rtl8188eu: Replace _cancel_timer() with del_timer_sync()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_cmd.c | 3 +-- drivers/staging/rtl8188eu/core/rtw_mlme.c | 8 ++------ drivers/staging/rtl8188eu/core/rtw_p2p.c | 4 +--- drivers/staging/rtl8188eu/include/osdep_service.h | 6 ------ 4 files changed, 4 insertions(+), 17 deletions(-)
drivers/staging/rtl8188eu/core/rtw_cmd.c +1 -2
@@ -2084,7 +2084,6 @@ void rtw_joinbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)void rtw_createbss_cmd_callback (struct adapter *padapter,struct cmd_obj *pcmd) { -u8 timer_cancelled;struct sta_info *psta =NULL ;struct wlan_network *pwlan =NULL ;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@@ -2097,7 +2096,7 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)_set_timer (&pmlmepriv->assoc_timer,1 ); } -_cancel_timer (&pmlmepriv->assoc_timer, &timer_cancelled); +del_timer_sync (&pmlmepriv->assoc_timer);spin_lock_bh (&pmlmepriv->lock);
drivers/staging/rtl8188eu/core/rtw_mlme.c +2 -6
@@ -725,10 +725,7 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("rtw_surveydone_event_callback: fw_state:%x\n\n" ,get_fwstate (pmlmepriv)));if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY)) { -u8 timer_cancelled; - -_cancel_timer (&pmlmepriv->scan_to_timer, &timer_cancelled); - +del_timer_sync (&pmlmepriv->scan_to_timer);_clr_fwstate_ (pmlmepriv, _FW_UNDER_SURVEY); }else {RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("nic status=%x, survey done event comes too late!\n" ,get_fwstate (pmlmepriv)));
@@ -1103,7 +1100,6 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_netvoid rtw_joinbss_event_prehandle (struct adapter *adapter,u8 *pbuf) { -u8 timer_cancelled;struct sta_info *ptarget_sta =NULL , *pcur_sta =NULL ;struct sta_priv *pstapriv = &adapter->stapriv;struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
@@ -1196,7 +1192,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) }/* s5. Cancle assoc_timer */ -_cancel_timer (&pmlmepriv->assoc_timer, &timer_cancelled); +del_timer_sync (&pmlmepriv->assoc_timer);RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("Cancle assoc_timer\n" ));
drivers/staging/rtl8188eu/core/rtw_p2p.c +1 -3
@@ -1404,9 +1404,7 @@ u8 process_p2p_group_negotation_confirm(struct wifidirect_info *pwdinfo, u8 *pfr result = attr_content;if (attr_content ==P2P_STATUS_SUCCESS ) { -u8 bcancelled =0 ; - -_cancel_timer (&pwdinfo->restore_p2p_state_timer, &bcancelled); +del_timer_sync (&pwdinfo->restore_p2p_state_timer);/* Commented by Albert 20100911 */ /* Todo: Need to handle the case which both Intents are the same. */
drivers/staging/rtl8188eu/include/osdep_service.h +0 -6
@@ -90,12 +90,6 @@ static inline void _set_timer(struct timer_list *ptimer, u32 delay_time)mod_timer (ptimer , (jiffies+(delay_time*HZ /1000 ))); } -static inline void _cancel_timer (struct timer_list *ptimer,u8 *bcancelled) -{ -del_timer_sync (ptimer); - *bcancelled = true;/* true ==1; false==0 */ -} -#define RTW_TIMER_HDL_ARGS void *FunctionContext#define RTW_TIMER_HDL_NAME (name) rtw_##name##_timer_hdl#define RTW_DECLARE_TIMER_HDL (name) \
Signature · 1 line
1.7.10.4