Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17c9ac62 authored by Larry Finger's avatar Larry Finger Committed by John W. Linville
Browse files

rtlwifi: rtl8192ce: Fix endian warnings 



Drivers rtlwifi, and rtl8192ce generate a large number of
sparse warnings. This patch fixes most of them.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 663dcc73

drivers/net/wireless/rtlwifi/base.c

+8 −8
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static void _rtl_init_hw_ht_capab(struct ieee80211_hw *hw, 
		ht_cap->mcs.rx_mask[1] = 0xFF;

		ht_cap->mcs.rx_mask[4] = 0x01;



		ht_cap->mcs.rx_highest = MAX_BIT_RATE_40MHZ_MCS15;

		ht_cap->mcs.rx_highest = cpu_to_le16(MAX_BIT_RATE_40MHZ_MCS15);

	} else if (get_rf_type(rtlphy) == RF_1T1R) {



		RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("1T1R\n"));
@@ -153,7 +153,7 @@ static void _rtl_init_hw_ht_capab(struct ieee80211_hw *hw, 
		ht_cap->mcs.rx_mask[1] = 0x00;

		ht_cap->mcs.rx_mask[4] = 0x01;



		ht_cap->mcs.rx_highest = MAX_BIT_RATE_40MHZ_MCS7;

		ht_cap->mcs.rx_highest = cpu_to_le16(MAX_BIT_RATE_40MHZ_MCS7);

	}

}
@@ -498,7 +498,7 @@ void rtl_get_tcb_desc(struct ieee80211_hw *hw, 
	struct rtl_mac *rtlmac = rtl_mac(rtl_priv(hw));

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)(skb->data);

	struct ieee80211_rate *txrate;

	u16 fc = le16_to_cpu(hdr->frame_control);

	__le16 fc = hdr->frame_control;



	memset(tcb_desc, 0, sizeof(struct rtl_tcb_desc));
@@ -570,7 +570,7 @@ bool rtl_tx_mgmt_proc(struct ieee80211_hw *hw, struct sk_buff *skb) 
	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)(skb->data);

	u16 fc = le16_to_cpu(hdr->frame_control);

	__le16 fc = hdr->frame_control;



	if (ieee80211_is_auth(fc)) {

		RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG, ("MAC80211_LINKING\n"));
@@ -587,7 +587,7 @@ bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx) 
	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)(skb->data);

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	u16 fc = le16_to_cpu(hdr->frame_control);

	__le16 fc = hdr->frame_control;

	u8 *act = (u8 *) (((u8 *) skb->data + MAC80211_3ADDR_LEN));

	u8 category;
@@ -632,7 +632,7 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx) 
	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)(skb->data);

	struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));

	u16 fc = le16_to_cpu(hdr->frame_control);

	__le16 fc = hdr->frame_control;

	u16 ether_type;

	u8 mac_hdr_len = ieee80211_get_hdrlen_from_skb(skb);

	const struct iphdr *ip;
@@ -646,7 +646,6 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx) 
	ip = (struct iphdr *)((u8 *) skb->data + mac_hdr_len +

			      SNAP_SIZE + PROTOC_TYPE_SIZE);

	ether_type = *(u16 *) ((u8 *) skb->data + mac_hdr_len + SNAP_SIZE);

	ether_type = ntohs(ether_type);



	if (ETH_P_IP == ether_type) {

		if (IPPROTO_UDP == ip->protocol) {
@@ -690,7 +689,8 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx) 
		}



		return true;

	} else if (0x86DD == ether_type) {

	} else if (ETH_P_IPV6 == ether_type) {

		/* IPv6 */

		return true;

	}

drivers/net/wireless/rtlwifi/core.c

