net: fix assignment of 0/1 to bool variables.
DaveM said: Please, this kind of stuff rots forever and not using bool properly drives me crazy. Joe Perches <joe@perches.com> gave me the spatch script: @@ bool b; @@ -b = 0 +b = false @@ bool b; @@ -b = 1 +b = true I merely installed coccinelle, read the documentation and took credit. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Этот коммит содержится в:

коммит произвёл
David S. Miller

родитель
a8e510f682
Коммит
3db1cd5c05
@@ -890,7 +890,7 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev,
|
||||
else
|
||||
ring->ops = &dma32_ops;
|
||||
if (for_tx) {
|
||||
ring->tx = 1;
|
||||
ring->tx = true;
|
||||
ring->current_slot = -1;
|
||||
} else {
|
||||
if (ring->index == 0) {
|
||||
@@ -1061,7 +1061,7 @@ void b43_dma_free(struct b43_wldev *dev)
|
||||
static int b43_dma_set_mask(struct b43_wldev *dev, u64 mask)
|
||||
{
|
||||
u64 orig_mask = mask;
|
||||
bool fallback = 0;
|
||||
bool fallback = false;
|
||||
int err;
|
||||
|
||||
/* 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)
|
||||
}
|
||||
if (mask == DMA_BIT_MASK(64)) {
|
||||
mask = DMA_BIT_MASK(32);
|
||||
fallback = 1;
|
||||
fallback = true;
|
||||
continue;
|
||||
}
|
||||
if (mask == DMA_BIT_MASK(32)) {
|
||||
mask = DMA_BIT_MASK(30);
|
||||
fallback = 1;
|
||||
fallback = true;
|
||||
continue;
|
||||
}
|
||||
b43err(dev->wl, "The machine/kernel does not support "
|
||||
@@ -1307,7 +1307,7 @@ static int dma_tx_fragment(struct b43_dmaring *ring,
|
||||
memset(meta, 0, sizeof(*meta));
|
||||
|
||||
meta->skb = skb;
|
||||
meta->is_last_fragment = 1;
|
||||
meta->is_last_fragment = true;
|
||||
priv_info->bouncebuffer = NULL;
|
||||
|
||||
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)
|
||||
should_inject_overflow(ring)) {
|
||||
/* This TX ring is full. */
|
||||
ieee80211_stop_queue(dev->wl->hw, skb_get_queue_mapping(skb));
|
||||
ring->stopped = 1;
|
||||
ring->stopped = true;
|
||||
if (b43_debug(dev, B43_DBG_DMAVERBOSE)) {
|
||||
b43dbg(dev->wl, "Stopped TX ring %d\n", ring->index);
|
||||
}
|
||||
@@ -1585,7 +1585,7 @@ void b43_dma_handle_txstatus(struct b43_wldev *dev,
|
||||
if (ring->stopped) {
|
||||
B43_WARN_ON(free_slots(ring) < TX_SLOTS_PER_FRAME);
|
||||
ieee80211_wake_queue(dev->wl->hw, ring->queue_prio);
|
||||
ring->stopped = 0;
|
||||
ring->stopped = false;
|
||||
if (b43_debug(dev, B43_DBG_DMAVERBOSE)) {
|
||||
b43dbg(dev->wl, "Woke up TX ring %d\n", ring->index);
|
||||
}
|
||||
|
@@ -74,7 +74,7 @@ static void b43_led_update(struct b43_wldev *dev,
|
||||
if (radio_enabled)
|
||||
turn_on = atomic_read(&led->state) != LED_OFF;
|
||||
else
|
||||
turn_on = 0;
|
||||
turn_on = false;
|
||||
if (turn_on == led->hw_state)
|
||||
return;
|
||||
led->hw_state = turn_on;
|
||||
@@ -225,11 +225,11 @@ static void b43_led_get_sprominfo(struct b43_wldev *dev,
|
||||
if (sprom[led_index] == 0xFF) {
|
||||
/* There is no LED information in the SPROM
|
||||
* for this LED. Hardcode it here. */
|
||||
*activelow = 0;
|
||||
*activelow = false;
|
||||
switch (led_index) {
|
||||
case 0:
|
||||
*behaviour = B43_LED_ACTIVITY;
|
||||
*activelow = 1;
|
||||
*activelow = true;
|
||||
if (dev->dev->board_vendor == PCI_VENDOR_ID_COMPAQ)
|
||||
*behaviour = B43_LED_RADIO_ALL;
|
||||
break;
|
||||
@@ -267,11 +267,11 @@ void b43_leds_init(struct b43_wldev *dev)
|
||||
if (led->wl) {
|
||||
if (dev->phy.radio_on && b43_is_hw_radio_enabled(dev)) {
|
||||
b43_led_turn_on(dev, led->index, led->activelow);
|
||||
led->hw_state = 1;
|
||||
led->hw_state = true;
|
||||
atomic_set(&led->state, 1);
|
||||
} else {
|
||||
b43_led_turn_off(dev, led->index, led->activelow);
|
||||
led->hw_state = 0;
|
||||
led->hw_state = false;
|
||||
atomic_set(&led->state, 0);
|
||||
}
|
||||
}
|
||||
@@ -280,19 +280,19 @@ void b43_leds_init(struct b43_wldev *dev)
|
||||
led = &dev->wl->leds.led_tx;
|
||||
if (led->wl) {
|
||||
b43_led_turn_off(dev, led->index, led->activelow);
|
||||
led->hw_state = 0;
|
||||
led->hw_state = false;
|
||||
atomic_set(&led->state, 0);
|
||||
}
|
||||
led = &dev->wl->leds.led_rx;
|
||||
if (led->wl) {
|
||||
b43_led_turn_off(dev, led->index, led->activelow);
|
||||
led->hw_state = 0;
|
||||
led->hw_state = false;
|
||||
atomic_set(&led->state, 0);
|
||||
}
|
||||
led = &dev->wl->leds.led_assoc;
|
||||
if (led->wl) {
|
||||
b43_led_turn_off(dev, led->index, led->activelow);
|
||||
led->hw_state = 0;
|
||||
led->hw_state = false;
|
||||
atomic_set(&led->state, 0);
|
||||
}
|
||||
|
||||
|
@@ -826,7 +826,7 @@ void b43_gphy_dc_lt_init(struct b43_wldev *dev, bool update_all)
|
||||
const struct b43_rfatt *rfatt;
|
||||
const struct b43_bbatt *bbatt;
|
||||
u64 power_vector;
|
||||
bool table_changed = 0;
|
||||
bool table_changed = false;
|
||||
|
||||
BUILD_BUG_ON(B43_DC_LT_SIZE != 32);
|
||||
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)
|
||||
lo->dc_lt[idx] = (lo->dc_lt[idx] & 0xFF00)
|
||||
| (val & 0x00FF);
|
||||
}
|
||||
table_changed = 1;
|
||||
table_changed = true;
|
||||
}
|
||||
if (table_changed) {
|
||||
/* The table changed in memory. Update the hardware table. */
|
||||
@@ -938,7 +938,7 @@ void b43_lo_g_maintanance_work(struct b43_wldev *dev)
|
||||
unsigned long now;
|
||||
unsigned long expire;
|
||||
struct b43_lo_calib *cal, *tmp;
|
||||
bool current_item_expired = 0;
|
||||
bool current_item_expired = false;
|
||||
bool hwpctl;
|
||||
|
||||
if (!lo)
|
||||
@@ -968,7 +968,7 @@ void b43_lo_g_maintanance_work(struct b43_wldev *dev)
|
||||
if (b43_compare_bbatt(&cal->bbatt, &gphy->bbatt) &&
|
||||
b43_compare_rfatt(&cal->rfatt, &gphy->rfatt)) {
|
||||
B43_WARN_ON(current_item_expired);
|
||||
current_item_expired = 1;
|
||||
current_item_expired = true;
|
||||
}
|
||||
if (b43_debug(dev, B43_DBG_LO)) {
|
||||
b43dbg(dev->wl, "LO: Item BB(%u), RF(%u,%u), "
|
||||
|
@@ -1122,17 +1122,17 @@ void b43_power_saving_ctl_bits(struct b43_wldev *dev, unsigned int ps_flags)
|
||||
B43_WARN_ON((ps_flags & B43_PS_AWAKE) && (ps_flags & B43_PS_ASLEEP));
|
||||
|
||||
if (ps_flags & B43_PS_ENABLED) {
|
||||
hwps = 1;
|
||||
hwps = true;
|
||||
} else if (ps_flags & B43_PS_DISABLED) {
|
||||
hwps = 0;
|
||||
hwps = false;
|
||||
} else {
|
||||
//TODO: If powersave is not off and FIXME is not set and we are not in adhoc
|
||||
// and thus is not an AP and we are associated, set bit 25
|
||||
}
|
||||
if (ps_flags & B43_PS_AWAKE) {
|
||||
awake = 1;
|
||||
awake = true;
|
||||
} else if (ps_flags & B43_PS_ASLEEP) {
|
||||
awake = 0;
|
||||
awake = false;
|
||||
} else {
|
||||
//TODO: If the device is awake or this is an AP, or we are scanning, or FIXME,
|
||||
// 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)
|
||||
}
|
||||
|
||||
/* FIXME: For now we force awake-on and hwps-off */
|
||||
hwps = 0;
|
||||
awake = 1;
|
||||
hwps = false;
|
||||
awake = true;
|
||||
|
||||
macctl = b43_read32(dev, B43_MMIO_MACCTL);
|
||||
if (hwps)
|
||||
@@ -1339,7 +1339,7 @@ static void b43_calculate_link_quality(struct b43_wldev *dev)
|
||||
return;
|
||||
if (dev->noisecalc.calculation_running)
|
||||
return;
|
||||
dev->noisecalc.calculation_running = 1;
|
||||
dev->noisecalc.calculation_running = true;
|
||||
dev->noisecalc.nr_samples = 0;
|
||||
|
||||
b43_generate_noise_sample(dev);
|
||||
@@ -1408,7 +1408,7 @@ static void handle_irq_noise(struct b43_wldev *dev)
|
||||
average -= 48;
|
||||
|
||||
dev->stats.link_noise = average;
|
||||
dev->noisecalc.calculation_running = 0;
|
||||
dev->noisecalc.calculation_running = false;
|
||||
return;
|
||||
}
|
||||
generate_new:
|
||||
@@ -1424,7 +1424,7 @@ static void handle_irq_tbtt_indication(struct b43_wldev *dev)
|
||||
b43_power_saving_ctl_bits(dev, 0);
|
||||
}
|
||||
if (b43_is_mode(dev->wl, NL80211_IFTYPE_ADHOC))
|
||||
dev->dfq_valid = 1;
|
||||
dev->dfq_valid = true;
|
||||
}
|
||||
|
||||
static void handle_irq_atim_end(struct b43_wldev *dev)
|
||||
@@ -1433,7 +1433,7 @@ static void handle_irq_atim_end(struct b43_wldev *dev)
|
||||
b43_write32(dev, B43_MMIO_MACCMD,
|
||||
b43_read32(dev, B43_MMIO_MACCMD)
|
||||
| B43_MACCMD_DFQ_VALID);
|
||||
dev->dfq_valid = 0;
|
||||
dev->dfq_valid = false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1539,7 +1539,7 @@ static void b43_write_beacon_template(struct b43_wldev *dev,
|
||||
unsigned int i, len, variable_len;
|
||||
const struct ieee80211_mgmt *bcn;
|
||||
const u8 *ie;
|
||||
bool tim_found = 0;
|
||||
bool tim_found = false;
|
||||
unsigned int rate;
|
||||
u16 ctl;
|
||||
int antenna;
|
||||
@@ -1588,7 +1588,7 @@ static void b43_write_beacon_template(struct b43_wldev *dev,
|
||||
/* A valid TIM is at least 4 bytes long. */
|
||||
if (ie_len < 4)
|
||||
break;
|
||||
tim_found = 1;
|
||||
tim_found = true;
|
||||
|
||||
tim_position = sizeof(struct b43_plcp_hdr6);
|
||||
tim_position += offsetof(struct ieee80211_mgmt, u.beacon.variable);
|
||||
@@ -1625,7 +1625,7 @@ static void b43_upload_beacon0(struct b43_wldev *dev)
|
||||
if (wl->beacon0_uploaded)
|
||||
return;
|
||||
b43_write_beacon_template(dev, 0x68, 0x18);
|
||||
wl->beacon0_uploaded = 1;
|
||||
wl->beacon0_uploaded = true;
|
||||
}
|
||||
|
||||
static void b43_upload_beacon1(struct b43_wldev *dev)
|
||||
@@ -1635,7 +1635,7 @@ static void b43_upload_beacon1(struct b43_wldev *dev)
|
||||
if (wl->beacon1_uploaded)
|
||||
return;
|
||||
b43_write_beacon_template(dev, 0x468, 0x1A);
|
||||
wl->beacon1_uploaded = 1;
|
||||
wl->beacon1_uploaded = true;
|
||||
}
|
||||
|
||||
static void handle_irq_beacon(struct b43_wldev *dev)
|
||||
@@ -1667,7 +1667,7 @@ static void handle_irq_beacon(struct b43_wldev *dev)
|
||||
if (unlikely(wl->beacon_templates_virgin)) {
|
||||
/* We never uploaded a beacon before.
|
||||
* Upload both templates now, but only mark one valid. */
|
||||
wl->beacon_templates_virgin = 0;
|
||||
wl->beacon_templates_virgin = false;
|
||||
b43_upload_beacon0(dev);
|
||||
b43_upload_beacon1(dev);
|
||||
cmd = b43_read32(dev, B43_MMIO_MACCMD);
|
||||
@@ -1755,8 +1755,8 @@ static void b43_update_templates(struct b43_wl *wl)
|
||||
if (wl->current_beacon)
|
||||
dev_kfree_skb_any(wl->current_beacon);
|
||||
wl->current_beacon = beacon;
|
||||
wl->beacon0_uploaded = 0;
|
||||
wl->beacon1_uploaded = 0;
|
||||
wl->beacon0_uploaded = false;
|
||||
wl->beacon1_uploaded = false;
|
||||
ieee80211_queue_work(wl->hw, &wl->beacon_update_trigger);
|
||||
}
|
||||
|
||||
@@ -1913,7 +1913,7 @@ static void b43_do_interrupt_thread(struct b43_wldev *dev)
|
||||
b43err(dev->wl, "This device does not support DMA "
|
||||
"on your system. It will now be switched to PIO.\n");
|
||||
/* Fall back to PIO transfers if we get fatal DMA errors! */
|
||||
dev->use_pio = 1;
|
||||
dev->use_pio = true;
|
||||
b43_controller_restart(dev, "DMA error");
|
||||
return;
|
||||
}
|
||||
@@ -2240,12 +2240,12 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx)
|
||||
filename = NULL;
|
||||
else
|
||||
goto err_no_pcm;
|
||||
fw->pcm_request_failed = 0;
|
||||
fw->pcm_request_failed = false;
|
||||
err = b43_do_request_fw(ctx, filename, &fw->pcm);
|
||||
if (err == -ENOENT) {
|
||||
/* We did not find a PCM file? Not fatal, but
|
||||
* core rev <= 10 must do without hwcrypto then. */
|
||||
fw->pcm_request_failed = 1;
|
||||
fw->pcm_request_failed = true;
|
||||
} else if (err)
|
||||
goto err_load;
|
||||
|
||||
@@ -2535,7 +2535,7 @@ static int b43_upload_microcode(struct b43_wldev *dev)
|
||||
dev->wl->hw->queues = dev->wl->mac80211_initially_registered_queues;
|
||||
dev->qos_enabled = !!modparam_qos;
|
||||
/* Default to firmware/hardware crypto acceleration. */
|
||||
dev->hwcrypto_enabled = 1;
|
||||
dev->hwcrypto_enabled = true;
|
||||
|
||||
if (dev->fw.opensource) {
|
||||
u16 fwcapa;
|
||||
@@ -2549,7 +2549,7 @@ static int b43_upload_microcode(struct b43_wldev *dev)
|
||||
if (!(fwcapa & B43_FWCAPA_HWCRYPTO) || dev->fw.pcm_request_failed) {
|
||||
b43info(dev->wl, "Hardware crypto acceleration not supported by firmware\n");
|
||||
/* Disable hardware crypto and fall back to software crypto. */
|
||||
dev->hwcrypto_enabled = 0;
|
||||
dev->hwcrypto_enabled = false;
|
||||
}
|
||||
if (!(fwcapa & B43_FWCAPA_QOS)) {
|
||||
b43info(dev->wl, "QoS not supported by firmware\n");
|
||||
@@ -2557,7 +2557,7 @@ static int b43_upload_microcode(struct b43_wldev *dev)
|
||||
* ieee80211_unregister to make sure the networking core can
|
||||
* properly free possible resources. */
|
||||
dev->wl->hw->queues = 1;
|
||||
dev->qos_enabled = 0;
|
||||
dev->qos_enabled = false;
|
||||
}
|
||||
} else {
|
||||
b43info(dev->wl, "Loading firmware version %u.%u "
|
||||
@@ -3361,10 +3361,10 @@ static int b43_rng_init(struct b43_wl *wl)
|
||||
wl->rng.name = wl->rng_name;
|
||||
wl->rng.data_read = b43_rng_read;
|
||||
wl->rng.priv = (unsigned long)wl;
|
||||
wl->rng_initialized = 1;
|
||||
wl->rng_initialized = true;
|
||||
err = hwrng_register(&wl->rng);
|
||||
if (err) {
|
||||
wl->rng_initialized = 0;
|
||||
wl->rng_initialized = false;
|
||||
b43err(wl, "Failed to register the random "
|
||||
"number generator (%d)\n", err);
|
||||
}
|
||||
@@ -3702,13 +3702,13 @@ static int b43_switch_band(struct b43_wl *wl, struct ieee80211_channel *chan)
|
||||
case IEEE80211_BAND_5GHZ:
|
||||
if (d->phy.supports_5ghz) {
|
||||
up_dev = d;
|
||||
gmode = 0;
|
||||
gmode = false;
|
||||
}
|
||||
break;
|
||||
case IEEE80211_BAND_2GHZ:
|
||||
if (d->phy.supports_2ghz) {
|
||||
up_dev = d;
|
||||
gmode = 1;
|
||||
gmode = true;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
@@ -4425,18 +4425,18 @@ static void setup_struct_phy_for_init(struct b43_wldev *dev,
|
||||
atomic_set(&phy->txerr_cnt, B43_PHY_TX_BADNESS_LIMIT);
|
||||
|
||||
#if B43_DEBUG
|
||||
phy->phy_locked = 0;
|
||||
phy->radio_locked = 0;
|
||||
phy->phy_locked = false;
|
||||
phy->radio_locked = false;
|
||||
#endif
|
||||
}
|
||||
|
||||
static void setup_struct_wldev_for_init(struct b43_wldev *dev)
|
||||
{
|
||||
dev->dfq_valid = 0;
|
||||
dev->dfq_valid = false;
|
||||
|
||||
/* Assume the radio is enabled. If it's not enabled, the state will
|
||||
* immediately get fixed on the first periodic work run. */
|
||||
dev->radio_hw_enable = 1;
|
||||
dev->radio_hw_enable = true;
|
||||
|
||||
/* Stats */
|
||||
memset(&dev->stats, 0, sizeof(dev->stats));
|
||||
@@ -4670,16 +4670,16 @@ static int b43_wireless_core_init(struct b43_wldev *dev)
|
||||
|
||||
if (b43_bus_host_is_pcmcia(dev->dev) ||
|
||||
b43_bus_host_is_sdio(dev->dev)) {
|
||||
dev->__using_pio_transfers = 1;
|
||||
dev->__using_pio_transfers = true;
|
||||
err = b43_pio_init(dev);
|
||||
} else if (dev->use_pio) {
|
||||
b43warn(dev->wl, "Forced PIO by use_pio module parameter. "
|
||||
"This should not be needed and will result in lower "
|
||||
"performance.\n");
|
||||
dev->__using_pio_transfers = 1;
|
||||
dev->__using_pio_transfers = true;
|
||||
err = b43_pio_init(dev);
|
||||
} else {
|
||||
dev->__using_pio_transfers = 0;
|
||||
dev->__using_pio_transfers = false;
|
||||
err = b43_dma_init(dev);
|
||||
}
|
||||
if (err)
|
||||
@@ -4733,7 +4733,7 @@ static int b43_op_add_interface(struct ieee80211_hw *hw,
|
||||
b43dbg(wl, "Adding Interface type %d\n", vif->type);
|
||||
|
||||
dev = wl->current_dev;
|
||||
wl->operating = 1;
|
||||
wl->operating = true;
|
||||
wl->vif = vif;
|
||||
wl->if_type = vif->type;
|
||||
memcpy(wl->mac_addr, vif->addr, ETH_ALEN);
|
||||
@@ -4767,7 +4767,7 @@ static void b43_op_remove_interface(struct ieee80211_hw *hw,
|
||||
B43_WARN_ON(wl->vif != vif);
|
||||
wl->vif = NULL;
|
||||
|
||||
wl->operating = 0;
|
||||
wl->operating = false;
|
||||
|
||||
b43_adjust_opmode(dev);
|
||||
memset(wl->mac_addr, 0, ETH_ALEN);
|
||||
@@ -4789,12 +4789,12 @@ static int b43_op_start(struct ieee80211_hw *hw)
|
||||
memset(wl->bssid, 0, ETH_ALEN);
|
||||
memset(wl->mac_addr, 0, ETH_ALEN);
|
||||
wl->filter_flags = 0;
|
||||
wl->radiotap_enabled = 0;
|
||||
wl->radiotap_enabled = false;
|
||||
b43_qos_clear(wl);
|
||||
wl->beacon0_uploaded = 0;
|
||||
wl->beacon1_uploaded = 0;
|
||||
wl->beacon_templates_virgin = 1;
|
||||
wl->radio_enabled = 1;
|
||||
wl->beacon0_uploaded = false;
|
||||
wl->beacon1_uploaded = false;
|
||||
wl->beacon_templates_virgin = true;
|
||||
wl->radio_enabled = true;
|
||||
|
||||
mutex_lock(&wl->mutex);
|
||||
|
||||
@@ -4840,7 +4840,7 @@ static void b43_op_stop(struct ieee80211_hw *hw)
|
||||
goto out_unlock;
|
||||
}
|
||||
b43_wireless_core_exit(dev);
|
||||
wl->radio_enabled = 0;
|
||||
wl->radio_enabled = false;
|
||||
|
||||
out_unlock:
|
||||
mutex_unlock(&wl->mutex);
|
||||
@@ -5028,7 +5028,7 @@ static int b43_wireless_core_attach(struct b43_wldev *dev)
|
||||
struct pci_dev *pdev = NULL;
|
||||
int err;
|
||||
u32 tmp;
|
||||
bool have_2ghz_phy = 0, have_5ghz_phy = 0;
|
||||
bool have_2ghz_phy = false, have_5ghz_phy = false;
|
||||
|
||||
/* Do NOT do any device initialization here.
|
||||
* Do it in wireless_core_init() instead.
|
||||
@@ -5071,7 +5071,7 @@ static int b43_wireless_core_attach(struct b43_wldev *dev)
|
||||
}
|
||||
|
||||
dev->phy.gmode = have_2ghz_phy;
|
||||
dev->phy.radio_on = 1;
|
||||
dev->phy.radio_on = true;
|
||||
b43_wireless_core_reset(dev, dev->phy.gmode);
|
||||
|
||||
err = b43_phy_versioning(dev);
|
||||
@@ -5082,11 +5082,11 @@ static int b43_wireless_core_attach(struct b43_wldev *dev)
|
||||
(pdev->device != 0x4312 &&
|
||||
pdev->device != 0x4319 && pdev->device != 0x4324)) {
|
||||
/* No multiband support. */
|
||||
have_2ghz_phy = 0;
|
||||
have_5ghz_phy = 0;
|
||||
have_2ghz_phy = false;
|
||||
have_5ghz_phy = false;
|
||||
switch (dev->phy.type) {
|
||||
case B43_PHYTYPE_A:
|
||||
have_5ghz_phy = 1;
|
||||
have_5ghz_phy = true;
|
||||
break;
|
||||
case B43_PHYTYPE_LP: //FIXME not always!
|
||||
#if 0 //FIXME enabling 5GHz causes a NULL pointer dereference
|
||||
@@ -5096,7 +5096,7 @@ static int b43_wireless_core_attach(struct b43_wldev *dev)
|
||||
case B43_PHYTYPE_N:
|
||||
case B43_PHYTYPE_HT:
|
||||
case B43_PHYTYPE_LCN:
|
||||
have_2ghz_phy = 1;
|
||||
have_2ghz_phy = true;
|
||||
break;
|
||||
default:
|
||||
B43_WARN_ON(1);
|
||||
@@ -5112,8 +5112,8 @@ static int b43_wireless_core_attach(struct b43_wldev *dev)
|
||||
/* FIXME: For now we disable the A-PHY on multi-PHY devices. */
|
||||
if (dev->phy.type != B43_PHYTYPE_N &&
|
||||
dev->phy.type != B43_PHYTYPE_LP) {
|
||||
have_2ghz_phy = 1;
|
||||
have_5ghz_phy = 0;
|
||||
have_2ghz_phy = true;
|
||||
have_5ghz_phy = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -145,7 +145,7 @@ void b43_radio_lock(struct b43_wldev *dev)
|
||||
|
||||
#if B43_DEBUG
|
||||
B43_WARN_ON(dev->phy.radio_locked);
|
||||
dev->phy.radio_locked = 1;
|
||||
dev->phy.radio_locked = true;
|
||||
#endif
|
||||
|
||||
macctl = b43_read32(dev, B43_MMIO_MACCTL);
|
||||
@@ -163,7 +163,7 @@ void b43_radio_unlock(struct b43_wldev *dev)
|
||||
|
||||
#if B43_DEBUG
|
||||
B43_WARN_ON(!dev->phy.radio_locked);
|
||||
dev->phy.radio_locked = 0;
|
||||
dev->phy.radio_locked = false;
|
||||
#endif
|
||||
|
||||
/* Commit any write */
|
||||
@@ -178,7 +178,7 @@ void b43_phy_lock(struct b43_wldev *dev)
|
||||
{
|
||||
#if B43_DEBUG
|
||||
B43_WARN_ON(dev->phy.phy_locked);
|
||||
dev->phy.phy_locked = 1;
|
||||
dev->phy.phy_locked = true;
|
||||
#endif
|
||||
B43_WARN_ON(dev->dev->core_rev < 3);
|
||||
|
||||
@@ -190,7 +190,7 @@ void b43_phy_unlock(struct b43_wldev *dev)
|
||||
{
|
||||
#if B43_DEBUG
|
||||
B43_WARN_ON(!dev->phy.phy_locked);
|
||||
dev->phy.phy_locked = 0;
|
||||
dev->phy.phy_locked = false;
|
||||
#endif
|
||||
B43_WARN_ON(dev->dev->core_rev < 3);
|
||||
|
||||
|
@@ -897,7 +897,7 @@ b43_radio_interference_mitigation_enable(struct b43_wldev *dev, int mode)
|
||||
if (b43_phy_read(dev, 0x0033) & 0x0800)
|
||||
break;
|
||||
|
||||
gphy->aci_enable = 1;
|
||||
gphy->aci_enable = true;
|
||||
|
||||
phy_stacksave(B43_PHY_RADIO_BITFIELD);
|
||||
phy_stacksave(B43_PHY_G_CRS);
|
||||
@@ -1038,7 +1038,7 @@ b43_radio_interference_mitigation_disable(struct b43_wldev *dev, int mode)
|
||||
if (!(b43_phy_read(dev, 0x0033) & 0x0800))
|
||||
break;
|
||||
|
||||
gphy->aci_enable = 0;
|
||||
gphy->aci_enable = false;
|
||||
|
||||
phy_stackrestore(B43_PHY_RADIO_BITFIELD);
|
||||
phy_stackrestore(B43_PHY_G_CRS);
|
||||
@@ -1956,10 +1956,10 @@ static void b43_phy_init_pctl(struct b43_wldev *dev)
|
||||
bbatt.att = 11;
|
||||
if (phy->radio_rev == 8) {
|
||||
rfatt.att = 15;
|
||||
rfatt.with_padmix = 1;
|
||||
rfatt.with_padmix = true;
|
||||
} else {
|
||||
rfatt.att = 9;
|
||||
rfatt.with_padmix = 0;
|
||||
rfatt.with_padmix = false;
|
||||
}
|
||||
b43_set_txpower_g(dev, &bbatt, &rfatt, 0);
|
||||
}
|
||||
@@ -2137,7 +2137,7 @@ static void default_radio_attenuation(struct b43_wldev *dev,
|
||||
struct b43_bus_dev *bdev = dev->dev;
|
||||
struct b43_phy *phy = &dev->phy;
|
||||
|
||||
rf->with_padmix = 0;
|
||||
rf->with_padmix = false;
|
||||
|
||||
if (dev->dev->board_vendor == SSB_BOARDVENDOR_BCM &&
|
||||
dev->dev->board_type == SSB_BOARD_BCM4309G) {
|
||||
@@ -2221,7 +2221,7 @@ static void default_radio_attenuation(struct b43_wldev *dev,
|
||||
return;
|
||||
case 8:
|
||||
rf->att = 0xA;
|
||||
rf->with_padmix = 1;
|
||||
rf->with_padmix = true;
|
||||
return;
|
||||
case 9:
|
||||
default:
|
||||
@@ -2389,7 +2389,7 @@ static int b43_gphy_init_tssi2dbm_table(struct b43_wldev *dev)
|
||||
B43_WARN_ON((dev->dev->chip_id == 0x4301) &&
|
||||
(phy->radio_ver != 0x2050)); /* Not supported anymore */
|
||||
|
||||
gphy->dyn_tssi_tbl = 0;
|
||||
gphy->dyn_tssi_tbl = false;
|
||||
|
||||
if (pab0 != 0 && pab1 != 0 && pab2 != 0 &&
|
||||
pab0 != -1 && pab1 != -1 && pab2 != -1) {
|
||||
@@ -2404,7 +2404,7 @@ static int b43_gphy_init_tssi2dbm_table(struct b43_wldev *dev)
|
||||
pab1, pab2);
|
||||
if (!gphy->tssi2dbm)
|
||||
return -ENOMEM;
|
||||
gphy->dyn_tssi_tbl = 1;
|
||||
gphy->dyn_tssi_tbl = true;
|
||||
} else {
|
||||
/* pabX values not set in SPROM. */
|
||||
gphy->tgt_idle_tssi = 52;
|
||||
@@ -2504,7 +2504,7 @@ static void b43_gphy_op_free(struct b43_wldev *dev)
|
||||
|
||||
if (gphy->dyn_tssi_tbl)
|
||||
kfree(gphy->tssi2dbm);
|
||||
gphy->dyn_tssi_tbl = 0;
|
||||
gphy->dyn_tssi_tbl = false;
|
||||
gphy->tssi2dbm = NULL;
|
||||
|
||||
kfree(gphy);
|
||||
@@ -2531,10 +2531,10 @@ static int b43_gphy_op_prepare_hardware(struct b43_wldev *dev)
|
||||
if (phy->rev == 1) {
|
||||
/* Workaround: Temporarly disable gmode through the early init
|
||||
* phase, as the gmode stuff is not needed for phy rev 1 */
|
||||
phy->gmode = 0;
|
||||
phy->gmode = false;
|
||||
b43_wireless_core_reset(dev, 0);
|
||||
b43_phy_initg(dev);
|
||||
phy->gmode = 1;
|
||||
phy->gmode = true;
|
||||
b43_wireless_core_reset(dev, 1);
|
||||
}
|
||||
|
||||
@@ -2613,7 +2613,7 @@ static void b43_gphy_op_software_rfkill(struct b43_wldev *dev,
|
||||
gphy->radio_off_context.rfover);
|
||||
b43_phy_write(dev, B43_PHY_RFOVERVAL,
|
||||
gphy->radio_off_context.rfoverval);
|
||||
gphy->radio_off_context.valid = 0;
|
||||
gphy->radio_off_context.valid = false;
|
||||
}
|
||||
channel = phy->channel;
|
||||
b43_gphy_channel_switch(dev, 6, 1);
|
||||
@@ -2626,7 +2626,7 @@ static void b43_gphy_op_software_rfkill(struct b43_wldev *dev,
|
||||
rfoverval = b43_phy_read(dev, B43_PHY_RFOVERVAL);
|
||||
gphy->radio_off_context.rfover = rfover;
|
||||
gphy->radio_off_context.rfoverval = rfoverval;
|
||||
gphy->radio_off_context.valid = 1;
|
||||
gphy->radio_off_context.valid = true;
|
||||
b43_phy_write(dev, B43_PHY_RFOVER, rfover | 0x008C);
|
||||
b43_phy_write(dev, B43_PHY_RFOVERVAL, rfoverval & 0xFF73);
|
||||
}
|
||||
@@ -2711,10 +2711,10 @@ static int b43_gphy_op_interf_mitigation(struct b43_wldev *dev,
|
||||
if ((phy->rev == 0) || (!phy->gmode))
|
||||
return -ENODEV;
|
||||
|
||||
gphy->aci_wlan_automatic = 0;
|
||||
gphy->aci_wlan_automatic = false;
|
||||
switch (mode) {
|
||||
case B43_INTERFMODE_AUTOWLAN:
|
||||
gphy->aci_wlan_automatic = 1;
|
||||
gphy->aci_wlan_automatic = true;
|
||||
if (gphy->aci_enable)
|
||||
mode = B43_INTERFMODE_MANUALWLAN;
|
||||
else
|
||||
@@ -2735,8 +2735,8 @@ static int b43_gphy_op_interf_mitigation(struct b43_wldev *dev,
|
||||
b43_radio_interference_mitigation_disable(dev, currentmode);
|
||||
|
||||
if (mode == B43_INTERFMODE_NONE) {
|
||||
gphy->aci_enable = 0;
|
||||
gphy->aci_hw_rssi = 0;
|
||||
gphy->aci_enable = false;
|
||||
gphy->aci_hw_rssi = false;
|
||||
} else
|
||||
b43_radio_interference_mitigation_enable(dev, mode);
|
||||
gphy->interfmode = mode;
|
||||
|
@@ -736,9 +736,9 @@ static void lpphy_set_deaf(struct b43_wldev *dev, bool user)
|
||||
struct b43_phy_lp *lpphy = dev->phy.lp;
|
||||
|
||||
if (user)
|
||||
lpphy->crs_usr_disable = 1;
|
||||
lpphy->crs_usr_disable = true;
|
||||
else
|
||||
lpphy->crs_sys_disable = 1;
|
||||
lpphy->crs_sys_disable = true;
|
||||
b43_phy_maskset(dev, B43_LPPHY_CRSGAIN_CTL, 0xFF1F, 0x80);
|
||||
}
|
||||
|
||||
@@ -747,9 +747,9 @@ static void lpphy_clear_deaf(struct b43_wldev *dev, bool user)
|
||||
struct b43_phy_lp *lpphy = dev->phy.lp;
|
||||
|
||||
if (user)
|
||||
lpphy->crs_usr_disable = 0;
|
||||
lpphy->crs_usr_disable = false;
|
||||
else
|
||||
lpphy->crs_sys_disable = 0;
|
||||
lpphy->crs_sys_disable = false;
|
||||
|
||||
if (!lpphy->crs_usr_disable && !lpphy->crs_sys_disable) {
|
||||
if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ)
|
||||
|
@@ -3375,7 +3375,7 @@ static int b43_nphy_cal_tx_iq_lo(struct b43_wldev *dev,
|
||||
|
||||
if (dev->phy.rev >= 4) {
|
||||
avoid = nphy->hang_avoid;
|
||||
nphy->hang_avoid = 0;
|
||||
nphy->hang_avoid = false;
|
||||
}
|
||||
|
||||
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,
|
||||
|
||||
if (phy6or5x && updated[core] == 0) {
|
||||
b43_nphy_update_tx_cal_ladder(dev, core);
|
||||
updated[core] = 1;
|
||||
updated[core] = true;
|
||||
}
|
||||
|
||||
tmp = (params[core].ncorr[type] << 8) | 0x66;
|
||||
|
@@ -539,7 +539,7 @@ int b43_pio_tx(struct b43_wldev *dev, struct sk_buff *skb)
|
||||
/* Not enough memory on the queue. */
|
||||
err = -EBUSY;
|
||||
ieee80211_stop_queue(dev->wl->hw, skb_get_queue_mapping(skb));
|
||||
q->stopped = 1;
|
||||
q->stopped = true;
|
||||
goto out;
|
||||
}
|
||||
|
||||
@@ -566,7 +566,7 @@ int b43_pio_tx(struct b43_wldev *dev, struct sk_buff *skb)
|
||||
(q->free_packet_slots == 0)) {
|
||||
/* The queue is full. */
|
||||
ieee80211_stop_queue(dev->wl->hw, skb_get_queue_mapping(skb));
|
||||
q->stopped = 1;
|
||||
q->stopped = true;
|
||||
}
|
||||
|
||||
out:
|
||||
@@ -601,7 +601,7 @@ void b43_pio_handle_txstatus(struct b43_wldev *dev,
|
||||
|
||||
if (q->stopped) {
|
||||
ieee80211_wake_queue(dev->wl->hw, q->queue_prio);
|
||||
q->stopped = 0;
|
||||
q->stopped = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -874,7 +874,7 @@ bool b43_fill_txstatus_report(struct b43_wldev *dev,
|
||||
struct ieee80211_tx_info *report,
|
||||
const struct b43_txstatus *status)
|
||||
{
|
||||
bool frame_success = 1;
|
||||
bool frame_success = true;
|
||||
int retry_limit;
|
||||
|
||||
/* preserve the confiured retry limit before clearing the status
|
||||
@@ -890,7 +890,7 @@ bool b43_fill_txstatus_report(struct b43_wldev *dev,
|
||||
/* The frame was not ACKed... */
|
||||
if (!(report->flags & IEEE80211_TX_CTL_NO_ACK)) {
|
||||
/* ...but we expected an ACK. */
|
||||
frame_success = 0;
|
||||
frame_success = false;
|
||||
}
|
||||
}
|
||||
if (status->frame_count == 0) {
|
||||
|
Ссылка в новой задаче
Block a user