diff options
author | Larry Finger <Larry.Finger@lwfinger.net> | 2011-02-19 17:29:57 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-02-21 15:39:59 -0500 |
commit | 17c9ac62812b58aacefc7336215aecbb522f6547 (patch) | |
tree | 3eca6290a695716678d7ff12f9a3093b566c5c93 /drivers/net/wireless/rtlwifi/pci.c | |
parent | 663dcc73675bd70ee11195ce832b1d1691f967d0 (diff) |
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: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rtlwifi/pci.c')
-rw-r--r-- | drivers/net/wireless/rtlwifi/pci.c | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c index 2da16438077..1f18bf7df74 100644 --- a/drivers/net/wireless/rtlwifi/pci.c +++ b/drivers/net/wireless/rtlwifi/pci.c | |||
@@ -476,9 +476,9 @@ static void _rtl_pci_tx_isr(struct ieee80211_hw *hw, int prio) | |||
476 | 476 | ||
477 | skb = __skb_dequeue(&ring->queue); | 477 | skb = __skb_dequeue(&ring->queue); |
478 | pci_unmap_single(rtlpci->pdev, | 478 | pci_unmap_single(rtlpci->pdev, |
479 | le32_to_cpu(rtlpriv->cfg->ops-> | 479 | rtlpriv->cfg->ops-> |
480 | get_desc((u8 *) entry, true, | 480 | get_desc((u8 *) entry, true, |
481 | HW_DESC_TXBUFF_ADDR)), | 481 | HW_DESC_TXBUFF_ADDR), |
482 | skb->len, PCI_DMA_TODEVICE); | 482 | skb->len, PCI_DMA_TODEVICE); |
483 | 483 | ||
484 | RT_TRACE(rtlpriv, (COMP_INTR | COMP_SEND), DBG_TRACE, | 484 | RT_TRACE(rtlpriv, (COMP_INTR | COMP_SEND), DBG_TRACE, |
@@ -557,7 +557,7 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw) | |||
557 | return; | 557 | return; |
558 | } else { | 558 | } else { |
559 | struct ieee80211_hdr *hdr; | 559 | struct ieee80211_hdr *hdr; |
560 | u16 fc; | 560 | __le16 fc; |
561 | struct sk_buff *new_skb = NULL; | 561 | struct sk_buff *new_skb = NULL; |
562 | 562 | ||
563 | rtlpriv->cfg->ops->query_rx_desc(hw, &stats, | 563 | rtlpriv->cfg->ops->query_rx_desc(hw, &stats, |
@@ -583,7 +583,7 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw) | |||
583 | */ | 583 | */ |
584 | 584 | ||
585 | hdr = (struct ieee80211_hdr *)(skb->data); | 585 | hdr = (struct ieee80211_hdr *)(skb->data); |
586 | fc = le16_to_cpu(hdr->frame_control); | 586 | fc = hdr->frame_control; |
587 | 587 | ||
588 | if (!stats.crc) { | 588 | if (!stats.crc) { |
589 | memcpy(IEEE80211_SKB_RXCB(skb), &rx_status, | 589 | memcpy(IEEE80211_SKB_RXCB(skb), &rx_status, |
@@ -666,7 +666,7 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw) | |||
666 | 666 | ||
667 | } | 667 | } |
668 | done: | 668 | done: |
669 | bufferaddress = cpu_to_le32(*((dma_addr_t *) skb->cb)); | 669 | bufferaddress = (u32)(*((dma_addr_t *) skb->cb)); |
670 | tmp_one = 1; | 670 | tmp_one = 1; |
671 | rtlpriv->cfg->ops->set_desc((u8 *) pdesc, false, | 671 | rtlpriv->cfg->ops->set_desc((u8 *) pdesc, false, |
672 | HW_DESC_RXBUFF_ADDR, | 672 | HW_DESC_RXBUFF_ADDR, |
@@ -955,9 +955,8 @@ static int _rtl_pci_init_tx_ring(struct ieee80211_hw *hw, | |||
955 | ("queue:%d, ring_addr:%p\n", prio, ring)); | 955 | ("queue:%d, ring_addr:%p\n", prio, ring)); |
956 | 956 | ||
957 | for (i = 0; i < entries; i++) { | 957 | for (i = 0; i < entries; i++) { |
958 | nextdescaddress = cpu_to_le32((u32) dma + | 958 | nextdescaddress = (u32) dma + ((i + 1) % entries) * |
959 | ((i + 1) % entries) * | 959 | sizeof(*ring); |
960 | sizeof(*ring)); | ||
961 | 960 | ||
962 | rtlpriv->cfg->ops->set_desc((u8 *)&(ring[i]), | 961 | rtlpriv->cfg->ops->set_desc((u8 *)&(ring[i]), |
963 | true, HW_DESC_TX_NEXTDESC_ADDR, | 962 | true, HW_DESC_TX_NEXTDESC_ADDR, |
@@ -1021,7 +1020,7 @@ static int _rtl_pci_init_rx_ring(struct ieee80211_hw *hw) | |||
1021 | rtlpci->rxbuffersize, | 1020 | rtlpci->rxbuffersize, |
1022 | PCI_DMA_FROMDEVICE); | 1021 | PCI_DMA_FROMDEVICE); |
1023 | 1022 | ||
1024 | bufferaddress = cpu_to_le32(*((dma_addr_t *)skb->cb)); | 1023 | bufferaddress = (u32)(*((dma_addr_t *)skb->cb)); |
1025 | rtlpriv->cfg->ops->set_desc((u8 *)entry, false, | 1024 | rtlpriv->cfg->ops->set_desc((u8 *)entry, false, |
1026 | HW_DESC_RXBUFF_ADDR, | 1025 | HW_DESC_RXBUFF_ADDR, |
1027 | (u8 *)&bufferaddress); | 1026 | (u8 *)&bufferaddress); |
@@ -1052,9 +1051,9 @@ static void _rtl_pci_free_tx_ring(struct ieee80211_hw *hw, | |||
1052 | struct sk_buff *skb = __skb_dequeue(&ring->queue); | 1051 | struct sk_buff *skb = __skb_dequeue(&ring->queue); |
1053 | 1052 | ||
1054 | pci_unmap_single(rtlpci->pdev, | 1053 | pci_unmap_single(rtlpci->pdev, |
1055 | le32_to_cpu(rtlpriv->cfg-> | 1054 | rtlpriv->cfg-> |
1056 | ops->get_desc((u8 *) entry, true, | 1055 | ops->get_desc((u8 *) entry, true, |
1057 | HW_DESC_TXBUFF_ADDR)), | 1056 | HW_DESC_TXBUFF_ADDR), |
1058 | skb->len, PCI_DMA_TODEVICE); | 1057 | skb->len, PCI_DMA_TODEVICE); |
1059 | kfree_skb(skb); | 1058 | kfree_skb(skb); |
1060 | ring->idx = (ring->idx + 1) % ring->entries; | 1059 | ring->idx = (ring->idx + 1) % ring->entries; |
@@ -1186,11 +1185,11 @@ int rtl_pci_reset_trx_ring(struct ieee80211_hw *hw) | |||
1186 | __skb_dequeue(&ring->queue); | 1185 | __skb_dequeue(&ring->queue); |
1187 | 1186 | ||
1188 | pci_unmap_single(rtlpci->pdev, | 1187 | pci_unmap_single(rtlpci->pdev, |
1189 | le32_to_cpu(rtlpriv->cfg->ops-> | 1188 | rtlpriv->cfg->ops-> |
1190 | get_desc((u8 *) | 1189 | get_desc((u8 *) |
1191 | entry, | 1190 | entry, |
1192 | true, | 1191 | true, |
1193 | HW_DESC_TXBUFF_ADDR)), | 1192 | HW_DESC_TXBUFF_ADDR), |
1194 | skb->len, PCI_DMA_TODEVICE); | 1193 | skb->len, PCI_DMA_TODEVICE); |
1195 | kfree_skb(skb); | 1194 | kfree_skb(skb); |
1196 | ring->idx = (ring->idx + 1) % ring->entries; | 1195 | ring->idx = (ring->idx + 1) % ring->entries; |
@@ -1204,7 +1203,7 @@ int rtl_pci_reset_trx_ring(struct ieee80211_hw *hw) | |||
1204 | return 0; | 1203 | return 0; |
1205 | } | 1204 | } |
1206 | 1205 | ||
1207 | static unsigned int _rtl_mac_to_hwqueue(u16 fc, | 1206 | static unsigned int _rtl_mac_to_hwqueue(__le16 fc, |
1208 | unsigned int mac80211_queue_index) | 1207 | unsigned int mac80211_queue_index) |
1209 | { | 1208 | { |
1210 | unsigned int hw_queue_index; | 1209 | unsigned int hw_queue_index; |
@@ -1254,7 +1253,7 @@ static int rtl_pci_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | |||
1254 | unsigned int queue_index, hw_queue; | 1253 | unsigned int queue_index, hw_queue; |
1255 | unsigned long flags; | 1254 | unsigned long flags; |
1256 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)(skb->data); | 1255 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)(skb->data); |
1257 | u16 fc = le16_to_cpu(hdr->frame_control); | 1256 | __le16 fc = hdr->frame_control; |
1258 | u8 *pda_addr = hdr->addr1; | 1257 | u8 *pda_addr = hdr->addr1; |
1259 | struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); | 1258 | struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); |
1260 | /*ssn */ | 1259 | /*ssn */ |