diff options
author | Larry Finger <Larry.Finger@lwfinger.net> | 2011-05-22 21:57:03 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-06-01 15:12:30 -0400 |
commit | 0541ac4cb47a31f44bf841a4dade539395c146ee (patch) | |
tree | 1c3727fa0103e9faab8a7adcfe8120a3b54e568c /drivers/net/wireless/b43legacy/dma.c | |
parent | 78d57372cc781c69a97700cac1f181ec42433fca (diff) |
b43legacy: Fix warnings from gcc 4.6.0
gcc 4.6.0 warnings for b43legacy:
CC [M] drivers/net/wireless/b43legacy/main.o
drivers/net/wireless/b43legacy/main.c: In function ‘b43legacy_request_firmware’:
drivers/net/wireless/b43legacy/main.c:1567:6: warning: variable ‘tmshigh’ set but not used [-Wunused-but-set-variable]
drivers/net/wireless/b43legacy/main.c: In function ‘b43legacy_op_dev_config’:
drivers/net/wireless/b43legacy/main.c:2637:6: warning: variable ‘antenna_rx’ set but not used [-Wunused-but-set-variable]
drivers/net/wireless/b43legacy/main.c: In function ‘b43legacy_op_bss_info_changed’:
drivers/net/wireless/b43legacy/main.c:2778:24: warning: variable ‘phy’ set but not used [-Wunused-but-set-variable]
drivers/net/wireless/b43legacy/xmit.c: In function ‘generate_txhdr_fw3’:
drivers/net/wireless/b43legacy/xmit.c:324:7: warning: variable ‘rts_rate_ofdm’ set but not used [-Wunused-but-set-variable]
CC [M] drivers/net/wireless/b43legacy/dma.o
drivers/net/wireless/b43legacy/dma.c: In function ‘free_all_descbuffers’:
drivers/net/wireless/b43legacy/dma.c:820:36: warning: variable ‘desc’ set but not used [-Wunused-but-set-variable]
drivers/net/wireless/b43legacy/dma.c: In function ‘b43legacy_dma_tx’:
drivers/net/wireless/b43legacy/dma.c:1377:28: warning: variable ‘info’ set but not used [-Wunused-but-set-variable]
drivers/net/wireless/b43legacy/dma.c:1374:24: warning: variable ‘hdr’ set but not used [-Wunused-but-set-variable]
drivers/net/wireless/b43legacy/dma.c: In function ‘b43legacy_dma_handle_txstatus’:
drivers/net/wireless/b43legacy/dma.c:1438:36: warning: variable ‘desc’ set but not used [-Wunused-but-set-variable]
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/b43legacy/dma.c')
-rw-r--r-- | drivers/net/wireless/b43legacy/dma.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/wireless/b43legacy/dma.c b/drivers/net/wireless/b43legacy/dma.c index e03e01d0bc35..c33934ad6cd2 100644 --- a/drivers/net/wireless/b43legacy/dma.c +++ b/drivers/net/wireless/b43legacy/dma.c | |||
@@ -817,14 +817,13 @@ static void dmacontroller_cleanup(struct b43legacy_dmaring *ring) | |||
817 | 817 | ||
818 | static void free_all_descbuffers(struct b43legacy_dmaring *ring) | 818 | static void free_all_descbuffers(struct b43legacy_dmaring *ring) |
819 | { | 819 | { |
820 | struct b43legacy_dmadesc_generic *desc; | ||
821 | struct b43legacy_dmadesc_meta *meta; | 820 | struct b43legacy_dmadesc_meta *meta; |
822 | int i; | 821 | int i; |
823 | 822 | ||
824 | if (!ring->used_slots) | 823 | if (!ring->used_slots) |
825 | return; | 824 | return; |
826 | for (i = 0; i < ring->nr_slots; i++) { | 825 | for (i = 0; i < ring->nr_slots; i++) { |
827 | desc = ring->ops->idx2desc(ring, i, &meta); | 826 | ring->ops->idx2desc(ring, i, &meta); |
828 | 827 | ||
829 | if (!meta->skb) { | 828 | if (!meta->skb) { |
830 | B43legacy_WARN_ON(!ring->tx); | 829 | B43legacy_WARN_ON(!ring->tx); |
@@ -1371,10 +1370,8 @@ int b43legacy_dma_tx(struct b43legacy_wldev *dev, | |||
1371 | struct sk_buff *skb) | 1370 | struct sk_buff *skb) |
1372 | { | 1371 | { |
1373 | struct b43legacy_dmaring *ring; | 1372 | struct b43legacy_dmaring *ring; |
1374 | struct ieee80211_hdr *hdr; | ||
1375 | int err = 0; | 1373 | int err = 0; |
1376 | unsigned long flags; | 1374 | unsigned long flags; |
1377 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); | ||
1378 | 1375 | ||
1379 | ring = priority_to_txring(dev, skb_get_queue_mapping(skb)); | 1376 | ring = priority_to_txring(dev, skb_get_queue_mapping(skb)); |
1380 | spin_lock_irqsave(&ring->lock, flags); | 1377 | spin_lock_irqsave(&ring->lock, flags); |
@@ -1401,8 +1398,6 @@ int b43legacy_dma_tx(struct b43legacy_wldev *dev, | |||
1401 | 1398 | ||
1402 | /* dma_tx_fragment might reallocate the skb, so invalidate pointers pointing | 1399 | /* dma_tx_fragment might reallocate the skb, so invalidate pointers pointing |
1403 | * into the skb data or cb now. */ | 1400 | * into the skb data or cb now. */ |
1404 | hdr = NULL; | ||
1405 | info = NULL; | ||
1406 | err = dma_tx_fragment(ring, &skb); | 1401 | err = dma_tx_fragment(ring, &skb); |
1407 | if (unlikely(err == -ENOKEY)) { | 1402 | if (unlikely(err == -ENOKEY)) { |
1408 | /* Drop this packet, as we don't have the encryption key | 1403 | /* Drop this packet, as we don't have the encryption key |
@@ -1435,7 +1430,6 @@ void b43legacy_dma_handle_txstatus(struct b43legacy_wldev *dev, | |||
1435 | { | 1430 | { |
1436 | const struct b43legacy_dma_ops *ops; | 1431 | const struct b43legacy_dma_ops *ops; |
1437 | struct b43legacy_dmaring *ring; | 1432 | struct b43legacy_dmaring *ring; |
1438 | struct b43legacy_dmadesc_generic *desc; | ||
1439 | struct b43legacy_dmadesc_meta *meta; | 1433 | struct b43legacy_dmadesc_meta *meta; |
1440 | int retry_limit; | 1434 | int retry_limit; |
1441 | int slot; | 1435 | int slot; |
@@ -1450,7 +1444,7 @@ void b43legacy_dma_handle_txstatus(struct b43legacy_wldev *dev, | |||
1450 | ops = ring->ops; | 1444 | ops = ring->ops; |
1451 | while (1) { | 1445 | while (1) { |
1452 | B43legacy_WARN_ON(!(slot >= 0 && slot < ring->nr_slots)); | 1446 | B43legacy_WARN_ON(!(slot >= 0 && slot < ring->nr_slots)); |
1453 | desc = ops->idx2desc(ring, slot, &meta); | 1447 | ops->idx2desc(ring, slot, &meta); |
1454 | 1448 | ||
1455 | if (meta->skb) | 1449 | if (meta->skb) |
1456 | unmap_descbuffer(ring, meta->dmaaddr, | 1450 | unmap_descbuffer(ring, meta->dmaaddr, |