diff options
Diffstat (limited to 'drivers/staging/vt6656')
-rw-r--r-- | drivers/staging/vt6656/card.c | 2 | ||||
-rw-r--r-- | drivers/staging/vt6656/device.h | 2 | ||||
-rw-r--r-- | drivers/staging/vt6656/main_usb.c | 21 | ||||
-rw-r--r-- | drivers/staging/vt6656/rxtx.c | 2 | ||||
-rw-r--r-- | drivers/staging/vt6656/usbpipe.c | 2 |
5 files changed, 10 insertions, 19 deletions
diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c index 67ff13f4f..a215563de 100644 --- a/drivers/staging/vt6656/card.c +++ b/drivers/staging/vt6656/card.c @@ -389,7 +389,7 @@ void vnt_update_ifs(struct vnt_private *priv) } } - if (ofdm_rate == true) + if (ofdm_rate) max_min = 4; else max_min = 5; diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h index f71d59fa3..635d931de 100644 --- a/drivers/staging/vt6656/device.h +++ b/drivers/staging/vt6656/device.h @@ -364,7 +364,7 @@ struct vnt_private { /* Power save */ u16 current_aid; - /* Beacon releated */ + /* Beacon related */ u16 seq_counter; enum vnt_cmd_state command_state; diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index 766fdcece..af572d718 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -522,7 +522,7 @@ static int vnt_start(struct ieee80211_hw *hw) priv->rx_buf_sz = MAX_TOTAL_SIZE_WITH_ALL_HEADERS; - if (vnt_alloc_bufs(priv) == false) { + if (!vnt_alloc_bufs(priv)) { dev_dbg(&priv->usb->dev, "vnt_alloc_bufs fail...\n"); return -ENOMEM; } @@ -785,8 +785,7 @@ static void vnt_configure(struct ieee80211_hw *hw, u8 rx_mode = 0; int rc; - *total_flags &= FIF_ALLMULTI | FIF_OTHER_BSS | FIF_PROMISC_IN_BSS | - FIF_BCN_PRBRESP_PROMISC; + *total_flags &= FIF_ALLMULTI | FIF_OTHER_BSS | FIF_BCN_PRBRESP_PROMISC; rc = vnt_control_in(priv, MESSAGE_TYPE_READ, MAC_REG_RCR, MESSAGE_REQUEST_MACREG, sizeof(u8), &rx_mode); @@ -796,14 +795,6 @@ static void vnt_configure(struct ieee80211_hw *hw, dev_dbg(&priv->usb->dev, "rx mode in = %x\n", rx_mode); - if (changed_flags & FIF_PROMISC_IN_BSS) { - /* unconditionally log net taps */ - if (*total_flags & FIF_PROMISC_IN_BSS) - rx_mode |= RCR_UNICAST; - else - rx_mode &= ~RCR_UNICAST; - } - if (changed_flags & FIF_ALLMULTI) { if (*total_flags & FIF_ALLMULTI) { if (priv->mc_list_count > 2) @@ -987,10 +978,10 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id) wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC) | BIT(NL80211_IFTYPE_AP); - priv->hw->flags = IEEE80211_HW_RX_INCLUDES_FCS | - IEEE80211_HW_REPORTS_TX_ACK_STATUS | - IEEE80211_HW_SIGNAL_DBM | - IEEE80211_HW_TIMING_BEACON_ONLY; + ieee80211_hw_set(priv->hw, TIMING_BEACON_ONLY); + ieee80211_hw_set(priv->hw, SIGNAL_DBM); + ieee80211_hw_set(priv->hw, RX_INCLUDES_FCS); + ieee80211_hw_set(priv->hw, REPORTS_TX_ACK_STATUS); priv->hw->max_signal = 100; diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 5c589962a..8116791f4 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -87,7 +87,7 @@ static struct vnt_usb_send_context return NULL; context = priv->tx_context[ii]; - if (context->in_use == false) { + if (!context->in_use) { context->in_use = true; memset(context->data, 0, MAX_TOTAL_SIZE_WITH_ALL_HEADERS); diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c index 88bf518f2..a5912dde9 100644 --- a/drivers/staging/vt6656/usbpipe.c +++ b/drivers/staging/vt6656/usbpipe.c @@ -141,7 +141,7 @@ int vnt_start_interrupt_urb(struct vnt_private *priv) { int status = STATUS_FAILURE; - if (priv->int_buf.in_use == true) + if (priv->int_buf.in_use) return STATUS_FAILURE; priv->int_buf.in_use = true; |