+3 −3
Original line number Diff line number Diff line
@@ -434,9 +434,9 @@ static int rtl_op_conf_tx(struct ieee80211_hw *hw, u16 queue, 


	aci = _rtl_get_hal_qnum(queue);

	mac->ac[aci].aifs = param->aifs;

	mac->ac[aci].cw_min = param->cw_min;

	mac->ac[aci].cw_max = param->cw_max;

	mac->ac[aci].tx_op = param->txop;

	mac->ac[aci].cw_min = cpu_to_le16(param->cw_min);

	mac->ac[aci].cw_max = cpu_to_le16(param->cw_max);

	mac->ac[aci].tx_op = cpu_to_le16(param->txop);

	memcpy(&mac->edca_param[aci], param, sizeof(*param));

	rtlpriv->cfg->ops->set_qos(hw, aci);

	return 0;

drivers/net/wireless/rtlwifi/pci.c

+14 −15
Original line number Diff line number Diff line
@@ -476,9 +476,9 @@ static void _rtl_pci_tx_isr(struct ieee80211_hw *hw, int prio) 


		skb = __skb_dequeue(&ring->queue);

		pci_unmap_single(rtlpci->pdev,

				 le32_to_cpu(rtlpriv->cfg->ops->

				 rtlpriv->cfg->ops->

					     get_desc((u8 *) entry, true,

						      HW_DESC_TXBUFF_ADDR)),

						      HW_DESC_TXBUFF_ADDR),

				 skb->len, PCI_DMA_TODEVICE);



		RT_TRACE(rtlpriv, (COMP_INTR | COMP_SEND), DBG_TRACE,
@@ -557,7 +557,7 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw) 
			return;

		} else {

			struct ieee80211_hdr *hdr;

			u16 fc;

			__le16 fc;

			struct sk_buff *new_skb = NULL;



			rtlpriv->cfg->ops->query_rx_desc(hw, &stats,
@@ -583,7 +583,7 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw) 
			 */



			hdr = (struct ieee80211_hdr *)(skb->data);

			fc = le16_to_cpu(hdr->frame_control);

			fc = hdr->frame_control;



			if (!stats.crc) {

				memcpy(IEEE80211_SKB_RXCB(skb), &rx_status,
@@ -666,7 +666,7 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw) 


		}

done:

		bufferaddress = cpu_to_le32(*((dma_addr_t *) skb->cb));

		bufferaddress = (u32)(*((dma_addr_t *) skb->cb));

		tmp_one = 1;

		rtlpriv->cfg->ops->set_desc((u8 *) pdesc, false,

					    HW_DESC_RXBUFF_ADDR,
@@ -955,9 +955,8 @@ static int _rtl_pci_init_tx_ring(struct ieee80211_hw *hw, 
		 ("queue:%d, ring_addr:%p\n", prio, ring));



	for (i = 0; i < entries; i++) {

		nextdescaddress = cpu_to_le32((u32) dma +

					      ((i + 1) % entries) *

					      sizeof(*ring));

		nextdescaddress = (u32) dma + ((i + 1) % entries) *

					      sizeof(*ring);



		rtlpriv->cfg->ops->set_desc((u8 *)&(ring[i]),

					    true, HW_DESC_TX_NEXTDESC_ADDR,
@@ -1021,7 +1020,7 @@ static int _rtl_pci_init_rx_ring(struct ieee80211_hw *hw) 
					   rtlpci->rxbuffersize,

					   PCI_DMA_FROMDEVICE);



			bufferaddress = cpu_to_le32(*((dma_addr_t *)skb->cb));

			bufferaddress = (u32)(*((dma_addr_t *)skb->cb));

			rtlpriv->cfg->ops->set_desc((u8 *)entry, false,

						    HW_DESC_RXBUFF_ADDR,

						    (u8 *)&bufferaddress);
@@ -1052,9 +1051,9 @@ static void _rtl_pci_free_tx_ring(struct ieee80211_hw *hw, 
		struct sk_buff *skb = __skb_dequeue(&ring->queue);



		pci_unmap_single(rtlpci->pdev,

				 le32_to_cpu(rtlpriv->cfg->

				 rtlpriv->cfg->

					     ops->get_desc((u8 *) entry, true,

						   HW_DESC_TXBUFF_ADDR)),

						   HW_DESC_TXBUFF_ADDR),

				 skb->len, PCI_DMA_TODEVICE);

		kfree_skb(skb);

		ring->idx = (ring->idx + 1) % ring->entries;
@@ -1186,11 +1185,11 @@ int rtl_pci_reset_trx_ring(struct ieee80211_hw *hw) 
				    __skb_dequeue(&ring->queue);



				pci_unmap_single(rtlpci->pdev,

						 le32_to_cpu(rtlpriv->cfg->ops->

						 rtlpriv->cfg->ops->

							 get_desc((u8 *)

							 entry,

							 true,

							 HW_DESC_TXBUFF_ADDR)),

							 HW_DESC_TXBUFF_ADDR),

						 skb->len, PCI_DMA_TODEVICE);

				kfree_skb(skb);

				ring->idx = (ring->idx + 1) % ring->entries;
@@ -1204,7 +1203,7 @@ int rtl_pci_reset_trx_ring(struct ieee80211_hw *hw) 
	return 0;

}



static unsigned int _rtl_mac_to_hwqueue(u16 fc,

static unsigned int _rtl_mac_to_hwqueue(__le16 fc,

		unsigned int mac80211_queue_index)

{

	unsigned int hw_queue_index;
@@ -1254,7 +1253,7 @@ static int rtl_pci_tx(struct ieee80211_hw *hw, struct sk_buff *skb) 
	unsigned int queue_index, hw_queue;

	unsigned long flags;

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)(skb->data);

	u16 fc = le16_to_cpu(hdr->frame_control);

	__le16 fc = hdr->frame_control;

	u8 *pda_addr = hdr->addr1;

	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));

	/*ssn */

