diff options
Diffstat (limited to 'drivers/net/wireless/b43')
-rw-r--r-- | drivers/net/wireless/b43/dma.c | 14 | ||||
-rw-r--r-- | drivers/net/wireless/b43/leds.c | 16 | ||||
-rw-r--r-- | drivers/net/wireless/b43/lo.c | 8 | ||||
-rw-r--r-- | drivers/net/wireless/b43/main.c | 100 | ||||
-rw-r--r-- | drivers/net/wireless/b43/phy_common.c | 8 | ||||
-rw-r--r-- | drivers/net/wireless/b43/phy_g.c | 34 | ||||
-rw-r--r-- | drivers/net/wireless/b43/phy_lp.c | 8 | ||||
-rw-r--r-- | drivers/net/wireless/b43/phy_n.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/b43/pio.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/b43/xmit.c | 4 |
10 files changed, 101 insertions, 101 deletions
diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c index 5e45604f0f5d..af23968520b6 100644 --- a/drivers/net/wireless/b43/dma.c +++ b/drivers/net/wireless/b43/dma.c | |||
@@ -890,7 +890,7 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev, | |||
890 | else | 890 | else |
891 | ring->ops = &dma32_ops; | 891 | ring->ops = &dma32_ops; |
892 | if (for_tx) { | 892 | if (for_tx) { |
893 | ring->tx = 1; | 893 | ring->tx = true; |
894 | ring->current_slot = -1; | 894 | ring->current_slot = -1; |
895 | } else { | 895 | } else { |
896 | if (ring->index == 0) { | 896 | if (ring->index == 0) { |
@@ -1061,7 +1061,7 @@ void b43_dma_free(struct b43_wldev *dev) | |||
1061 | static int b43_dma_set_mask(struct b43_wldev *dev, u64 mask) | 1061 | static int b43_dma_set_mask(struct b43_wldev *dev, u64 mask) |
1062 | { | 1062 | { |
1063 | u64 orig_mask = mask; | 1063 | u64 orig_mask = mask; |
1064 | bool fallback = 0; | 1064 | bool fallback = false; |
1065 | int err; | 1065 | int err; |
1066 | 1066 | ||
1067 | /* Try to set the DMA mask. If it fails, try falling back to a | 1067 | /* Try to set the DMA mask. If it fails, try falling back to a |
@@ -1075,12 +1075,12 @@ static int b43_dma_set_mask(struct b43_wldev *dev, u64 mask) | |||
1075 | } | 1075 | } |
1076 | if (mask == DMA_BIT_MASK(64)) { | 1076 | if (mask == DMA_BIT_MASK(64)) { |
1077 | mask = DMA_BIT_MASK(32); | 1077 | mask = DMA_BIT_MASK(32); |
1078 | fallback = 1; | 1078 | fallback = true; |
1079 | continue; | 1079 | continue; |
1080 | } | 1080 | } |
1081 | if (mask == DMA_BIT_MASK(32)) { | 1081 | if (mask == DMA_BIT_MASK(32)) { |
1082 | mask = DMA_BIT_MASK(30); | 1082 | mask = DMA_BIT_MASK(30); |
1083 | fallback = 1; | 1083 | fallback = true; |
1084 | continue; | 1084 | continue; |
1085 | } | 1085 | } |
1086 | b43err(dev->wl, "The machine/kernel does not support " | 1086 | b43err(dev->wl, "The machine/kernel does not support " |
@@ -1307,7 +1307,7 @@ static int dma_tx_fragment(struct b43_dmaring *ring, | |||
1307 | memset(meta, 0, sizeof(*meta)); | 1307 | memset(meta, 0, sizeof(*meta)); |
1308 | 1308 | ||
1309 | meta->skb = skb; | 1309 | meta->skb = skb; |
1310 | meta->is_last_fragment = 1; | 1310 | meta->is_last_fragment = true; |
1311 | priv_info->bouncebuffer = NULL; | 1311 | priv_info->bouncebuffer = NULL; |
1312 | 1312 | ||
1313 | meta->dmaaddr = map_descbuffer(ring, skb->data, skb->len, 1); | 1313 | meta->dmaaddr = map_descbuffer(ring, skb->data, skb->len, 1); |
@@ -1466,7 +1466,7 @@ int b43_dma_tx(struct b43_wldev *dev, struct sk_buff *skb) | |||
1466 | should_inject_overflow(ring)) { | 1466 | should_inject_overflow(ring)) { |
1467 | /* This TX ring is full. */ | 1467 | /* This TX ring is full. */ |
1468 | ieee80211_stop_queue(dev->wl->hw, skb_get_queue_mapping(skb)); | 1468 | ieee80211_stop_queue(dev->wl->hw, skb_get_queue_mapping(skb)); |
1469 | ring->stopped = 1; | 1469 | ring->stopped = true; |
1470 | if (b43_debug(dev, B43_DBG_DMAVERBOSE)) { | 1470 | if (b43_debug(dev, B43_DBG_DMAVERBOSE)) { |
1471 | b43dbg(dev->wl, "Stopped TX ring %d\n", ring->index); | 1471 | b43dbg(dev->wl, "Stopped TX ring %d\n", ring->index); |
1472 | } | 1472 | } |
@@ -1585,7 +1585,7 @@ void b43_dma_handle_txstatus(struct b43_wldev *dev, | |||
1585 | if (ring->stopped) { | 1585 | if (ring->stopped) { |
1586 | B43_WARN_ON(free_slots(ring) < TX_SLOTS_PER_FRAME); | 1586 | B43_WARN_ON(free_slots(ring) < TX_SLOTS_PER_FRAME); |
1587 | ieee80211_wake_queue(dev->wl->hw, ring->queue_prio); | 1587 | ieee80211_wake_queue(dev->wl->hw, ring->queue_prio); |
1588 | ring->stopped = 0; | 1588 | ring->stopped = false; |
1589 | if (b43_debug(dev, B43_DBG_DMAVERBOSE)) { | 1589 | if (b43_debug(dev, B43_DBG_DMAVERBOSE)) { |
1590 | b43dbg(dev->wl, "Woke up TX ring %d\n", ring->index); | 1590 | b43dbg(dev->wl, "Woke up TX ring %d\n", ring->index); |
1591 | } | 1591 | } |
diff --git a/drivers/net/wireless/b43/leds.c b/drivers/net/wireless/b43/leds.c index a38c1c6446ad..d79ab2a227e1 100644 --- a/drivers/net/wireless/b43/leds.c +++ b/drivers/net/wireless/b43/leds.c | |||
@@ -74,7 +74,7 @@ static void b43_led_update(struct b43_wldev *dev, | |||
74 | if (radio_enabled) | 74 | if (radio_enabled) |
75 | turn_on = atomic_read(&led->state) != LED_OFF; | 75 | turn_on = atomic_read(&led->state) != LED_OFF; |
76 | else | 76 | else |
77 | turn_on = 0; | 77 | turn_on = false; |
78 | if (turn_on == led->hw_state) | 78 | if (turn_on == led->hw_state) |
79 | return; | 79 | return; |
80 | led->hw_state = turn_on; | 80 | led->hw_state = turn_on; |
@@ -225,11 +225,11 @@ static void b43_led_get_sprominfo(struct b43_wldev *dev, | |||
225 | if (sprom[led_index] == 0xFF) { | 225 | if (sprom[led_index] == 0xFF) { |
226 | /* There is no LED information in the SPROM | 226 | /* There is no LED information in the SPROM |
227 | * for this LED. Hardcode it here. */ | 227 | * for this LED. Hardcode it here. */ |
228 | *activelow = 0; | 228 | *activelow = false; |
229 | switch (led_index) { | 229 | switch (led_index) { |
230 | case 0: | 230 | case 0: |
231 | *behaviour = B43_LED_ACTIVITY; | 231 | *behaviour = B43_LED_ACTIVITY; |
232 | *activelow = 1; | 232 | *activelow = true; |
233 | if (dev->dev->board_vendor == PCI_VENDOR_ID_COMPAQ) | 233 | if (dev->dev->board_vendor == PCI_VENDOR_ID_COMPAQ) |
234 | *behaviour = B43_LED_RADIO_ALL; | 234 | *behaviour = B43_LED_RADIO_ALL; |
235 | break; | 235 | break; |
@@ -267,11 +267,11 @@ void b43_leds_init(struct b43_wldev *dev) | |||
267 | if (led->wl) { | 267 | if (led->wl) { |
268 | if (dev->phy.radio_on && b43_is_hw_radio_enabled(dev)) { | 268 | if (dev->phy.radio_on && b43_is_hw_radio_enabled(dev)) { |
269 | b43_led_turn_on(dev, led->index, led->activelow); | 269 | b43_led_turn_on(dev, led->index, led->activelow); |
270 | led->hw_state = 1; | 270 | led->hw_state = true; |
271 | atomic_set(&led->state, 1); | 271 | atomic_set(&led->state, 1); |
272 | } else { | 272 | } else { |
273 | b43_led_turn_off(dev, led->index, led->activelow); | 273 | b43_led_turn_off(dev, led->index, led->activelow); |
274 | led->hw_state = 0; | 274 | led->hw_state = false; |
275 | atomic_set(&led->state, 0); | 275 | atomic_set(&led->state, 0); |
276 | } | 276 | } |
277 | } | 277 | } |
@@ -280,19 +280,19 @@ void b43_leds_init(struct b43_wldev *dev) | |||
280 | led = &dev->wl->leds.led_tx; | 280 | led = &dev->wl->leds.led_tx; |
281 | if (led->wl) { | 281 | if (led->wl) { |
282 | b43_led_turn_off(dev, led->index, led->activelow); | 282 | b43_led_turn_off(dev, led->index, led->activelow); |
283 | led->hw_state = 0; | 283 | led->hw_state = false; |
284 | atomic_set(&led->state, 0); | 284 | atomic_set(&led->state, 0); |
285 | } | 285 | } |
286 | led = &dev->wl->leds.led_rx; | 286 | led = &dev->wl->leds.led_rx; |
287 | if (led->wl) { | 287 | if (led->wl) { |
288 | b43_led_turn_off(dev, led->index, led->activelow); | 288 | b43_led_turn_off(dev, led->index, led->activelow); |
289 | led->hw_state = 0; | 289 | led->hw_state = false; |
290 | atomic_set(&led->state, 0); | 290 | atomic_set(&led->state, 0); |
291 | } | 291 | } |
292 | led = &dev->wl->leds.led_assoc; | 292 | led = &dev->wl->leds.led_assoc; |
293 | if (led->wl) { | 293 | if (led->wl) { |
294 | b43_led_turn_off(dev, led->index, led->activelow); | 294 | b43_led_turn_off(dev, led->index, led->activelow); |
295 | led->hw_state = 0; | 295 | led->hw_state = false; |
296 | atomic_set(&led->state, 0); | 296 | atomic_set(&led->state, 0); |
297 | } | 297 | } |
298 | 298 | ||
diff --git a/drivers/net/wireless/b43/lo.c b/drivers/net/wireless/b43/lo.c index 4c82d582a524..916123a3d74e 100644 --- a/drivers/net/wireless/b43/lo.c +++ b/drivers/net/wireless/b43/lo.c | |||
@@ -826,7 +826,7 @@ void b43_gphy_dc_lt_init(struct b43_wldev *dev, bool update_all) | |||
826 | const struct b43_rfatt *rfatt; | 826 | const struct b43_rfatt *rfatt; |
827 | const struct b43_bbatt *bbatt; | 827 | const struct b43_bbatt *bbatt; |
828 | u64 power_vector; | 828 | u64 power_vector; |
829 | bool table_changed = 0; | 829 | bool table_changed = false; |
830 | 830 | ||
831 | BUILD_BUG_ON(B43_DC_LT_SIZE != 32); | 831 | BUILD_BUG_ON(B43_DC_LT_SIZE != 32); |
832 | B43_WARN_ON(lo->rfatt_list.len * lo->bbatt_list.len > 64); | 832 | B43_WARN_ON(lo->rfatt_list.len * lo->bbatt_list.len > 64); |
@@ -876,7 +876,7 @@ void b43_gphy_dc_lt_init(struct b43_wldev *dev, bool update_all) | |||
876 | lo->dc_lt[idx] = (lo->dc_lt[idx] & 0xFF00) | 876 | lo->dc_lt[idx] = (lo->dc_lt[idx] & 0xFF00) |
877 | | (val & 0x00FF); | 877 | | (val & 0x00FF); |
878 | } | 878 | } |
879 | table_changed = 1; | 879 | table_changed = true; |
880 | } | 880 | } |
881 | if (table_changed) { | 881 | if (table_changed) { |
882 | /* The table changed in memory. Update the hardware table. */ | 882 | /* The table changed in memory. Update the hardware table. */ |
@@ -938,7 +938,7 @@ void b43_lo_g_maintanance_work(struct b43_wldev *dev) | |||
938 | unsigned long now; | 938 | unsigned long now; |
939 | unsigned long expire; | 939 | unsigned long expire; |
940 | struct b43_lo_calib *cal, *tmp; | 940 | struct b43_lo_calib *cal, *tmp; |
941 | bool current_item_expired = 0; | 941 | bool current_item_expired = false; |
942 | bool hwpctl; | 942 | bool hwpctl; |
943 | 943 | ||
944 | if (!lo) | 944 | if (!lo) |
@@ -968,7 +968,7 @@ void b43_lo_g_maintanance_work(struct b43_wldev *dev) | |||
968 | if (b43_compare_bbatt(&cal->bbatt, &gphy->bbatt) && | 968 | if (b43_compare_bbatt(&cal->bbatt, &gphy->bbatt) && |
969 | b43_compare_rfatt(&cal->rfatt, &gphy->rfatt)) { | 969 | b43_compare_rfatt(&cal->rfatt, &gphy->rfatt)) { |
970 | B43_WARN_ON(current_item_expired); | 970 | B43_WARN_ON(current_item_expired); |
971 | current_item_expired = 1; | 971 | current_item_expired = true; |
972 | } | 972 | } |
973 | if (b43_debug(dev, B43_DBG_LO)) { | 973 | if (b43_debug(dev, B43_DBG_LO)) { |
974 | b43dbg(dev->wl, "LO: Item BB(%u), RF(%u,%u), " | 974 | b43dbg(dev->wl, "LO: Item BB(%u), RF(%u,%u), " |
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 5634d9a9965b..c74f36f6e348 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c | |||
@@ -1122,17 +1122,17 @@ void b43_power_saving_ctl_bits(struct b43_wldev *dev, unsigned int ps_flags) | |||
1122 | B43_WARN_ON((ps_flags & B43_PS_AWAKE) && (ps_flags & B43_PS_ASLEEP)); | 1122 | B43_WARN_ON((ps_flags & B43_PS_AWAKE) && (ps_flags & B43_PS_ASLEEP)); |
1123 | 1123 | ||
1124 | if (ps_flags & B43_PS_ENABLED) { | 1124 | if (ps_flags & B43_PS_ENABLED) { |
1125 | hwps = 1; | 1125 | hwps = true; |
1126 | } else if (ps_flags & B43_PS_DISABLED) { | 1126 | } else if (ps_flags & B43_PS_DISABLED) { |
1127 | hwps = 0; | 1127 | hwps = false; |
1128 | } else { | 1128 | } else { |
1129 | //TODO: If powersave is not off and FIXME is not set and we are not in adhoc | 1129 | //TODO: If powersave is not off and FIXME is not set and we are not in adhoc |
1130 | // and thus is not an AP and we are associated, set bit 25 | 1130 | // and thus is not an AP and we are associated, set bit 25 |
1131 | } | 1131 | } |
1132 | if (ps_flags & B43_PS_AWAKE) { | 1132 | if (ps_flags & B43_PS_AWAKE) { |
1133 | awake = 1; | 1133 | awake = true; |
1134 | } else if (ps_flags & B43_PS_ASLEEP) { | 1134 | } else if (ps_flags & B43_PS_ASLEEP) { |
1135 | awake = 0; | 1135 | awake = false; |
1136 | } else { | 1136 | } else { |
1137 | //TODO: If the device is awake or this is an AP, or we are scanning, or FIXME, | 1137 | //TODO: If the device is awake or this is an AP, or we are scanning, or FIXME, |
1138 | // or we are associated, or FIXME, or the latest PS-Poll packet sent was | 1138 | // or we are associated, or FIXME, or the latest PS-Poll packet sent was |
@@ -1140,8 +1140,8 @@ void b43_power_saving_ctl_bits(struct b43_wldev *dev, unsigned int ps_flags) | |||
1140 | } | 1140 | } |
1141 | 1141 | ||
1142 | /* FIXME: For now we force awake-on and hwps-off */ | 1142 | /* FIXME: For now we force awake-on and hwps-off */ |
1143 | hwps = 0; | 1143 | hwps = false; |
1144 | awake = 1; | 1144 | awake = true; |
1145 | 1145 | ||
1146 | macctl = b43_read32(dev, B43_MMIO_MACCTL); | 1146 | macctl = b43_read32(dev, B43_MMIO_MACCTL); |
1147 | if (hwps) | 1147 | if (hwps) |
@@ -1339,7 +1339,7 @@ static void b43_calculate_link_quality(struct b43_wldev *dev) | |||
1339 | return; | 1339 | return; |
1340 | if (dev->noisecalc.calculation_running) | 1340 | if (dev->noisecalc.calculation_running) |
1341 | return; | 1341 | return; |
1342 | dev->noisecalc.calculation_running = 1; | 1342 | dev->noisecalc.calculation_running = true; |
1343 | dev->noisecalc.nr_samples = 0; | 1343 | dev->noisecalc.nr_samples = 0; |
1344 | 1344 | ||
1345 | b43_generate_noise_sample(dev); | 1345 | b43_generate_noise_sample(dev); |
@@ -1408,7 +1408,7 @@ static void handle_irq_noise(struct b43_wldev *dev) | |||
1408 | average -= 48; | 1408 | average -= 48; |
1409 | 1409 | ||
1410 | dev->stats.link_noise = average; | 1410 | dev->stats.link_noise = average; |
1411 | dev->noisecalc.calculation_running = 0; | 1411 | dev->noisecalc.calculation_running = false; |
1412 | return; | 1412 | return; |
1413 | } | 1413 | } |
1414 | generate_new: | 1414 | generate_new: |
@@ -1424,7 +1424,7 @@ static void handle_irq_tbtt_indication(struct b43_wldev *dev) | |||
1424 | b43_power_saving_ctl_bits(dev, 0); | 1424 | b43_power_saving_ctl_bits(dev, 0); |
1425 | } | 1425 | } |
1426 | if (b43_is_mode(dev->wl, NL80211_IFTYPE_ADHOC)) | 1426 | if (b43_is_mode(dev->wl, NL80211_IFTYPE_ADHOC)) |
1427 | dev->dfq_valid = 1; | 1427 | dev->dfq_valid = true; |
1428 | } | 1428 | } |
1429 | 1429 | ||
1430 | static void handle_irq_atim_end(struct b43_wldev *dev) | 1430 | static void handle_irq_atim_end(struct b43_wldev *dev) |
@@ -1433,7 +1433,7 @@ static void handle_irq_atim_end(struct b43_wldev *dev) | |||
1433 | b43_write32(dev, B43_MMIO_MACCMD, | 1433 | b43_write32(dev, B43_MMIO_MACCMD, |
1434 | b43_read32(dev, B43_MMIO_MACCMD) | 1434 | b43_read32(dev, B43_MMIO_MACCMD) |
1435 | | B43_MACCMD_DFQ_VALID); | 1435 | | B43_MACCMD_DFQ_VALID); |
1436 | dev->dfq_valid = 0; | 1436 | dev->dfq_valid = false; |
1437 | } | 1437 | } |
1438 | } | 1438 | } |
1439 | 1439 | ||
@@ -1539,7 +1539,7 @@ static void b43_write_beacon_template(struct b43_wldev *dev, | |||
1539 | unsigned int i, len, variable_len; | 1539 | unsigned int i, len, variable_len; |
1540 | const struct ieee80211_mgmt *bcn; | 1540 | const struct ieee80211_mgmt *bcn; |
1541 | const u8 *ie; | 1541 | const u8 *ie; |
1542 | bool tim_found = 0; | 1542 | bool tim_found = false; |
1543 | unsigned int rate; | 1543 | unsigned int rate; |
1544 | u16 ctl; | 1544 | u16 ctl; |
1545 | int antenna; | 1545 | int antenna; |
@@ -1588,7 +1588,7 @@ static void b43_write_beacon_template(struct b43_wldev *dev, | |||
1588 | /* A valid TIM is at least 4 bytes long. */ | 1588 | /* A valid TIM is at least 4 bytes long. */ |
1589 | if (ie_len < 4) | 1589 | if (ie_len < 4) |
1590 | break; | 1590 | break; |
1591 | tim_found = 1; | 1591 | tim_found = true; |
1592 | 1592 | ||
1593 | tim_position = sizeof(struct b43_plcp_hdr6); | 1593 | tim_position = sizeof(struct b43_plcp_hdr6); |
1594 | tim_position += offsetof(struct ieee80211_mgmt, u.beacon.variable); | 1594 | tim_position += offsetof(struct ieee80211_mgmt, u.beacon.variable); |
@@ -1625,7 +1625,7 @@ static void b43_upload_beacon0(struct b43_wldev *dev) | |||
1625 | if (wl->beacon0_uploaded) | 1625 | if (wl->beacon0_uploaded) |
1626 | return; | 1626 | return; |
1627 | b43_write_beacon_template(dev, 0x68, 0x18); | 1627 | b43_write_beacon_template(dev, 0x68, 0x18); |
1628 | wl->beacon0_uploaded = 1; | 1628 | wl->beacon0_uploaded = true; |
1629 | } | 1629 | } |
1630 | 1630 | ||
1631 | static void b43_upload_beacon1(struct b43_wldev *dev) | 1631 | static void b43_upload_beacon1(struct b43_wldev *dev) |
@@ -1635,7 +1635,7 @@ static void b43_upload_beacon1(struct b43_wldev *dev) | |||
1635 | if (wl->beacon1_uploaded) | 1635 | if (wl->beacon1_uploaded) |
1636 | return; | 1636 | return; |
1637 | b43_write_beacon_template(dev, 0x468, 0x1A); | 1637 | b43_write_beacon_template(dev, 0x468, 0x1A); |
1638 | wl->beacon1_uploaded = 1; | 1638 | wl->beacon1_uploaded = true; |
1639 | } | 1639 | } |
1640 | 1640 | ||
1641 | static void handle_irq_beacon(struct b43_wldev *dev) | 1641 | static void handle_irq_beacon(struct b43_wldev *dev) |
@@ -1667,7 +1667,7 @@ static void handle_irq_beacon(struct b43_wldev *dev) | |||
1667 | if (unlikely(wl->beacon_templates_virgin)) { | 1667 | if (unlikely(wl->beacon_templates_virgin)) { |
1668 | /* We never uploaded a beacon before. | 1668 | /* We never uploaded a beacon before. |
1669 | * Upload both templates now, but only mark one valid. */ | 1669 | * Upload both templates now, but only mark one valid. */ |
1670 | wl->beacon_templates_virgin = 0; | 1670 | wl->beacon_templates_virgin = false; |
1671 | b43_upload_beacon0(dev); | 1671 | b43_upload_beacon0(dev); |
1672 | b43_upload_beacon1(dev); | 1672 | b43_upload_beacon1(dev); |
1673 | cmd = b43_read32(dev, B43_MMIO_MACCMD); | 1673 | cmd = b43_read32(dev, B43_MMIO_MACCMD); |
@@ -1755,8 +1755,8 @@ static void b43_update_templates(struct b43_wl *wl) | |||
1755 | if (wl->current_beacon) | 1755 | if (wl->current_beacon) |
1756 | dev_kfree_skb_any(wl->current_beacon); | 1756 | dev_kfree_skb_any(wl->current_beacon); |
1757 | wl->current_beacon = beacon; | 1757 | wl->current_beacon = beacon; |
1758 | wl->beacon0_uploaded = 0; | 1758 | wl->beacon0_uploaded = false; |
1759 | wl->beacon1_uploaded = 0; | 1759 | wl->beacon1_uploaded = false; |
1760 | ieee80211_queue_work(wl->hw, &wl->beacon_update_trigger); | 1760 | ieee80211_queue_work(wl->hw, &wl->beacon_update_trigger); |
1761 | } | 1761 | } |
1762 | 1762 | ||
@@ -1913,7 +1913,7 @@ static void b43_do_interrupt_thread(struct b43_wldev *dev) | |||
1913 | b43err(dev->wl, "This device does not support DMA " | 1913 | b43err(dev->wl, "This device does not support DMA " |
1914 | "on your system. It will now be switched to PIO.\n"); | 1914 | "on your system. It will now be switched to PIO.\n"); |
1915 | /* Fall back to PIO transfers if we get fatal DMA errors! */ | 1915 | /* Fall back to PIO transfers if we get fatal DMA errors! */ |
1916 | dev->use_pio = 1; | 1916 | dev->use_pio = true; |
1917 | b43_controller_restart(dev, "DMA error"); | 1917 | b43_controller_restart(dev, "DMA error"); |
1918 | return; | 1918 | return; |
1919 | } | 1919 | } |
@@ -2240,12 +2240,12 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx) | |||
2240 | filename = NULL; | 2240 | filename = NULL; |
2241 | else | 2241 | else |
2242 | goto err_no_pcm; | 2242 | goto err_no_pcm; |
2243 | fw->pcm_request_failed = 0; | 2243 | fw->pcm_request_failed = false; |
2244 | err = b43_do_request_fw(ctx, filename, &fw->pcm); | 2244 | err = b43_do_request_fw(ctx, filename, &fw->pcm); |
2245 | if (err == -ENOENT) { | 2245 | if (err == -ENOENT) { |
2246 | /* We did not find a PCM file? Not fatal, but | 2246 | /* We did not find a PCM file? Not fatal, but |
2247 | * core rev <= 10 must do without hwcrypto then. */ | 2247 | * core rev <= 10 must do without hwcrypto then. */ |
2248 | fw->pcm_request_failed = 1; | 2248 | fw->pcm_request_failed = true; |
2249 | } else if (err) | 2249 | } else if (err) |
2250 | goto err_load; | 2250 | goto err_load; |
2251 | 2251 | ||
@@ -2535,7 +2535,7 @@ static int b43_upload_microcode(struct b43_wldev *dev) | |||
2535 | dev->wl->hw->queues = dev->wl->mac80211_initially_registered_queues; | 2535 | dev->wl->hw->queues = dev->wl->mac80211_initially_registered_queues; |
2536 | dev->qos_enabled = !!modparam_qos; | 2536 | dev->qos_enabled = !!modparam_qos; |
2537 | /* Default to firmware/hardware crypto acceleration. */ | 2537 | /* Default to firmware/hardware crypto acceleration. */ |
2538 | dev->hwcrypto_enabled = 1; | 2538 | dev->hwcrypto_enabled = true; |
2539 | 2539 | ||
2540 | if (dev->fw.opensource) { | 2540 | if (dev->fw.opensource) { |
2541 | u16 fwcapa; | 2541 | u16 fwcapa; |
@@ -2549,7 +2549,7 @@ static int b43_upload_microcode(struct b43_wldev *dev) | |||
2549 | if (!(fwcapa & B43_FWCAPA_HWCRYPTO) || dev->fw.pcm_request_failed) { | 2549 | if (!(fwcapa & B43_FWCAPA_HWCRYPTO) || dev->fw.pcm_request_failed) { |
2550 | b43info(dev->wl, "Hardware crypto acceleration not supported by firmware\n"); | 2550 | b43info(dev->wl, "Hardware crypto acceleration not supported by firmware\n"); |
2551 | /* Disable hardware crypto and fall back to software crypto. */ | 2551 | /* Disable hardware crypto and fall back to software crypto. */ |
2552 | dev->hwcrypto_enabled = 0; | 2552 | dev->hwcrypto_enabled = false; |
2553 | } | 2553 | } |
2554 | if (!(fwcapa & B43_FWCAPA_QOS)) { | 2554 | if (!(fwcapa & B43_FWCAPA_QOS)) { |
2555 | b43info(dev->wl, "QoS not supported by firmware\n"); | 2555 | b43info(dev->wl, "QoS not supported by firmware\n"); |
@@ -2557,7 +2557,7 @@ static int b43_upload_microcode(struct b43_wldev *dev) | |||
2557 | * ieee80211_unregister to make sure the networking core can | 2557 | * ieee80211_unregister to make sure the networking core can |
2558 | * properly free possible resources. */ | 2558 | * properly free possible resources. */ |
2559 | dev->wl->hw->queues = 1; | 2559 | dev->wl->hw->queues = 1; |
2560 | dev->qos_enabled = 0; | 2560 | dev->qos_enabled = false; |
2561 | } | 2561 | } |
2562 | } else { | 2562 | } else { |
2563 | b43info(dev->wl, "Loading firmware version %u.%u " | 2563 | b43info(dev->wl, "Loading firmware version %u.%u " |
@@ -3361,10 +3361,10 @@ static int b43_rng_init(struct b43_wl *wl) | |||
3361 | wl->rng.name = wl->rng_name; | 3361 | wl->rng.name = wl->rng_name; |
3362 | wl->rng.data_read = b43_rng_read; | 3362 | wl->rng.data_read = b43_rng_read; |
3363 | wl->rng.priv = (unsigned long)wl; | 3363 | wl->rng.priv = (unsigned long)wl; |
3364 | wl->rng_initialized = 1; | 3364 | wl->rng_initialized = true; |
3365 | err = hwrng_register(&wl->rng); | 3365 | err = hwrng_register(&wl->rng); |
3366 | if (err) { | 3366 | if (err) { |
3367 | wl->rng_initialized = 0; | 3367 | wl->rng_initialized = false; |
3368 | b43err(wl, "Failed to register the random " | 3368 | b43err(wl, "Failed to register the random " |
3369 | "number generator (%d)\n", err); | 3369 | "number generator (%d)\n", err); |
3370 | } | 3370 | } |
@@ -3702,13 +3702,13 @@ static int b43_switch_band(struct b43_wl *wl, struct ieee80211_channel *chan) | |||
3702 | case IEEE80211_BAND_5GHZ: | 3702 | case IEEE80211_BAND_5GHZ: |
3703 | if (d->phy.supports_5ghz) { | 3703 | if (d->phy.supports_5ghz) { |
3704 | up_dev = d; | 3704 | up_dev = d; |
3705 | gmode = 0; | 3705 | gmode = false; |
3706 | } | 3706 | } |
3707 | break; | 3707 | break; |
3708 | case IEEE80211_BAND_2GHZ: | 3708 | case IEEE80211_BAND_2GHZ: |
3709 | if (d->phy.supports_2ghz) { | 3709 | if (d->phy.supports_2ghz) { |
3710 | up_dev = d; | 3710 | up_dev = d; |
3711 | gmode = 1; | 3711 | gmode = true; |
3712 | } | 3712 | } |
3713 | break; | 3713 | break; |
3714 | default: | 3714 | default: |
@@ -4425,18 +4425,18 @@ static void setup_struct_phy_for_init(struct b43_wldev *dev, | |||
4425 | atomic_set(&phy->txerr_cnt, B43_PHY_TX_BADNESS_LIMIT); | 4425 | atomic_set(&phy->txerr_cnt, B43_PHY_TX_BADNESS_LIMIT); |
4426 | 4426 | ||
4427 | #if B43_DEBUG | 4427 | #if B43_DEBUG |
4428 | phy->phy_locked = 0; | 4428 | phy->phy_locked = false; |
4429 | phy->radio_locked = 0; | 4429 | phy->radio_locked = false; |
4430 | #endif | 4430 | #endif |
4431 | } | 4431 | } |
4432 | 4432 | ||
4433 | static void setup_struct_wldev_for_init(struct b43_wldev *dev) | 4433 | static void setup_struct_wldev_for_init(struct b43_wldev *dev) |
4434 | { | 4434 | { |
4435 | dev->dfq_valid = 0; | 4435 | dev->dfq_valid = false; |
4436 | 4436 | ||
4437 | /* Assume the radio is enabled. If it's not enabled, the state will | 4437 | /* Assume the radio is enabled. If it's not enabled, the state will |
4438 | * immediately get fixed on the first periodic work run. */ | 4438 | * immediately get fixed on the first periodic work run. */ |
4439 | dev->radio_hw_enable = 1; | 4439 | dev->radio_hw_enable = true; |
4440 | 4440 | ||
4441 | /* Stats */ | 4441 | /* Stats */ |
4442 | memset(&dev->stats, 0, sizeof(dev->stats)); | 4442 | memset(&dev->stats, 0, sizeof(dev->stats)); |
@@ -4670,16 +4670,16 @@ static int b43_wireless_core_init(struct b43_wldev *dev) | |||
4670 | 4670 | ||
4671 | if (b43_bus_host_is_pcmcia(dev->dev) || | 4671 | if (b43_bus_host_is_pcmcia(dev->dev) || |
4672 | b43_bus_host_is_sdio(dev->dev)) { | 4672 | b43_bus_host_is_sdio(dev->dev)) { |
4673 | dev->__using_pio_transfers = 1; | 4673 | dev->__using_pio_transfers = true; |
4674 | err = b43_pio_init(dev); | 4674 | err = b43_pio_init(dev); |
4675 | } else if (dev->use_pio) { | 4675 | } else if (dev->use_pio) { |
4676 | b43warn(dev->wl, "Forced PIO by use_pio module parameter. " | 4676 | b43warn(dev->wl, "Forced PIO by use_pio module parameter. " |
4677 | "This should not be needed and will result in lower " | 4677 | "This should not be needed and will result in lower " |
4678 | "performance.\n"); | 4678 | "performance.\n"); |
4679 | dev->__using_pio_transfers = 1; | 4679 | dev->__using_pio_transfers = true; |
4680 | err = b43_pio_init(dev); | 4680 | err = b43_pio_init(dev); |
4681 | } else { | 4681 | } else { |
4682 | dev->__using_pio_transfers = 0; | 4682 | dev->__using_pio_transfers = false; |
4683 | err = b43_dma_init(dev); | 4683 | err = b43_dma_init(dev); |
4684 | } | 4684 | } |
4685 | if (err) | 4685 | if (err) |
@@ -4733,7 +4733,7 @@ static int b43_op_add_interface(struct ieee80211_hw *hw, | |||
4733 | b43dbg(wl, "Adding Interface type %d\n", vif->type); | 4733 | b43dbg(wl, "Adding Interface type %d\n", vif->type); |
4734 | 4734 | ||
4735 | dev = wl->current_dev; | 4735 | dev = wl->current_dev; |
4736 | wl->operating = 1; | 4736 | wl->operating = true; |
4737 | wl->vif = vif; | 4737 | wl->vif = vif; |
4738 | wl->if_type = vif->type; | 4738 | wl->if_type = vif->type; |
4739 | memcpy(wl->mac_addr, vif->addr, ETH_ALEN); | 4739 | memcpy(wl->mac_addr, vif->addr, ETH_ALEN); |
@@ -4767,7 +4767,7 @@ static void b43_op_remove_interface(struct ieee80211_hw *hw, | |||
4767 | B43_WARN_ON(wl->vif != vif); | 4767 | B43_WARN_ON(wl->vif != vif); |
4768 | wl->vif = NULL; | 4768 | wl->vif = NULL; |
4769 | 4769 | ||
4770 | wl->operating = 0; | 4770 | wl->operating = false; |
4771 | 4771 | ||
4772 | b43_adjust_opmode(dev); | 4772 | b43_adjust_opmode(dev); |
4773 | memset(wl->mac_addr, 0, ETH_ALEN); | 4773 | memset(wl->mac_addr, 0, ETH_ALEN); |
@@ -4789,12 +4789,12 @@ static int b43_op_start(struct ieee80211_hw *hw) | |||
4789 | memset(wl->bssid, 0, ETH_ALEN); | 4789 | memset(wl->bssid, 0, ETH_ALEN); |
4790 | memset(wl->mac_addr, 0, ETH_ALEN); | 4790 | memset(wl->mac_addr, 0, ETH_ALEN); |
4791 | wl->filter_flags = 0; | 4791 | wl->filter_flags = 0; |
4792 | wl->radiotap_enabled = 0; | 4792 | wl->radiotap_enabled = false; |
4793 | b43_qos_clear(wl); | 4793 | b43_qos_clear(wl); |
4794 | wl->beacon0_uploaded = 0; | 4794 | wl->beacon0_uploaded = false; |
4795 | wl->beacon1_uploaded = 0; | 4795 | wl->beacon1_uploaded = false; |
4796 | wl->beacon_templates_virgin = 1; | 4796 | wl->beacon_templates_virgin = true; |
4797 | wl->radio_enabled = 1; | 4797 | wl->radio_enabled = true; |
4798 | 4798 | ||
4799 | mutex_lock(&wl->mutex); | 4799 | mutex_lock(&wl->mutex); |
4800 | 4800 | ||
@@ -4840,7 +4840,7 @@ static void b43_op_stop(struct ieee80211_hw *hw) | |||
4840 | goto out_unlock; | 4840 | goto out_unlock; |
4841 | } | 4841 | } |
4842 | b43_wireless_core_exit(dev); | 4842 | b43_wireless_core_exit(dev); |
4843 | wl->radio_enabled = 0; | 4843 | wl->radio_enabled = false; |
4844 | 4844 | ||
4845 | out_unlock: | 4845 | out_unlock: |
4846 | mutex_unlock(&wl->mutex); | 4846 | mutex_unlock(&wl->mutex); |
@@ -5028,7 +5028,7 @@ static int b43_wireless_core_attach(struct b43_wldev *dev) | |||
5028 | struct pci_dev *pdev = NULL; | 5028 | struct pci_dev *pdev = NULL; |
5029 | int err; | 5029 | int err; |
5030 | u32 tmp; | 5030 | u32 tmp; |
5031 | bool have_2ghz_phy = 0, have_5ghz_phy = 0; | 5031 | bool have_2ghz_phy = false, have_5ghz_phy = false; |
5032 | 5032 | ||
5033 | /* Do NOT do any device initialization here. | 5033 | /* Do NOT do any device initialization here. |
5034 | * Do it in wireless_core_init() instead. | 5034 | * Do it in wireless_core_init() instead. |
@@ -5071,7 +5071,7 @@ static int b43_wireless_core_attach(struct b43_wldev *dev) | |||
5071 | } | 5071 | } |
5072 | 5072 | ||
5073 | dev->phy.gmode = have_2ghz_phy; | 5073 | dev->phy.gmode = have_2ghz_phy; |
5074 | dev->phy.radio_on = 1; | 5074 | dev->phy.radio_on = true; |
5075 | b43_wireless_core_reset(dev, dev->phy.gmode); | 5075 | b43_wireless_core_reset(dev, dev->phy.gmode); |
5076 | 5076 | ||
5077 | err = b43_phy_versioning(dev); | 5077 | err = b43_phy_versioning(dev); |
@@ -5082,11 +5082,11 @@ static int b43_wireless_core_attach(struct b43_wldev *dev) | |||
5082 | (pdev->device != 0x4312 && | 5082 | (pdev->device != 0x4312 && |
5083 | pdev->device != 0x4319 && pdev->device != 0x4324)) { | 5083 | pdev->device != 0x4319 && pdev->device != 0x4324)) { |
5084 | /* No multiband support. */ | 5084 | /* No multiband support. */ |
5085 | have_2ghz_phy = 0; | 5085 | have_2ghz_phy = false; |
5086 | have_5ghz_phy = 0; | 5086 | have_5ghz_phy = false; |
5087 | switch (dev->phy.type) { | 5087 | switch (dev->phy.type) { |
5088 | case B43_PHYTYPE_A: | 5088 | case B43_PHYTYPE_A: |
5089 | have_5ghz_phy = 1; | 5089 | have_5ghz_phy = true; |
5090 | break; | 5090 | break; |
5091 | case B43_PHYTYPE_LP: //FIXME not always! | 5091 | case B43_PHYTYPE_LP: //FIXME not always! |
5092 | #if 0 //FIXME enabling 5GHz causes a NULL pointer dereference | 5092 | #if 0 //FIXME enabling 5GHz causes a NULL pointer dereference |
@@ -5096,7 +5096,7 @@ static int b43_wireless_core_attach(struct b43_wldev *dev) | |||
5096 | case B43_PHYTYPE_N: | 5096 | case B43_PHYTYPE_N: |
5097 | case B43_PHYTYPE_HT: | 5097 | case B43_PHYTYPE_HT: |
5098 | case B43_PHYTYPE_LCN: | 5098 | case B43_PHYTYPE_LCN: |
5099 | have_2ghz_phy = 1; | 5099 | have_2ghz_phy = true; |
5100 | break; | 5100 | break; |
5101 | default: | 5101 | default: |
5102 | B43_WARN_ON(1); | 5102 | B43_WARN_ON(1); |
@@ -5112,8 +5112,8 @@ static int b43_wireless_core_attach(struct b43_wldev *dev) | |||
5112 | /* FIXME: For now we disable the A-PHY on multi-PHY devices. */ | 5112 | /* FIXME: For now we disable the A-PHY on multi-PHY devices. */ |
5113 | if (dev->phy.type != B43_PHYTYPE_N && | 5113 | if (dev->phy.type != B43_PHYTYPE_N && |
5114 | dev->phy.type != B43_PHYTYPE_LP) { | 5114 | dev->phy.type != B43_PHYTYPE_LP) { |
5115 | have_2ghz_phy = 1; | 5115 | have_2ghz_phy = true; |
5116 | have_5ghz_phy = 0; | 5116 | have_5ghz_phy = false; |
5117 | } | 5117 | } |
5118 | } | 5118 | } |
5119 | 5119 | ||
diff --git a/drivers/net/wireless/b43/phy_common.c b/drivers/net/wireless/b43/phy_common.c index 3ea44bb03684..3f8883b14d9c 100644 --- a/drivers/net/wireless/b43/phy_common.c +++ b/drivers/net/wireless/b43/phy_common.c | |||
@@ -145,7 +145,7 @@ void b43_radio_lock(struct b43_wldev *dev) | |||
145 | 145 | ||
146 | #if B43_DEBUG | 146 | #if B43_DEBUG |
147 | B43_WARN_ON(dev->phy.radio_locked); | 147 | B43_WARN_ON(dev->phy.radio_locked); |
148 | dev->phy.radio_locked = 1; | 148 | dev->phy.radio_locked = true; |
149 | #endif | 149 | #endif |
150 | 150 | ||
151 | macctl = b43_read32(dev, B43_MMIO_MACCTL); | 151 | macctl = b43_read32(dev, B43_MMIO_MACCTL); |
@@ -163,7 +163,7 @@ void b43_radio_unlock(struct b43_wldev *dev) | |||
163 | 163 | ||
164 | #if B43_DEBUG | 164 | #if B43_DEBUG |
165 | B43_WARN_ON(!dev->phy.radio_locked); | 165 | B43_WARN_ON(!dev->phy.radio_locked); |
166 | dev->phy.radio_locked = 0; | 166 | dev->phy.radio_locked = false; |
167 | #endif | 167 | #endif |
168 | 168 | ||
169 | /* Commit any write */ | 169 | /* Commit any write */ |
@@ -178,7 +178,7 @@ void b43_phy_lock(struct b43_wldev *dev) | |||
178 | { | 178 | { |
179 | #if B43_DEBUG | 179 | #if B43_DEBUG |
180 | B43_WARN_ON(dev->phy.phy_locked); | 180 | B43_WARN_ON(dev->phy.phy_locked); |
181 | dev->phy.phy_locked = 1; | 181 | dev->phy.phy_locked = true; |
182 | #endif | 182 | #endif |
183 | B43_WARN_ON(dev->dev->core_rev < 3); | 183 | B43_WARN_ON(dev->dev->core_rev < 3); |
184 | 184 | ||
@@ -190,7 +190,7 @@ void b43_phy_unlock(struct b43_wldev *dev) | |||
190 | { | 190 | { |
191 | #if B43_DEBUG | 191 | #if B43_DEBUG |
192 | B43_WARN_ON(!dev->phy.phy_locked); | 192 | B43_WARN_ON(!dev->phy.phy_locked); |
193 | dev->phy.phy_locked = 0; | 193 | dev->phy.phy_locked = false; |
194 | #endif | 194 | #endif |
195 | B43_WARN_ON(dev->dev->core_rev < 3); | 195 | B43_WARN_ON(dev->dev->core_rev < 3); |
196 | 196 | ||
diff --git a/drivers/net/wireless/b43/phy_g.c b/drivers/net/wireless/b43/phy_g.c index 8e157bc213f3..12f467b8d564 100644 --- a/drivers/net/wireless/b43/phy_g.c +++ b/drivers/net/wireless/b43/phy_g.c | |||
@@ -897,7 +897,7 @@ b43_radio_interference_mitigation_enable(struct b43_wldev *dev, int mode) | |||
897 | if (b43_phy_read(dev, 0x0033) & 0x0800) | 897 | if (b43_phy_read(dev, 0x0033) & 0x0800) |
898 | break; | 898 | break; |
899 | 899 | ||
900 | gphy->aci_enable = 1; | 900 | gphy->aci_enable = true; |
901 | 901 | ||
902 | phy_stacksave(B43_PHY_RADIO_BITFIELD); | 902 | phy_stacksave(B43_PHY_RADIO_BITFIELD); |
903 | phy_stacksave(B43_PHY_G_CRS); | 903 | phy_stacksave(B43_PHY_G_CRS); |
@@ -1038,7 +1038,7 @@ b43_radio_interference_mitigation_disable(struct b43_wldev *dev, int mode) | |||
1038 | if (!(b43_phy_read(dev, 0x0033) & 0x0800)) | 1038 | if (!(b43_phy_read(dev, 0x0033) & 0x0800)) |
1039 | break; | 1039 | break; |
1040 | 1040 | ||
1041 | gphy->aci_enable = 0; | 1041 | gphy->aci_enable = false; |
1042 | 1042 | ||
1043 | phy_stackrestore(B43_PHY_RADIO_BITFIELD); | 1043 | phy_stackrestore(B43_PHY_RADIO_BITFIELD); |
1044 | phy_stackrestore(B43_PHY_G_CRS); | 1044 | phy_stackrestore(B43_PHY_G_CRS); |
@@ -1956,10 +1956,10 @@ static void b43_phy_init_pctl(struct b43_wldev *dev) | |||
1956 | bbatt.att = 11; | 1956 | bbatt.att = 11; |
1957 | if (phy->radio_rev == 8) { | 1957 | if (phy->radio_rev == 8) { |
1958 | rfatt.att = 15; | 1958 | rfatt.att = 15; |
1959 | rfatt.with_padmix = 1; | 1959 | rfatt.with_padmix = true; |
1960 | } else { | 1960 | } else { |
1961 | rfatt.att = 9; | 1961 | rfatt.att = 9; |
1962 | rfatt.with_padmix = 0; | 1962 | rfatt.with_padmix = false; |
1963 | } | 1963 | } |
1964 | b43_set_txpower_g(dev, &bbatt, &rfatt, 0); | 1964 | b43_set_txpower_g(dev, &bbatt, &rfatt, 0); |
1965 | } | 1965 | } |
@@ -2137,7 +2137,7 @@ static void default_radio_attenuation(struct b43_wldev *dev, | |||
2137 | struct b43_bus_dev *bdev = dev->dev; | 2137 | struct b43_bus_dev *bdev = dev->dev; |
2138 | struct b43_phy *phy = &dev->phy; | 2138 | struct b43_phy *phy = &dev->phy; |
2139 | 2139 | ||
2140 | rf->with_padmix = 0; | 2140 | rf->with_padmix = false; |
2141 | 2141 | ||
2142 | if (dev->dev->board_vendor == SSB_BOARDVENDOR_BCM && | 2142 | if (dev->dev->board_vendor == SSB_BOARDVENDOR_BCM && |
2143 | dev->dev->board_type == SSB_BOARD_BCM4309G) { | 2143 | dev->dev->board_type == SSB_BOARD_BCM4309G) { |
@@ -2221,7 +2221,7 @@ static void default_radio_attenuation(struct b43_wldev *dev, | |||
2221 | return; | 2221 | return; |
2222 | case 8: | 2222 | case 8: |
2223 | rf->att = 0xA; | 2223 | rf->att = 0xA; |
2224 | rf->with_padmix = 1; | 2224 | rf->with_padmix = true; |
2225 | return; | 2225 | return; |
2226 | case 9: | 2226 | case 9: |
2227 | default: | 2227 | default: |
@@ -2389,7 +2389,7 @@ static int b43_gphy_init_tssi2dbm_table(struct b43_wldev *dev) | |||
2389 | B43_WARN_ON((dev->dev->chip_id == 0x4301) && | 2389 | B43_WARN_ON((dev->dev->chip_id == 0x4301) && |
2390 | (phy->radio_ver != 0x2050)); /* Not supported anymore */ | 2390 | (phy->radio_ver != 0x2050)); /* Not supported anymore */ |
2391 | 2391 | ||
2392 | gphy->dyn_tssi_tbl = 0; | 2392 | gphy->dyn_tssi_tbl = false; |
2393 | 2393 | ||
2394 | if (pab0 != 0 && pab1 != 0 && pab2 != 0 && | 2394 | if (pab0 != 0 && pab1 != 0 && pab2 != 0 && |
2395 | pab0 != -1 && pab1 != -1 && pab2 != -1) { | 2395 | pab0 != -1 && pab1 != -1 && pab2 != -1) { |
@@ -2404,7 +2404,7 @@ static int b43_gphy_init_tssi2dbm_table(struct b43_wldev *dev) | |||
2404 | pab1, pab2); | 2404 | pab1, pab2); |
2405 | if (!gphy->tssi2dbm) | 2405 | if (!gphy->tssi2dbm) |
2406 | return -ENOMEM; | 2406 | return -ENOMEM; |
2407 | gphy->dyn_tssi_tbl = 1; | 2407 | gphy->dyn_tssi_tbl = true; |
2408 | } else { | 2408 | } else { |
2409 | /* pabX values not set in SPROM. */ | 2409 | /* pabX values not set in SPROM. */ |
2410 | gphy->tgt_idle_tssi = 52; | 2410 | gphy->tgt_idle_tssi = 52; |
@@ -2504,7 +2504,7 @@ static void b43_gphy_op_free(struct b43_wldev *dev) | |||
2504 | 2504 | ||
2505 | if (gphy->dyn_tssi_tbl) | 2505 | if (gphy->dyn_tssi_tbl) |
2506 | kfree(gphy->tssi2dbm); | 2506 | kfree(gphy->tssi2dbm); |
2507 | gphy->dyn_tssi_tbl = 0; | 2507 | gphy->dyn_tssi_tbl = false; |
2508 | gphy->tssi2dbm = NULL; | 2508 | gphy->tssi2dbm = NULL; |
2509 | 2509 | ||
2510 | kfree(gphy); | 2510 | kfree(gphy); |
@@ -2531,10 +2531,10 @@ static int b43_gphy_op_prepare_hardware(struct b43_wldev *dev) | |||
2531 | if (phy->rev == 1) { | 2531 | if (phy->rev == 1) { |
2532 | /* Workaround: Temporarly disable gmode through the early init | 2532 | /* Workaround: Temporarly disable gmode through the early init |
2533 | * phase, as the gmode stuff is not needed for phy rev 1 */ | 2533 | * phase, as the gmode stuff is not needed for phy rev 1 */ |
2534 | phy->gmode = 0; | 2534 | phy->gmode = false; |
2535 | b43_wireless_core_reset(dev, 0); | 2535 | b43_wireless_core_reset(dev, 0); |
2536 | b43_phy_initg(dev); | 2536 | b43_phy_initg(dev); |
2537 | phy->gmode = 1; | 2537 | phy->gmode = true; |
2538 | b43_wireless_core_reset(dev, 1); | 2538 | b43_wireless_core_reset(dev, 1); |
2539 | } | 2539 | } |
2540 | 2540 | ||
@@ -2613,7 +2613,7 @@ static void b43_gphy_op_software_rfkill(struct b43_wldev *dev, | |||
2613 | gphy->radio_off_context.rfover); | 2613 | gphy->radio_off_context.rfover); |
2614 | b43_phy_write(dev, B43_PHY_RFOVERVAL, | 2614 | b43_phy_write(dev, B43_PHY_RFOVERVAL, |
2615 | gphy->radio_off_context.rfoverval); | 2615 | gphy->radio_off_context.rfoverval); |
2616 | gphy->radio_off_context.valid = 0; | 2616 | gphy->radio_off_context.valid = false; |
2617 | } | 2617 | } |
2618 | channel = phy->channel; | 2618 | channel = phy->channel; |
2619 | b43_gphy_channel_switch(dev, 6, 1); | 2619 | b43_gphy_channel_switch(dev, 6, 1); |
@@ -2626,7 +2626,7 @@ static void b43_gphy_op_software_rfkill(struct b43_wldev *dev, | |||
2626 | rfoverval = b43_phy_read(dev, B43_PHY_RFOVERVAL); | 2626 | rfoverval = b43_phy_read(dev, B43_PHY_RFOVERVAL); |
2627 | gphy->radio_off_context.rfover = rfover; | 2627 | gphy->radio_off_context.rfover = rfover; |
2628 | gphy->radio_off_context.rfoverval = rfoverval; | 2628 | gphy->radio_off_context.rfoverval = rfoverval; |
2629 | gphy->radio_off_context.valid = 1; | 2629 | gphy->radio_off_context.valid = true; |
2630 | b43_phy_write(dev, B43_PHY_RFOVER, rfover | 0x008C); | 2630 | b43_phy_write(dev, B43_PHY_RFOVER, rfover | 0x008C); |
2631 | b43_phy_write(dev, B43_PHY_RFOVERVAL, rfoverval & 0xFF73); | 2631 | b43_phy_write(dev, B43_PHY_RFOVERVAL, rfoverval & 0xFF73); |
2632 | } | 2632 | } |
@@ -2711,10 +2711,10 @@ static int b43_gphy_op_interf_mitigation(struct b43_wldev *dev, | |||
2711 | if ((phy->rev == 0) || (!phy->gmode)) | 2711 | if ((phy->rev == 0) || (!phy->gmode)) |
2712 | return -ENODEV; | 2712 | return -ENODEV; |
2713 | 2713 | ||
2714 | gphy->aci_wlan_automatic = 0; | 2714 | gphy->aci_wlan_automatic = false; |
2715 | switch (mode) { | 2715 | switch (mode) { |
2716 | case B43_INTERFMODE_AUTOWLAN: | 2716 | case B43_INTERFMODE_AUTOWLAN: |
2717 | gphy->aci_wlan_automatic = 1; | 2717 | gphy->aci_wlan_automatic = true; |
2718 | if (gphy->aci_enable) | 2718 | if (gphy->aci_enable) |
2719 | mode = B43_INTERFMODE_MANUALWLAN; | 2719 | mode = B43_INTERFMODE_MANUALWLAN; |
2720 | else | 2720 | else |
@@ -2735,8 +2735,8 @@ static int b43_gphy_op_interf_mitigation(struct b43_wldev *dev, | |||
2735 | b43_radio_interference_mitigation_disable(dev, currentmode); | 2735 | b43_radio_interference_mitigation_disable(dev, currentmode); |
2736 | 2736 | ||
2737 | if (mode == B43_INTERFMODE_NONE) { | 2737 | if (mode == B43_INTERFMODE_NONE) { |
2738 | gphy->aci_enable = 0; | 2738 | gphy->aci_enable = false; |
2739 | gphy->aci_hw_rssi = 0; | 2739 | gphy->aci_hw_rssi = false; |
2740 | } else | 2740 | } else |
2741 | b43_radio_interference_mitigation_enable(dev, mode); | 2741 | b43_radio_interference_mitigation_enable(dev, mode); |
2742 | gphy->interfmode = mode; | 2742 | gphy->interfmode = mode; |
diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c index f93d66b1817b..3ae28561f7a4 100644 --- a/drivers/net/wireless/b43/phy_lp.c +++ b/drivers/net/wireless/b43/phy_lp.c | |||
@@ -736,9 +736,9 @@ static void lpphy_set_deaf(struct b43_wldev *dev, bool user) | |||
736 | struct b43_phy_lp *lpphy = dev->phy.lp; | 736 | struct b43_phy_lp *lpphy = dev->phy.lp; |
737 | 737 | ||
738 | if (user) | 738 | if (user) |
739 | lpphy->crs_usr_disable = 1; | 739 | lpphy->crs_usr_disable = true; |
740 | else | 740 | else |
741 | lpphy->crs_sys_disable = 1; | 741 | lpphy->crs_sys_disable = true; |
742 | b43_phy_maskset(dev, B43_LPPHY_CRSGAIN_CTL, 0xFF1F, 0x80); | 742 | b43_phy_maskset(dev, B43_LPPHY_CRSGAIN_CTL, 0xFF1F, 0x80); |
743 | } | 743 | } |
744 | 744 | ||
@@ -747,9 +747,9 @@ static void lpphy_clear_deaf(struct b43_wldev *dev, bool user) | |||
747 | struct b43_phy_lp *lpphy = dev->phy.lp; | 747 | struct b43_phy_lp *lpphy = dev->phy.lp; |
748 | 748 | ||
749 | if (user) | 749 | if (user) |
750 | lpphy->crs_usr_disable = 0; | 750 | lpphy->crs_usr_disable = false; |
751 | else | 751 | else |
752 | lpphy->crs_sys_disable = 0; | 752 | lpphy->crs_sys_disable = false; |
753 | 753 | ||
754 | if (!lpphy->crs_usr_disable && !lpphy->crs_sys_disable) { | 754 | if (!lpphy->crs_usr_disable && !lpphy->crs_sys_disable) { |
755 | if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) | 755 | if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) |
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c index c8fa2cd97e64..f1a7e5890adc 100644 --- a/drivers/net/wireless/b43/phy_n.c +++ b/drivers/net/wireless/b43/phy_n.c | |||
@@ -3375,7 +3375,7 @@ static int b43_nphy_cal_tx_iq_lo(struct b43_wldev *dev, | |||
3375 | 3375 | ||
3376 | if (dev->phy.rev >= 4) { | 3376 | if (dev->phy.rev >= 4) { |
3377 | avoid = nphy->hang_avoid; | 3377 | avoid = nphy->hang_avoid; |
3378 | nphy->hang_avoid = 0; | 3378 | nphy->hang_avoid = false; |
3379 | } | 3379 | } |
3380 | 3380 | ||
3381 | b43_ntab_read_bulk(dev, B43_NTAB16(7, 0x110), 2, save); | 3381 | b43_ntab_read_bulk(dev, B43_NTAB16(7, 0x110), 2, save); |
@@ -3485,7 +3485,7 @@ static int b43_nphy_cal_tx_iq_lo(struct b43_wldev *dev, | |||
3485 | 3485 | ||
3486 | if (phy6or5x && updated[core] == 0) { | 3486 | if (phy6or5x && updated[core] == 0) { |
3487 | b43_nphy_update_tx_cal_ladder(dev, core); | 3487 | b43_nphy_update_tx_cal_ladder(dev, core); |
3488 | updated[core] = 1; | 3488 | updated[core] = true; |
3489 | } | 3489 | } |
3490 | 3490 | ||
3491 | tmp = (params[core].ncorr[type] << 8) | 0x66; | 3491 | tmp = (params[core].ncorr[type] << 8) | 0x66; |
diff --git a/drivers/net/wireless/b43/pio.c b/drivers/net/wireless/b43/pio.c index fcff923b3c18..d07b412a32c4 100644 --- a/drivers/net/wireless/b43/pio.c +++ b/drivers/net/wireless/b43/pio.c | |||
@@ -539,7 +539,7 @@ int b43_pio_tx(struct b43_wldev *dev, struct sk_buff *skb) | |||
539 | /* Not enough memory on the queue. */ | 539 | /* Not enough memory on the queue. */ |
540 | err = -EBUSY; | 540 | err = -EBUSY; |
541 | ieee80211_stop_queue(dev->wl->hw, skb_get_queue_mapping(skb)); | 541 | ieee80211_stop_queue(dev->wl->hw, skb_get_queue_mapping(skb)); |
542 | q->stopped = 1; | 542 | q->stopped = true; |
543 | goto out; | 543 | goto out; |
544 | } | 544 | } |
545 | 545 | ||
@@ -566,7 +566,7 @@ int b43_pio_tx(struct b43_wldev *dev, struct sk_buff *skb) | |||
566 | (q->free_packet_slots == 0)) { | 566 | (q->free_packet_slots == 0)) { |
567 | /* The queue is full. */ | 567 | /* The queue is full. */ |
568 | ieee80211_stop_queue(dev->wl->hw, skb_get_queue_mapping(skb)); | 568 | ieee80211_stop_queue(dev->wl->hw, skb_get_queue_mapping(skb)); |
569 | q->stopped = 1; | 569 | q->stopped = true; |
570 | } | 570 | } |
571 | 571 | ||
572 | out: | 572 | out: |
@@ -601,7 +601,7 @@ void b43_pio_handle_txstatus(struct b43_wldev *dev, | |||
601 | 601 | ||
602 | if (q->stopped) { | 602 | if (q->stopped) { |
603 | ieee80211_wake_queue(dev->wl->hw, q->queue_prio); | 603 | ieee80211_wake_queue(dev->wl->hw, q->queue_prio); |
604 | q->stopped = 0; | 604 | q->stopped = false; |
605 | } | 605 | } |
606 | } | 606 | } |
607 | 607 | ||
diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c index 5f77cbe0b6aa..2c5367884b3f 100644 --- a/drivers/net/wireless/b43/xmit.c +++ b/drivers/net/wireless/b43/xmit.c | |||
@@ -874,7 +874,7 @@ bool b43_fill_txstatus_report(struct b43_wldev *dev, | |||
874 | struct ieee80211_tx_info *report, | 874 | struct ieee80211_tx_info *report, |
875 | const struct b43_txstatus *status) | 875 | const struct b43_txstatus *status) |
876 | { | 876 | { |
877 | bool frame_success = 1; | 877 | bool frame_success = true; |
878 | int retry_limit; | 878 | int retry_limit; |
879 | 879 | ||
880 | /* preserve the confiured retry limit before clearing the status | 880 | /* preserve the confiured retry limit before clearing the status |
@@ -890,7 +890,7 @@ bool b43_fill_txstatus_report(struct b43_wldev *dev, | |||
890 | /* The frame was not ACKed... */ | 890 | /* The frame was not ACKed... */ |
891 | if (!(report->flags & IEEE80211_TX_CTL_NO_ACK)) { | 891 | if (!(report->flags & IEEE80211_TX_CTL_NO_ACK)) { |
892 | /* ...but we expected an ACK. */ | 892 | /* ...but we expected an ACK. */ |
893 | frame_success = 0; | 893 | frame_success = false; |
894 | } | 894 | } |
895 | } | 895 | } |
896 | if (status->frame_count == 0) { | 896 | if (status->frame_count == 0) { |