drivers/net/wireless/rtlwifi/rtl8192ce/hw.c

+20 −19
Original line number Diff line number Diff line
@@ -318,15 +318,17 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val) 
		}

	case HW_VAR_AC_PARAM:{

			u8 e_aci = *((u8 *) val);

			u32 u4b_ac_param = 0;

			u32 u4b_ac_param;

			u16 cw_min = le16_to_cpu(mac->ac[e_aci].cw_min);

			u16 cw_max = le16_to_cpu(mac->ac[e_aci].cw_max);

			u16 tx_op = le16_to_cpu(mac->ac[e_aci].tx_op);



			u4b_ac_param |= (u32) mac->ac[e_aci].aifs;

			u4b_ac_param |= ((u32) mac->ac[e_aci].cw_min

			u4b_ac_param = (u32) mac->ac[e_aci].aifs;

			u4b_ac_param |= ((u32)cw_min

					 & 0xF) << AC_PARAM_ECW_MIN_OFFSET;

			u4b_ac_param |= ((u32) mac->ac[e_aci].cw_max &

			u4b_ac_param |= ((u32)cw_max &

					 0xF) << AC_PARAM_ECW_MAX_OFFSET;

			u4b_ac_param |= (u32) mac->ac[e_aci].tx_op

			    << AC_PARAM_TXOP_LIMIT_OFFSET;

			u4b_ac_param |= (u32)tx_op << AC_PARAM_TXOP_OFFSET;



			RT_TRACE(rtlpriv, COMP_MLME, DBG_LOUD,

				 ("queue:%x, ac_param:%x\n", e_aci,
@@ -1170,21 +1172,20 @@ void rtl92ce_set_qos(struct ieee80211_hw *hw, int aci) 
{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));



	u32 u4b_ac_param;

	u16 cw_min = le16_to_cpu(mac->ac[aci].cw_min);

	u16 cw_max = le16_to_cpu(mac->ac[aci].cw_max);

	u16 tx_op = le16_to_cpu(mac->ac[aci].tx_op);



	rtl92c_dm_init_edca_turbo(hw);



	u4b_ac_param = (u32) mac->ac[aci].aifs;

	u4b_ac_param |=

	    ((u32) mac->ac[aci].cw_min & 0xF) << AC_PARAM_ECW_MIN_OFFSET;

	u4b_ac_param |=

	    ((u32) mac->ac[aci].cw_max & 0xF) << AC_PARAM_ECW_MAX_OFFSET;

	u4b_ac_param |= (u32) mac->ac[aci].tx_op << AC_PARAM_TXOP_LIMIT_OFFSET;

	u4b_ac_param |= (u32) ((cw_min & 0xF) << AC_PARAM_ECW_MIN_OFFSET);

	u4b_ac_param |= (u32) ((cw_max & 0xF) << AC_PARAM_ECW_MAX_OFFSET);

	u4b_ac_param |= (u32) (tx_op << AC_PARAM_TXOP_OFFSET);

	RT_TRACE(rtlpriv, COMP_QOS, DBG_DMESG,

		 ("queue:%x, ac_param:%x aifs:%x cwmin:%x cwmax:%x txop:%x\n",

		  aci, u4b_ac_param, mac->ac[aci].aifs, mac->ac[aci].cw_min,

		  mac->ac[aci].cw_max, mac->ac[aci].tx_op));

		  aci, u4b_ac_param, mac->ac[aci].aifs, cw_min,

		  cw_max, tx_op));

	switch (aci) {

	case AC1_BK:

		rtl_write_dword(rtlpriv, REG_EDCA_BK_PARAM, u4b_ac_param);
@@ -1712,7 +1713,7 @@ void rtl92ce_update_hal_rate_table(struct ieee80211_hw *hw) 
	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));



	u32 ratr_value = (u32) mac->basic_rates;

	u8 *p_mcsrate = mac->mcs;

	u8 *mcsrate = mac->mcs;

	u8 ratr_index = 0;

	u8 nmode = mac->ht_enable;

	u8 mimo_ps = 1;
@@ -1723,7 +1724,7 @@ void rtl92ce_update_hal_rate_table(struct ieee80211_hw *hw) 
	u8 curshortgi_20mhz = mac->sgi_20;

	enum wireless_mode wirelessmode = mac->mode;



	ratr_value |= EF2BYTE((*(u16 *) (p_mcsrate))) << 12;

	ratr_value |= ((*(u16 *) (mcsrate))) << 12;



	switch (wirelessmode) {

	case WIRELESS_MODE_B:
@@ -1892,8 +1893,8 @@ void rtl92ce_update_hal_rate_mask(struct ieee80211_hw *hw, u8 rssi_level) 
	}

	RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG,

		 ("ratr_bitmap :%x\n", ratr_bitmap));

	*(u32 *)&rate_mask = EF4BYTE((ratr_bitmap & 0x0fffffff) |

				       (ratr_index << 28));

	*(u32 *)&rate_mask = (ratr_bitmap & 0x0fffffff) |

				       (ratr_index << 28);

	rate_mask[4] = macid | (shortgi ? 0x20 : 0x00) | 0x80;

	RT_TRACE(rtlpriv, COMP_RATR, DBG_DMESG, ("Rate_index:%x, "

						 "ratr_val:%x, %x:%x:%x:%x:%x\n",

drivers/net/wireless/rtlwifi/rtl8192ce/reg.h

+0 −1
Original line number Diff line number Diff line
@@ -1076,7 +1076,6 @@ 
#define _RARF_RC7(x)				(((x) & 0x1F) << 16)

#define _RARF_RC8(x)				(((x) & 0x1F) << 24)



#define AC_PARAM_TXOP_LIMIT_OFFSET		16

#define AC_PARAM_TXOP_OFFSET			16

#define AC_PARAM_ECW_MAX_OFFSET			12

#define AC_PARAM_ECW_MIN_OFFSET			8