diff options
Diffstat (limited to 'drivers/net/wireless/zd1211rw/zd_mac.c')
| -rw-r--r-- | drivers/net/wireless/zd1211rw/zd_mac.c | 1559 |
1 files changed, 601 insertions, 958 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c index 5298a8bf112..49127e4b42c 100644 --- a/drivers/net/wireless/zd1211rw/zd_mac.c +++ b/drivers/net/wireless/zd1211rw/zd_mac.c @@ -1,4 +1,9 @@ -/* zd_mac.c +/* ZD1211 USB-WLAN driver for Linux + * + * Copyright (C) 2005-2007 Ulrich Kunitz <kune@deine-taler.de> + * Copyright (C) 2006-2007 Daniel Drake <dsd@gentoo.org> + * Copyright (C) 2006-2007 Michael Wu <flamingice@sourmilk.net> + * Copyright (c) 2007 Luis R. Rodriguez <mcgrof@winlab.rutgers.edu> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,7 +22,6 @@ #include <linux/netdevice.h> #include <linux/etherdevice.h> -#include <linux/wireless.h> #include <linux/usb.h> #include <linux/jiffies.h> #include <net/ieee80211_radiotap.h> @@ -26,81 +30,105 @@ #include "zd_chip.h" #include "zd_mac.h" #include "zd_ieee80211.h" -#include "zd_netdev.h" #include "zd_rf.h" -static void ieee_init(struct ieee80211_device *ieee); -static void softmac_init(struct ieee80211softmac_device *sm); -static void set_rts_cts_work(struct work_struct *work); -static void set_basic_rates_work(struct work_struct *work); +/* This table contains the hardware specific values for the modulation rates. */ +static const struct ieee80211_rate zd_rates[] = { + { .rate = 10, + .val = ZD_CCK_RATE_1M, + .flags = IEEE80211_RATE_CCK }, + { .rate = 20, + .val = ZD_CCK_RATE_2M, + .val2 = ZD_CCK_RATE_2M | ZD_CCK_PREA_SHORT, + .flags = IEEE80211_RATE_CCK_2 }, + { .rate = 55, + .val = ZD_CCK_RATE_5_5M, + .val2 = ZD_CCK_RATE_5_5M | ZD_CCK_PREA_SHORT, + .flags = IEEE80211_RATE_CCK_2 }, + { .rate = 110, + .val = ZD_CCK_RATE_11M, + .val2 = ZD_CCK_RATE_11M | ZD_CCK_PREA_SHORT, + .flags = IEEE80211_RATE_CCK_2 }, + { .rate = 60, + .val = ZD_OFDM_RATE_6M, + .flags = IEEE80211_RATE_OFDM }, + { .rate = 90, + .val = ZD_OFDM_RATE_9M, + .flags = IEEE80211_RATE_OFDM }, + { .rate = 120, + .val = ZD_OFDM_RATE_12M, + .flags = IEEE80211_RATE_OFDM }, + { .rate = 180, + .val = ZD_OFDM_RATE_18M, + .flags = IEEE80211_RATE_OFDM }, + { .rate = 240, + .val = ZD_OFDM_RATE_24M, + .flags = IEEE80211_RATE_OFDM }, + { .rate = 360, + .val = ZD_OFDM_RATE_36M, + .flags = IEEE80211_RATE_OFDM }, + { .rate = 480, + .val = ZD_OFDM_RATE_48M, + .flags = IEEE80211_RATE_OFDM }, + { .rate = 540, + .val = ZD_OFDM_RATE_54M, + .flags = IEEE80211_RATE_OFDM }, +}; + +static const struct ieee80211_channel zd_channels[] = { + { .chan = 1, + .freq = 2412}, + { .chan = 2, + .freq = 2417}, + { .chan = 3, + .freq = 2422}, + { .chan = 4, + .freq = 2427}, + { .chan = 5, + .freq = 2432}, + { .chan = 6, + .freq = 2437}, + { .chan = 7, + .freq = 2442}, + { .chan = 8, + .freq = 2447}, + { .chan = 9, + .freq = 2452}, + { .chan = 10, + .freq = 2457}, + { .chan = 11, + .freq = 2462}, + { .chan = 12, + .freq = 2467}, + { .chan = 13, + .freq = 2472}, + { .chan = 14, + .freq = 2484} +}; static void housekeeping_init(struct zd_mac *mac); static void housekeeping_enable(struct zd_mac *mac); static void housekeeping_disable(struct zd_mac *mac); -static void set_multicast_hash_handler(struct work_struct *work); - -static void do_rx(unsigned long mac_ptr); - -int zd_mac_init(struct zd_mac *mac, - struct net_device *netdev, - struct usb_interface *intf) -{ - struct ieee80211_device *ieee = zd_netdev_ieee80211(netdev); - - memset(mac, 0, sizeof(*mac)); - spin_lock_init(&mac->lock); - mac->netdev = netdev; - INIT_DELAYED_WORK(&mac->set_rts_cts_work, set_rts_cts_work); - INIT_DELAYED_WORK(&mac->set_basic_rates_work, set_basic_rates_work); - - skb_queue_head_init(&mac->rx_queue); - tasklet_init(&mac->rx_tasklet, do_rx, (unsigned long)mac); - tasklet_disable(&mac->rx_tasklet); - - ieee_init(ieee); - softmac_init(ieee80211_priv(netdev)); - zd_chip_init(&mac->chip, netdev, intf); - housekeeping_init(mac); - INIT_WORK(&mac->set_multicast_hash_work, set_multicast_hash_handler); - return 0; -} - -static int reset_channel(struct zd_mac *mac) -{ - int r; - unsigned long flags; - const struct channel_range *range; - - spin_lock_irqsave(&mac->lock, flags); - range = zd_channel_range(mac->regdomain); - if (!range->start) { - r = -EINVAL; - goto out; - } - mac->requested_channel = range->start; - r = 0; -out: - spin_unlock_irqrestore(&mac->lock, flags); - return r; -} - -int zd_mac_preinit_hw(struct zd_mac *mac) +int zd_mac_preinit_hw(struct ieee80211_hw *hw) { int r; u8 addr[ETH_ALEN]; + struct zd_mac *mac = zd_hw_mac(hw); r = zd_chip_read_mac_addr_fw(&mac->chip, addr); if (r) return r; - memcpy(mac->netdev->dev_addr, addr, ETH_ALEN); + SET_IEEE80211_PERM_ADDR(hw, addr); + return 0; } -int zd_mac_init_hw(struct zd_mac *mac) +int zd_mac_init_hw(struct ieee80211_hw *hw) { int r; + struct zd_mac *mac = zd_hw_mac(hw); struct zd_chip *chip = &mac->chip; u8 default_regdomain; @@ -116,22 +144,9 @@ int zd_mac_init_hw(struct zd_mac *mac) r = zd_read_regdomain(chip, &default_regdomain); if (r) goto disable_int; - if (!zd_regdomain_supported(default_regdomain)) { - /* The vendor driver overrides the regulatory domain and - * allowed channel registers and unconditionally restricts - * available channels to 1-11 everywhere. Match their - * questionable behaviour only for regdomains which we don't - * recognise. */ - dev_warn(zd_mac_dev(mac), "Unrecognised regulatory domain: " - "%#04x. Defaulting to FCC.\n", default_regdomain); - default_regdomain = ZD_REGDOMAIN_FCC; - } spin_lock_irq(&mac->lock); mac->regdomain = mac->default_regdomain = default_regdomain; spin_unlock_irq(&mac->lock); - r = reset_channel(mac); - if (r) - goto disable_int; /* We must inform the device that we are doing encryption/decryption in * software at the moment. */ @@ -139,9 +154,7 @@ int zd_mac_init_hw(struct zd_mac *mac) if (r) goto disable_int; - r = zd_geo_init(zd_mac_to_ieee80211(mac), mac->regdomain); - if (r) - goto disable_int; + zd_geo_init(hw, mac->regdomain); r = 0; disable_int: @@ -153,8 +166,6 @@ out: void zd_mac_clear(struct zd_mac *mac) { flush_workqueue(zd_workqueue); - skb_queue_purge(&mac->rx_queue); - tasklet_kill(&mac->rx_tasklet); zd_chip_clear(&mac->chip); ZD_ASSERT(!spin_is_locked(&mac->lock)); ZD_MEMCLEAR(mac, sizeof(struct zd_mac)); @@ -162,34 +173,27 @@ void zd_mac_clear(struct zd_mac *mac) static int set_rx_filter(struct zd_mac *mac) { - struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac); - u32 filter = (ieee->iw_mode == IW_MODE_MONITOR) ? ~0 : STA_RX_FILTER; - return zd_iowrite32(&mac->chip, CR_RX_FILTER, filter); -} + unsigned long flags; + u32 filter = STA_RX_FILTER; -static int set_sniffer(struct zd_mac *mac) -{ - struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac); - return zd_iowrite32(&mac->chip, CR_SNIFFER_ON, - ieee->iw_mode == IW_MODE_MONITOR ? 1 : 0); - return 0; + spin_lock_irqsave(&mac->lock, flags); + if (mac->pass_ctrl) + filter |= RX_FILTER_CTRL; + spin_unlock_irqrestore(&mac->lock, flags); + + return zd_iowrite32(&mac->chip, CR_RX_FILTER, filter); } static int set_mc_hash(struct zd_mac *mac) { struct zd_mc_hash hash; - struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac); - zd_mc_clear(&hash); - if (ieee->iw_mode == IW_MODE_MONITOR) - zd_mc_add_all(&hash); - return zd_chip_set_multicast_hash(&mac->chip, &hash); } -int zd_mac_open(struct net_device *netdev) +static int zd_op_start(struct ieee80211_hw *hw) { - struct zd_mac *mac = zd_netdev_mac(netdev); + struct zd_mac *mac = zd_hw_mac(hw); struct zd_chip *chip = &mac->chip; struct zd_usb *usb = &chip->usb; int r; @@ -200,46 +204,33 @@ int zd_mac_open(struct net_device *netdev) goto out; } - tasklet_enable(&mac->rx_tasklet); - r = zd_chip_enable_int(chip); if (r < 0) goto out; - r = zd_write_mac_addr(chip, netdev->dev_addr); - if (r) - goto disable_int; - r = zd_chip_set_basic_rates(chip, CR_RATES_80211B | CR_RATES_80211G); if (r < 0) goto disable_int; r = set_rx_filter(mac); if (r) goto disable_int; - r = set_sniffer(mac); - if (r) - goto disable_int; r = set_mc_hash(mac); if (r) goto disable_int; r = zd_chip_switch_radio_on(chip); if (r < 0) goto disable_int; - r = zd_chip_set_channel(chip, mac->requested_channel); - if (r < 0) - goto disable_radio; - r = zd_chip_enable_rx(chip); + r = zd_chip_enable_rxtx(chip); if (r < 0) goto disable_radio; r = zd_chip_enable_hwint(chip); if (r < 0) - goto disable_rx; + goto disable_rxtx; housekeeping_enable(mac); - ieee80211softmac_start(netdev); return 0; -disable_rx: - zd_chip_disable_rx(chip); +disable_rxtx: + zd_chip_disable_rxtx(chip); disable_radio: zd_chip_switch_radio_off(chip); disable_int: @@ -248,494 +239,190 @@ out: return r; } -int zd_mac_stop(struct net_device *netdev) +/** + * clear_tx_skb_control_block - clears the control block of tx skbuffs + * @skb: a &struct sk_buff pointer + * + * This clears the control block of skbuff buffers, which were transmitted to + * the device. Notify that the function is not thread-safe, so prevent + * multiple calls. + */ +static void clear_tx_skb_control_block(struct sk_buff *skb) { - struct zd_mac *mac = zd_netdev_mac(netdev); - struct zd_chip *chip = &mac->chip; + struct zd_tx_skb_control_block *cb = + (struct zd_tx_skb_control_block *)skb->cb; - netif_stop_queue(netdev); + kfree(cb->control); + cb->control = NULL; +} - /* - * The order here deliberately is a little different from the open() +/** + * kfree_tx_skb - frees a tx skbuff + * @skb: a &struct sk_buff pointer + * + * Frees the tx skbuff. Frees also the allocated control structure in the + * control block if necessary. + */ +static void kfree_tx_skb(struct sk_buff *skb) +{ + clear_tx_skb_control_block(skb); + dev_kfree_skb_any(skb); +} + +static void zd_op_stop(struct ieee80211_hw *hw) +{ + struct zd_mac *mac = zd_hw_mac(hw); + struct zd_chip *chip = &mac->chip; + struct sk_buff *skb; + struct sk_buff_head *ack_wait_queue = &mac->ack_wait_queue; + + /* The order here deliberately is a little different from the open() * method, since we need to make sure there is no opportunity for RX - * frames to be processed by softmac after we have stopped it. + * frames to be processed by mac80211 after we have stopped it. */ - zd_chip_disable_rx(chip); - skb_queue_purge(&mac->rx_queue); - tasklet_disable(&mac->rx_tasklet); + zd_chip_disable_rxtx(chip); housekeeping_disable(mac); - ieee80211softmac_stop(netdev); - - /* Ensure no work items are running or queued from this point */ - cancel_delayed_work(&mac->set_rts_cts_work); - cancel_delayed_work(&mac->set_basic_rates_work); flush_workqueue(zd_workqueue); - mac->updating_rts_rate = 0; - mac->updating_basic_rates = 0; zd_chip_disable_hwint(chip); zd_chip_switch_radio_off(chip); zd_chip_disable_int(chip); - return 0; -} - -int zd_mac_set_mac_address(struct net_device *netdev, void *p) -{ - int r; - unsigned long flags; - struct sockaddr *addr = p; - struct zd_mac *mac = zd_netdev_mac(netdev); - struct zd_chip *chip = &mac->chip; - DECLARE_MAC_BUF(mac2); - - if (!is_valid_ether_addr(addr->sa_data)) - return -EADDRNOTAVAIL; - - dev_dbg_f(zd_mac_dev(mac), - "Setting MAC to %s\n", print_mac(mac2, addr->sa_data)); - - if (netdev->flags & IFF_UP) { - r = zd_write_mac_addr(chip, addr->sa_data); - if (r) - return r; - } - - spin_lock_irqsave(&mac->lock, flags); - memcpy(netdev->dev_addr, addr->sa_data, ETH_ALEN); - spin_unlock_irqrestore(&mac->lock, flags); - - return 0; -} - -static void set_multicast_hash_handler(struct work_struct *work) -{ - struct zd_mac *mac = container_of(work, struct zd_mac, - set_multicast_hash_work); - struct zd_mc_hash hash; - - spin_lock_irq(&mac->lock); - hash = mac->multicast_hash; - spin_unlock_irq(&mac->lock); - zd_chip_set_multicast_hash(&mac->chip, &hash); + while ((skb = skb_dequeue(ack_wait_queue))) + kfree_tx_skb(skb); } -void zd_mac_set_multicast_list(struct net_device *dev) -{ - struct zd_mac *mac = zd_netdev_mac(dev); - struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac); - struct zd_mc_hash hash; - struct dev_mc_list *mc; - unsigned long flags; - DECLARE_MAC_BUF(mac2); - - if (dev->flags & (IFF_PROMISC|IFF_ALLMULTI) || - ieee->iw_mode == IW_MODE_MONITOR) { - zd_mc_add_all(&hash); - } else { - zd_mc_clear(&hash); - for (mc = dev->mc_list; mc; mc = mc->next) { - dev_dbg_f(zd_mac_dev(mac), "mc addr %s\n", - print_mac(mac2, mc->dmi_addr)); - zd_mc_add_addr(&hash, mc->dmi_addr); - } - } - - spin_lock_irqsave(&mac->lock, flags); - mac->multicast_hash = hash; - spin_unlock_irqrestore(&mac->lock, flags); - queue_work(zd_workqueue, &mac->set_multicast_hash_work); -} - -int zd_mac_set_regdomain(struct zd_mac *mac, u8 regdomain) -{ - int r; - u8 channel; - - ZD_ASSERT(!irqs_disabled()); - spin_lock_irq(&mac->lock); - if (regdomain == 0) { - regdomain = mac->default_regdomain; - } - if (!zd_regdomain_supported(regdomain)) { - spin_unlock_irq(&mac->lock); - return -EINVAL; - } - mac->regdomain = regdomain; - channel = mac->requested_channel; - spin_unlock_irq(&mac->lock); - - r = zd_geo_init(zd_mac_to_ieee80211(mac), regdomain); - if (r) - return r; - if (!zd_regdomain_supports_channel(regdomain, channel)) { - r = reset_channel(mac); - if (r) - return r; - } +/** + * init_tx_skb_control_block - initializes skb control block + * @skb: a &sk_buff pointer + * @dev: pointer to the mac80221 device + * @control: mac80211 tx control applying for the frame in @skb + * + * Initializes the control block of the skbuff to be transmitted. + */ +static int init_tx_skb_control_block(struct sk_buff *skb, + struct ieee80211_hw *hw, + struct ieee80211_tx_control *control) +{ + struct zd_tx_skb_control_block *cb = + (struct zd_tx_skb_control_block *)skb->cb; + + ZD_ASSERT(sizeof(*cb) <= sizeof(skb->cb)); + memset(cb, 0, sizeof(*cb)); + cb->hw= hw; + cb->control = kmalloc(sizeof(*control), GFP_ATOMIC); + if (cb->control == NULL) + return -ENOMEM; + memcpy(cb->control, control, sizeof(*control)); return 0; } -u8 zd_mac_get_regdomain(struct zd_mac *mac) -{ - unsigned long flags; - u8 regdomain; - - spin_lock_irqsave(&mac->lock, flags); - regdomain = mac->regdomain; - spin_unlock_irqrestore(&mac->lock, flags); - return regdomain; -} - -/* Fallback to lowest rate, if rate is unknown. */ -static u8 rate_to_zd_rate(u8 rate) -{ - switch (rate) { - case IEEE80211_CCK_RATE_2MB: - return ZD_CCK_RATE_2M; - case IEEE80211_CCK_RATE_5MB: - return ZD_CCK_RATE_5_5M; - case IEEE80211_CCK_RATE_11MB: - return ZD_CCK_RATE_11M; - case IEEE80211_OFDM_RATE_6MB: - return ZD_OFDM_RATE_6M; - case IEEE80211_OFDM_RATE_9MB: - return ZD_OFDM_RATE_9M; - case IEEE80211_OFDM_RATE_12MB: - return ZD_OFDM_RATE_12M; - case IEEE80211_OFDM_RATE_18MB: - return ZD_OFDM_RATE_18M; - case IEEE80211_OFDM_RATE_24MB: - return ZD_OFDM_RATE_24M; - case IEEE80211_OFDM_RATE_36MB: - return ZD_OFDM_RATE_36M; - case IEEE80211_OFDM_RATE_48MB: - return ZD_OFDM_RATE_48M; - case IEEE80211_OFDM_RATE_54MB: - return ZD_OFDM_RATE_54M; - } - return ZD_CCK_RATE_1M; -} - -static u16 rate_to_cr_rate(u8 rate) -{ - switch (rate) { - case IEEE80211_CCK_RATE_2MB: - return CR_RATE_1M; - case IEEE80211_CCK_RATE_5MB: - return CR_RATE_5_5M; - case IEEE80211_CCK_RATE_11MB: - return CR_RATE_11M; - case IEEE80211_OFDM_RATE_6MB: - return CR_RATE_6M; - case IEEE80211_OFDM_RATE_9MB: - return CR_RATE_9M; - case IEEE80211_OFDM_RATE_12MB: - return CR_RATE_12M; - case IEEE80211_OFDM_RATE_18MB: - return CR_RATE_18M; - case IEEE80211_OFDM_RATE_24MB: - return CR_RATE_24M; - case IEEE80211_OFDM_RATE_36MB: - return CR_RATE_36M; - case IEEE80211_OFDM_RATE_48MB: - return CR_RATE_48M; - case IEEE80211_OFDM_RATE_54MB: - return CR_RATE_54M; - } - return CR_RATE_1M; -} - -static void try_enable_tx(struct zd_mac *mac) -{ - unsigned long flags; - - spin_lock_irqsave(&mac->lock, flags); - if (mac->updating_rts_rate == 0 && mac->updating_basic_rates == 0) - netif_wake_queue(mac->netdev); - spin_unlock_irqrestore(&mac->lock, flags); -} - -static void set_rts_cts_work(struct work_struct *work) +/** + * tx_status - reports tx status of a packet if required + * @hw - a &struct ieee80211_hw pointer + * @skb - a sk-buffer + * @status - the tx status of the packet without control information + * @success - True for successfull transmission of the frame + * + * This information calls ieee80211_tx_status_irqsafe() if required by the + * control information. It copies the control information into the status + * information. + * + * If no status information has been requested, the skb is freed. + */ +static void tx_status(struct ieee80211_hw *hw, struct sk_buff *skb, + struct ieee80211_tx_status *status, + bool success) { - struct zd_mac *mac = - container_of(work, struct zd_mac, set_rts_cts_work.work); - unsigned long flags; - u8 rts_rate; - unsigned int short_preamble; - - mutex_lock(&mac->chip.mutex); - - spin_lock_irqsave(&mac->lock, flags); - mac->updating_rts_rate = 0; - rts_rate = mac->rts_rate; - short_preamble = mac->short_preamble; - spin_unlock_irqrestore(&mac->lock, flags); - - zd_chip_set_rts_cts_rate_locked(&mac->chip, rts_rate, short_preamble); - mutex_unlock(&mac->chip.mutex); + struct zd_tx_skb_control_block *cb = (struct zd_tx_skb_control_block *) + skb->cb; - try_enable_tx(mac); + ZD_ASSERT(cb->control != NULL); + memcpy(&status->control, cb->control, sizeof(status->control)); + if (!success) + status->excessive_retries = 1; + clear_tx_skb_control_block(skb); + ieee80211_tx_status_irqsafe(hw, skb, status); } -static void set_basic_rates_work(struct work_struct *work) +/** + * zd_mac_tx_failed - callback for failed frames + * @dev: the mac80211 wireless device + * + * This function is called if a frame couldn't be succesfully be + * transferred. The first frame from the tx queue, will be selected and + * reported as error to the upper layers. + */ +void zd_mac_tx_failed(struct ieee80211_hw *hw) { - struct zd_mac *mac = - container_of(work, struct zd_mac, set_basic_rates_work.work); - unsigned long flags; - u16 basic_rates; - - mutex_lock(&mac->chip.mutex); - - spin_lock_irqsave(&mac->lock, flags); - mac->updating_basic_rates = 0; - basic_rates = mac->basic_rates; - spin_unlock_irqrestore(&mac->lock, flags); - - zd_chip_set_basic_rates_locked(&mac->chip, basic_rates); - mutex_unlock(&mac->chip.mutex); + struct sk_buff_head *q = &zd_hw_mac(hw)->ack_wait_queue; + struct sk_buff *skb; + struct ieee80211_tx_status status = {{0}}; - try_enable_tx(mac); + skb = skb_dequeue(q); + if (skb == NULL) + return; + tx_status(hw, skb, &status, 0); } -static void bssinfo_change(struct net_device *netdev, u32 changes) -{ - struct zd_mac *mac = zd_netdev_mac(netdev); - struct ieee80211softmac_device *softmac = ieee80211_priv(netdev); - struct ieee80211softmac_bss_info *bssinfo = &softmac->bssinfo; - int need_set_rts_cts = 0; - int need_set_rates = 0; - u16 basic_rates; - unsigned long flags; - - dev_dbg_f(zd_mac_dev(mac), "changes: %x\n", changes); - - if (changes & IEEE80211SOFTMAC_BSSINFOCHG_SHORT_PREAMBLE) { - spin_lock_irqsave(&mac->lock, flags); - mac->short_preamble = bssinfo->short_preamble; - spin_unlock_irqrestore(&mac->lock, flags); - need_set_rts_cts = 1; - } - - if (changes & IEEE80211SOFTMAC_BSSINFOCHG_RATES) { - /* Set RTS rate to highest available basic rate */ - u8 hi_rate = ieee80211softmac_highest_supported_rate(softmac, - &bssinfo->supported_rates, 1); - hi_rate = rate_to_zd_rate(hi_rate); - - spin_lock_irqsave(&mac->lock, flags); - if (hi_rate != mac->rts_rate) { - mac->rts_rate = hi_rate; - need_set_rts_cts = 1; - } - spin_unlock_irqrestore(&mac->lock, flags); - - /* Set basic rates */ - need_set_rates = 1; - if (bssinfo->supported_rates.count == 0) { - /* Allow the device to be flexible */ - basic_rates = CR_RATES_80211B | CR_RATES_80211G; +/** + * zd_mac_tx_to_dev - callback for USB layer + * @skb: a &sk_buff pointer + * @error: error value, 0 if transmission successful + * + * Informs the MAC layer that the frame has successfully transferred to the + * device. If an ACK is required and the transfer to the device has been + * successful, the packets are put on the @ack_wait_queue with + * the control set removed. + */ +void zd_mac_tx_to_dev(struct sk_buff *skb, int error) +{ + struct zd_tx_skb_control_block *cb = + (struct zd_tx_skb_control_block *)skb->cb; + struct ieee80211_hw *hw = cb->hw; + + if (likely(cb->control)) { + skb_pull(skb, sizeof(struct zd_ctrlset)); + if (unlikely(error || + (cb->control->flags & IEEE80211_TXCTL_NO_ACK))) + { + struct ieee80211_tx_status status = {{0}}; + tx_status(hw, skb, &status, !error); } else { - int i = 0; - basic_rates = 0; - - for (i = 0; i < bssinfo->supported_rates.count; i++) { - u16 rate = bssinfo->supported_rates.rates[i]; - if ((rate & IEEE80211_BASIC_RATE_MASK) == 0) - continue; + struct sk_buff_head *q = + &zd_hw_mac(hw)->ack_wait_queue; - rate &= ~IEEE80211_BASIC_RATE_MASK; - basic_rates |= rate_to_cr_rate(rate); - } + skb_queue_tail(q, skb); + while (skb_queue_len(q) > ZD_MAC_MAX_ACK_WAITERS) + zd_mac_tx_failed(hw); } - spin_lock_irqsave(&mac->lock, flags); - mac->basic_rates = basic_rates; - spin_unlock_irqrestore(&mac->lock, flags); - } - - /* Schedule any changes we made above */ - - spin_lock_irqsave(&mac->lock, flags); - if (need_set_rts_cts && !mac->updating_rts_rate) { - mac->updating_rts_rate = 1; - netif_stop_queue(mac->netdev); - queue_delayed_work(zd_workqueue, &mac->set_rts_cts_work, 0); - } - if (need_set_rates && !mac->updating_basic_rates) { - mac->updating_basic_rates = 1; - netif_stop_queue(mac->netdev); - queue_delayed_work(zd_workqueue, &mac->set_basic_rates_work, - 0); - } - spin_unlock_irqrestore(&mac->lock, flags); -} - -static void set_channel(struct net_device *netdev, u8 channel) -{ - struct zd_mac *mac = zd_netdev_mac(netdev); - - dev_dbg_f(zd_mac_dev(mac), "channel %d\n", channel); - - zd_chip_set_channel(&mac->chip, channel); -} - -int zd_mac_request_channel(struct zd_mac *mac, u8 channel) -{ - unsigned long lock_flags; - struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac); - - if (ieee->iw_mode == IW_MODE_INFRA) - return -EPERM; - - spin_lock_irqsave(&mac->lock, lock_flags); - if (!zd_regdomain_supports_channel(mac->regdomain, channel)) { - spin_unlock_irqrestore(&mac->lock, lock_flags); - return -EINVAL; - } - mac->requested_channel = channel; - spin_unlock_irqrestore(&mac->lock, lock_flags); - if (netif_running(mac->netdev)) - return zd_chip_set_channel(&mac->chip, channel); - else - return 0; -} - -u8 zd_mac_get_channel(struct zd_mac *mac) -{ - u8 channel = zd_chip_get_channel(&mac->chip); - - dev_dbg_f(zd_mac_dev(mac), "channel %u\n", channel); - return channel; -} - -int zd_mac_set_mode(struct zd_mac *mac, u32 mode) -{ - struct ieee80211_device *ieee; - - switch (mode) { - case IW_MODE_AUTO: - case IW_MODE_ADHOC: - case IW_MODE_INFRA: - mac->netdev->type = ARPHRD_ETHER; - break; - case IW_MODE_MONITOR: - mac->netdev->type = ARPHRD_IEEE80211_RADIOTAP; - break; - default: - dev_dbg_f(zd_mac_dev(mac), "wrong mode %u\n", mode); - return -EINVAL; - } - - ieee = zd_mac_to_ieee80211(mac); - ZD_ASSERT(!irqs_disabled()); - spin_lock_irq(&ieee->lock); - ieee->iw_mode = mode; - spin_unlock_irq(&ieee->lock); - - if (netif_running(mac->netdev)) { - int r = set_rx_filter(mac); - if (r) - return r; - return set_sniffer(mac); - } - - return 0; -} - -int zd_mac_get_mode(struct zd_mac *mac, u32 *mode) -{ - unsigned long flags; - struct ieee80211_device *ieee; - - ieee = zd_mac_to_ieee80211(mac); - spin_lock_irqsave(&ieee->lock, flags); - *mode = ieee->iw_mode; - spin_unlock_irqrestore(&ieee->lock, flags); - return 0; -} - -int zd_mac_get_range(struct zd_mac *mac, struct iw_range *range) -{ - int i; - const struct channel_range *channel_range; - u8 regdomain; - - memset(range, 0, sizeof(*range)); - - /* FIXME: Not so important and depends on the mode. For 802.11g - * usually this value is used. It seems to be that Bit/s number is - * given here. - */ - range->throughput = 27 * 1000 * 1000; - - range->max_qual.qual = 100; - range->max_qual.level = 100; - - /* FIXME: Needs still to be tuned. */ - range->avg_qual.qual = 71; - range->avg_qual.level = 80; - - /* FIXME: depends on standard? */ - range->min_rts = 256; - range->max_rts = 2346; - - range->min_frag = MIN_FRAG_THRESHOLD; - range->max_frag = MAX_FRAG_THRESHOLD; - - range->max_encoding_tokens = WEP_KEYS; - range->num_encoding_sizes = 2; - range->encoding_size[0] = 5; - range->encoding_size[1] = WEP_KEY_LEN; - - range->we_version_compiled = WIRELESS_EXT; - range->we_version_source = 20; - - range->enc_capa = IW_ENC_CAPA_WPA | IW_ENC_CAPA_WPA2 | - IW_ENC_CAPA_CIPHER_TKIP | IW_ENC_CAPA_CIPHER_CCMP; - - ZD_ASSERT(!irqs_disabled()); - spin_lock_irq(&mac->lock); - regdomain = mac->regdomain; - spin_unlock_irq(&mac->lock); - channel_range = zd_channel_range(regdomain); - - range->num_channels = channel_range->end - channel_range->start; - range->old_num_channels = range->num_channels; - range->num_frequency = range->num_channels; - range->old_num_frequency = range->num_frequency; - - for (i = 0; i < range->num_frequency; i++) { - struct iw_freq *freq = &range->freq[i]; - freq->i = channel_range->start + i; - zd_channel_to_freq(freq, freq->i); + } else { + kfree_tx_skb(skb); } - - return 0; } static int zd_calc_tx_length_us(u8 *service, u8 zd_rate, u16 tx_length) { /* ZD_PURE_RATE() must be used to remove the modulation type flag of - * the zd-rate values. */ + * the zd-rate values. + */ static const u8 rate_divisor[] = { - [ZD_PURE_RATE(ZD_CCK_RATE_1M)] = 1, - [ZD_PURE_RATE(ZD_CCK_RATE_2M)] = 2, - - /* bits must be doubled */ - [ZD_PURE_RATE(ZD_CCK_RATE_5_5M)] = 11, - - [ZD_PURE_RATE(ZD_CCK_RATE_11M)] = 11, - [ZD_PURE_RATE(ZD_OFDM_RATE_6M)] = 6, - [ZD_PURE_RATE(ZD_OFDM_RATE_9M)] = 9, - [ZD_PURE_RATE(ZD_OFDM_RATE_12M)] = 12, - [ZD_PURE_RATE(ZD_OFDM_RATE_18M)] = 18, - [ZD_PURE_RATE(ZD_OFDM_RATE_24M)] = 24, - [ZD_PURE_RATE(ZD_OFDM_RATE_36M)] = 36, - [ZD_PURE_RATE(ZD_OFDM_RATE_48M)] = 48, - [ZD_PURE_RATE(ZD_OFDM_RATE_54M)] = 54, + [ZD_PURE_RATE(ZD_CCK_RATE_1M)] = 1, + [ZD_PURE_RATE(ZD_CCK_RATE_2M)] = 2, + /* Bits must be doubled. */ + [ZD_PURE_RATE(ZD_CCK_RATE_5_5M)] = 11, + [ZD_PURE_RATE(ZD_CCK_RATE_11M)] = 11, + [ZD_PURE_RATE(ZD_OFDM_RATE_6M)] = 6, + [ZD_PURE_RATE(ZD_OFDM_RATE_9M)] = 9, + [ZD_PURE_RATE(ZD_OFDM_RATE_12M)] = 12, + [ZD_PURE_RATE(ZD_OFDM_RATE_18M)] = 18, + [ZD_PURE_RATE(ZD_OFDM_RATE_24M)] = 24, + [ZD_PURE_RATE(ZD_OFDM_RATE_36M)] = 36, + [ZD_PURE_RATE(ZD_OFDM_RATE_48M)] = 48, + [ZD_PURE_RATE(ZD_OFDM_RATE_54M)] = 54, }; u32 bits = (u32)tx_length * 8; @@ -764,34 +451,10 @@ static int zd_calc_tx_length_us(u8 *service, u8 zd_rate, u16 tx_length) return bits/divisor; } -static void cs_set_modulation(struct zd_mac *mac, struct zd_ctrlset *cs, - struct ieee80211_hdr_4addr *hdr) -{ - struct ieee80211softmac_device *softmac = ieee80211_priv(mac->netdev); - u16 ftype = WLAN_FC_GET_TYPE(le16_to_cpu(hdr->frame_ctl)); - u8 rate; - int is_mgt = (ftype == IEEE80211_FTYPE_MGMT) != 0; - int is_multicast = is_multicast_ether_addr(hdr->addr1); - int short_preamble = ieee80211softmac_short_preamble_ok(softmac, - is_multicast, is_mgt); - - rate = ieee80211softmac_suggest_txrate(softmac, is_multicast, is_mgt); - cs->modulation = rate_to_zd_rate(rate); - - /* Set short preamble bit when appropriate */ - if (short_preamble && ZD_MODULATION_TYPE(cs->modulation) == ZD_CCK - && cs->modulation != ZD_CCK_RATE_1M) - cs->modulation |= ZD_CCK_PREA_SHORT; -} - static void cs_set_control(struct zd_mac *mac, struct zd_ctrlset *cs, - struct ieee80211_hdr_4addr *header) + struct ieee80211_hdr *header, u32 flags) { - struct ieee80211softmac_device *softmac = ieee80211_priv(mac->netdev); - unsigned int tx_length = le16_to_cpu(cs->tx_length); - u16 fctl = le16_to_cpu(header->frame_ctl); - u16 ftype = WLAN_FC_GET_TYPE(fctl); - u16 stype = WLAN_FC_GET_STYPE(fctl); + u16 fctl = le16_to_cpu(header->frame_control); /* * CONTROL TODO: @@ -802,7 +465,7 @@ static void cs_set_control(struct zd_mac *mac, struct zd_ctrlset *cs, cs->control = 0; /* First fragment */ - if (WLAN_GET_SEQ_FRAG(le16_to_cpu(header->seq_ctl)) == 0) + if (flags & IEEE80211_TXCTL_FIRST_FRAGMENT) cs->control |= ZD_CS_NEED_RANDOM_BACKOFF; /* Multicast */ @@ -810,54 +473,37 @@ static void cs_set_control(struct zd_mac *mac, struct zd_ctrlset *cs, cs->control |= ZD_CS_MULTICAST; /* PS-POLL */ - if (ftype == IEEE80211_FTYPE_CTL && stype == IEEE80211_STYPE_PSPOLL) + if ((fctl & (IEEE80211_FCTL_FTYPE|IEEE80211_FCTL_STYPE)) == + (IEEE80211_FTYPE_CTL|IEEE80211_STYPE_PSPOLL)) cs->control |= ZD_CS_PS_POLL_FRAME; - /* Unicast data frames over the threshold should have RTS */ - if (!is_multicast_ether_addr(header->addr1) && - ftype != IEEE80211_FTYPE_MGMT && - tx_length > zd_netdev_ieee80211(mac->netdev)->rts) + if (flags & IEEE80211_TXCTL_USE_RTS_CTS) cs->control |= ZD_CS_RTS; - /* Use CTS-to-self protection if required */ - if (ZD_MODULATION_TYPE(cs->modulation) == ZD_OFDM && - ieee80211softmac_protection_needed(softmac)) { - /* FIXME: avoid sending RTS *and* self-CTS, is that correct? */ - cs->control &= ~ZD_CS_RTS; + if (flags & IEEE80211_TXCTL_USE_CTS_PROTECT) cs->control |= ZD_CS_SELF_CTS; - } /* FIXME: Management frame? */ } static int fill_ctrlset(struct zd_mac *mac, - struct ieee80211_txb *txb, - int frag_num) + struct sk_buff *skb, + struct ieee80211_tx_control *control) { int r; - struct sk_buff *skb = txb->fragments[frag_num]; - struct ieee80211_hdr_4addr *hdr = - (struct ieee80211_hdr_4addr *) skb->data; - unsigned int frag_len = skb->len + IEEE80211_FCS_LEN; - unsigned int next_frag_len; + struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; + unsigned int frag_len = skb->len + FCS_LEN; unsigned int packet_length; struct zd_ctrlset *cs = (struct zd_ctrlset *) skb_push(skb, sizeof(struct zd_ctrlset)); - if (frag_num+1 < txb->nr_frags) { - next_frag_len = txb->fragments[frag_num+1]->len + - IEEE80211_FCS_LEN; - } else { - next_frag_len = 0; - } ZD_ASSERT(frag_len <= 0xffff); - ZD_ASSERT(next_frag_len <= 0xffff); - cs_set_modulation(mac, cs, hdr); + cs->modulation = control->tx_rate; cs->tx_length = cpu_to_le16(frag_len); - cs_set_control(mac, cs, hdr); + cs_set_control(mac, cs, hdr, control->flags); packet_length = frag_len + sizeof(struct zd_ctrlset) + 10; ZD_ASSERT(packet_length <= 0xffff); @@ -886,419 +532,417 @@ static int fill_ctrlset(struct zd_mac *mac, if (r < 0) return r; cs->current_length = cpu_to_le16(r); - - if (next_frag_len == 0) { - cs->next_frame_length = 0; - } else { - r = zd_calc_tx_length_us(NULL, ZD_RATE(cs->modulation), - next_frag_len); - if (r < 0) - return r; - cs->next_frame_length = cpu_to_le16(r); - } + cs->next_frame_length = 0; return 0; } -static int zd_mac_tx(struct zd_mac *mac, struct ieee80211_txb *txb, int pri) +/** + * zd_op_tx - transmits a network frame to the device + * + * @dev: mac80211 hardware device + * @skb: socket buffer + * @control: the control structure + * + * This function transmit an IEEE 802.11 network frame to the device. The + * control block of the skbuff will be initialized. If necessary the incoming + * mac80211 queues will be stopped. + */ +static int zd_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb, + struct ieee80211_tx_control *control) { - int i, r; - struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac); + struct zd_mac *mac = zd_hw_mac(hw); + int r; - for (i = 0; i < txb->nr_frags; i++) { - struct sk_buff *skb = txb->fragments[i]; + r = fill_ctrlset(mac, skb, control); + if (r) + return r; - r = fill_ctrlset(mac, txb, i); - if (r) { - ieee->stats.tx_dropped++; - return r; - } - r = zd_usb_tx(&mac->chip.usb, skb->data, skb->len); - if (r) { - ieee->stats.tx_dropped++; - return r; - } + r = init_tx_skb_control_block(skb, hw, control); + if (r) + return r; + r = zd_usb_tx(&mac->chip.usb, skb); + if (r) { + clear_tx_skb_control_block(skb); + return r; } - - /* FIXME: shouldn't this be handled by the upper layers? */ - mac->netdev->trans_start = jiffies; - - ieee80211_txb_free(txb); return 0; } -struct zd_rt_hdr { - struct ieee80211_radiotap_header rt_hdr; - u8 rt_flags; - u8 rt_rate; - u16 rt_channel; - u16 rt_chbitmask; -} __attribute__((packed)); - -static void fill_rt_header(void *buffer, struct zd_mac *mac, - const struct ieee80211_rx_stats *stats, - const struct rx_status *status) -{ - struct zd_rt_hdr *hdr = buffer; - - hdr->rt_hdr.it_version = PKTHDR_RADIOTAP_VERSION; - hdr->rt_hdr.it_pad = 0; - hdr->rt_hdr.it_len = cpu_to_le16(sizeof(struct zd_rt_hdr)); - hdr->rt_hdr.it_present = cpu_to_le32((1 << IEEE80211_RADIOTAP_FLAGS) | - (1 << IEEE80211_RADIOTAP_CHANNEL) | - (1 << IEEE80211_RADIOTAP_RATE)); - - hdr->rt_flags = 0; - if (status->decryption_type & (ZD_RX_WEP64|ZD_RX_WEP128|ZD_RX_WEP256)) - hdr->rt_flags |= IEEE80211_RADIOTAP_F_WEP; - - hdr->rt_rate = stats->rate / 5; - - /* FIXME: 802.11a */ - hdr->rt_channel = cpu_to_le16(ieee80211chan2mhz( - _zd_chip_get_channel(&mac->chip))); - hdr->rt_chbitmask = cpu_to_le16(IEEE80211_CHAN_2GHZ | - ((status->frame_status & ZD_RX_FRAME_MODULATION_MASK) == - ZD_RX_OFDM ? IEEE80211_CHAN_OFDM : IEEE80211_CHAN_CCK)); -} - -/* Returns 1 if the data packet is for us and 0 otherwise. */ -static int is_data_packet_for_us(struct ieee80211_device *ieee, - struct ieee80211_hdr_4addr *hdr) -{ - struct net_device *netdev = ieee->dev; - u16 fc = le16_to_cpu(hdr->frame_ctl); - - ZD_ASSERT(WLAN_FC_GET_TYPE(fc) == IEEE80211_FTYPE_DATA); - - switch (ieee->iw_mode) { - case IW_MODE_ADHOC: - if ((fc & (IEEE80211_FCTL_TODS|IEEE80211_FCTL_FROMDS)) != 0 || - compare_ether_addr(hdr->addr3, ieee->bssid) != 0) - return 0; - break; - case IW_MODE_AUTO: - case IW_MODE_INFRA: - if ((fc & (IEEE80211_FCTL_TODS|IEEE80211_FCTL_FROMDS)) != - IEEE80211_FCTL_FROMDS || - compare_ether_addr(hdr->addr2, ieee->bssid) != 0) - return 0; - break; - default: - ZD_ASSERT(ieee->iw_mode != IW_MODE_MONITOR); - return 0; - } - - return compare_ether_addr(hdr->addr1, netdev->dev_addr) == 0 || - (is_multicast_ether_addr(hdr->addr1) && - compare_ether_addr(hdr->addr3, netdev->dev_addr) != 0) || - (netdev->flags & IFF_PROMISC); -} - -/* Filters received packets. The function returns 1 if the packet should be - * forwarded to ieee80211_rx(). If the packet should be ignored the function - * returns 0. If an invalid packet is found the function returns -EINVAL. +/** + * filter_ack - filters incoming packets for acknowledgements + * @dev: the mac80211 device + * @rx_hdr: received header + * @stats: the status for the received packet * - * The function calls ieee80211_rx_mgt() directly. + * This functions looks for ACK packets and tries to match them with the + * frames in the tx queue. If a match is found the frame will be dequeued and + * the upper layers is informed about the successful transmission. If + * mac80211 queues have been stopped and the number of frames still to be + * transmitted is low the queues will be opened again. * - * It has been based on ieee80211_rx_any. + * Returns 1 if the frame was an ACK, 0 if it was ignored. */ -static int filter_rx(struct ieee80211_device *ieee, - const u8 *buffer, unsigned int length, - struct ieee80211_rx_stats *stats) +static int filter_ack(struct ieee80211_hw *hw, struct ieee80211_hdr *rx_hdr, + struct ieee80211_rx_status *stats) { - struct ieee80211_hdr_4addr *hdr; - u16 fc; - - if (ieee->iw_mode == IW_MODE_MONITOR) - return 1; - - hdr = (struct ieee80211_hdr_4addr *)buffer; - fc = le16_to_cpu(hdr->frame_ctl); - if ((fc & IEEE80211_FCTL_VERS) != 0) - return -EINVAL; + u16 fc = le16_to_cpu(rx_hdr->frame_control); + struct sk_buff *skb; + struct sk_buff_head *q; + unsigned long flags; - switch (WLAN_FC_GET_TYPE(fc)) { - case IEEE80211_FTYPE_MGMT: - if (length < sizeof(struct ieee80211_hdr_3addr)) - return -EINVAL; - ieee80211_rx_mgt(ieee, hdr, stats); - return 0; - case IEEE80211_FTYPE_CTL: + if ((fc & (IEEE80211_FCTL_FTYPE | IEEE80211_FCTL_STYPE)) != + (IEEE80211_FTYPE_CTL | IEEE80211_STYPE_ACK)) return 0; - case IEEE80211_FTYPE_DATA: - /* Ignore invalid short buffers */ - if (length < sizeof(struct ieee80211_hdr_3addr)) - return -EINVAL; - return is_data_packet_for_us(ieee, hdr); - } - return -EINVAL; + q = &zd_hw_mac(hw)->ack_wait_queue; + spin_lock_irqsave(&q->lock, flags); + for (skb = q->next; skb != (struct sk_buff *)q; skb = skb->next) { + struct ieee80211_hdr *tx_hdr; + + tx_hdr = (struct ieee80211_hdr *)skb->data; + if (likely(!compare_ether_addr(tx_hdr->addr2, rx_hdr->addr1))) + { + struct ieee80211_tx_status status = {{0}}; + status.flags = IEEE80211_TX_STATUS_ACK; + status.ack_signal = stats->ssi; + __skb_unlink(skb, q); + tx_status(hw, skb, &status, 1); + goto out; + } + } +out: + spin_unlock_irqrestore(&q->lock, flags); + return 1; } -static void update_qual_rssi(struct zd_mac *mac, - const u8 *buffer, unsigned int length, - u8 qual_percent, u8 rssi_percent) +int zd_mac_rx(struct ieee80211_hw *hw, const u8 *buffer, unsigned int length) { - unsigned long flags; - struct ieee80211_hdr_3addr *hdr; - int i; + struct zd_mac *mac = zd_hw_mac(hw); + struct ieee80211_rx_status stats; + const struct rx_status *status; + struct sk_buff *skb; + int bad_frame = 0; + u16 fc; + bool is_qos, is_4addr, need_padding; - hdr = (struct ieee80211_hdr_3addr *)buffer; - if (length < offsetof(struct ieee80211_hdr_3addr, addr3)) - return; - if (compare_ether_addr(hdr->addr2, zd_mac_to_ieee80211(mac)->bssid) != 0) - return; + if (length < ZD_PLCP_HEADER_SIZE + 10 /* IEEE80211_1ADDR_LEN */ + + FCS_LEN + sizeof(struct rx_status)) + return -EINVAL; - spin_lock_irqsave(&mac->lock, flags); - i = mac->stats_count % ZD_MAC_STATS_BUFFER_SIZE; - mac->qual_buffer[i] = qual_percent; - mac->rssi_buffer[i] = rssi_percent; - mac->stats_count++; - spin_unlock_irqrestore(&mac->lock, flags); -} + memset(&stats, 0, sizeof(stats)); -static int fill_rx_stats(struct ieee80211_rx_stats *stats, - const struct rx_status **pstatus, - struct zd_mac *mac, - const u8 *buffer, unsigned int length) -{ - const struct rx_status *status; + /* Note about pass_failed_fcs and pass_ctrl access below: + * mac locking intentionally omitted here, as this is the only unlocked + * reader and the only writer is configure_filter. Plus, if there were + * any races accessing these variables, it wouldn't really matter. + * If mac80211 ever provides a way for us to access filter flags + * from outside configure_filter, we could improve on this. Also, this + * situation may change once we implement some kind of DMA-into-skb + * RX path. */ - *pstatus = status = (struct rx_status *) + /* Caller has to ensure that length >= sizeof(struct rx_status). */ + status = (struct rx_status *) (buffer + (length - sizeof(struct rx_status))); if (status->frame_status & ZD_RX_ERROR) { - struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac); - ieee->stats.rx_errors++; - if (status->frame_status & ZD_RX_TIMEOUT_ERROR) - ieee->stats.rx_missed_errors++; - else if (status->frame_status & ZD_RX_FIFO_OVERRUN_ERROR) - ieee->stats.rx_fifo_errors++; - else if (status->frame_status & ZD_RX_DECRYPTION_ERROR) - ieee->ieee_stats.rx_discards_undecryptable++; - else if (status->frame_status & ZD_RX_CRC32_ERROR) { - ieee->stats.rx_crc_errors++; - ieee->ieee_stats.rx_fcs_errors++; + if (mac->pass_failed_fcs && + (status->frame_status & ZD_RX_CRC32_ERROR)) { + stats.flag |= RX_FLAG_FAILED_FCS_CRC; + bad_frame = 1; + } else { + return -EINVAL; } - else if (status->frame_status & ZD_RX_CRC16_ERROR) - ieee->stats.rx_crc_errors++; - return -EINVAL; } - memset(stats, 0, sizeof(struct ieee80211_rx_stats)); - stats->len = length - (ZD_PLCP_HEADER_SIZE + IEEE80211_FCS_LEN + - + sizeof(struct rx_status)); - /* FIXME: 802.11a */ - stats->freq = IEEE80211_24GHZ_BAND; - stats->received_channel = _zd_chip_get_channel(&mac->chip); - stats->rssi = zd_rx_strength_percent(status->signal_strength); - stats->signal = zd_rx_qual_percent(buffer, + stats.channel = _zd_chip_get_channel(&mac->chip); + stats.freq = zd_channels[stats.channel - 1].freq; + stats.phymode = MODE_IEEE80211G; + stats.ssi = status->signal_strength; + stats.signal = zd_rx_qual_percent(buffer, length - sizeof(struct rx_status), status); - stats->mask = IEEE80211_STATMASK_RSSI | IEEE80211_STATMASK_SIGNAL; - stats->rate = zd_rx_rate(buffer, status); - if (stats->rate) - stats->mask |= IEEE80211_STATMASK_RATE; + stats.rate = zd_rx_rate(buffer, status); + + length -= ZD_PLCP_HEADER_SIZE + sizeof(struct rx_status); + buffer += ZD_PLCP_HEADER_SIZE; + + /* Except for bad frames, filter each frame to see if it is an ACK, in + * which case our internal TX tracking is updated. Normally we then + * bail here as there's no need to pass ACKs on up to the stack, but + * there is also the case where the stack has requested us to pass + * control frames on up (pass_ctrl) which we must consider. */ + if (!bad_frame && + filter_ack(hw, (struct ieee80211_hdr *)buffer, &stats) + && !mac->pass_ctrl) + return 0; - return 0; -} + fc = le16_to_cpu(*((__le16 *) buffer)); -static void zd_mac_rx(struct zd_mac *mac, struct sk_buff *skb) -{ - int r; - struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac); - struct ieee80211_rx_stats stats; - const struct rx_status *status; + is_qos = ((fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA) && + ((fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_QOS_DATA); + is_4addr = (fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) == + (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS); + need_padding = is_qos ^ is_4addr; - if (skb->len < ZD_PLCP_HEADER_SIZE + IEEE80211_1ADDR_LEN + - IEEE80211_FCS_LEN + sizeof(struct rx_status)) - { - ieee->stats.rx_errors++; - ieee->stats.rx_length_errors++; - goto free_skb; + skb = dev_alloc_skb(length + (need_padding ? 2 : 0)); + if (skb == NULL) + return -ENOMEM; + if (need_padding) { + /* Make sure the the payload data is 4 byte aligned. */ + skb_reserve(skb, 2); } - r = fill_rx_stats(&stats, &status, mac, skb->data, skb->len); - if (r) { - /* Only packets with rx errors are included here. - * The error stats have already been set in fill_rx_stats. - */ - goto free_skb; - } + memcpy(skb_put(skb, length), buffer, length); - __skb_pull(skb, ZD_PLCP_HEADER_SIZE); - __skb_trim(skb, skb->len - - (IEEE80211_FCS_LEN + sizeof(struct rx_status))); + ieee80211_rx_irqsafe(hw, skb, &stats); + return 0; +} - ZD_ASSERT(IS_ALIGNED((unsigned long)skb->data, 4)); +static int zd_op_add_interface(struct ieee80211_hw *hw, + struct ieee80211_if_init_conf *conf) +{ + struct zd_mac *mac = zd_hw_mac(hw); - update_qual_rssi(mac, skb->data, skb->len, stats.signal, - status->signal_strength); + /* using IEEE80211_IF_TYPE_INVALID to indicate no mode selected */ + if (mac->type != IEEE80211_IF_TYPE_INVALID) + return -EOPNOTSUPP; - r = filter_rx(ieee, skb->data, skb->len, &stats); - if (r <= 0) { - if (r < 0) { - ieee->stats.rx_errors++; - dev_dbg_f(zd_mac_dev(mac), "Error in packet.\n"); - } - goto free_skb; + switch (conf->type) { + case IEEE80211_IF_TYPE_MNTR: + case IEEE80211_IF_TYPE_STA: + mac->type = conf->type; + break; + default: + return -EOPNOTSUPP; } - if (ieee->iw_mode == IW_MODE_MONITOR) - fill_rt_header(skb_push(skb, sizeof(struct zd_rt_hdr)), mac, - &stats, status); - - r = ieee80211_rx(ieee, skb, &stats); - if (r) - return; -free_skb: - /* We are always in a soft irq. */ - dev_kfree_skb(skb); + return zd_write_mac_addr(&mac->chip, conf->mac_addr); } -static void do_rx(unsigned long mac_ptr) +static void zd_op_remove_interface(struct ieee80211_hw *hw, + struct ieee80211_if_init_conf *conf) { - struct zd_mac *mac = (struct zd_mac *)mac_ptr; - struct sk_buff *skb; + struct zd_mac *mac = zd_hw_mac(hw); + mac->type = IEEE80211_IF_TYPE_INVALID; + zd_write_mac_addr(&mac->chip, NULL); +} - while ((skb = skb_dequeue(&mac->rx_queue)) != NULL) - zd_mac_rx(mac, skb); +static int zd_op_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf) +{ + struct zd_mac *mac = zd_hw_mac(hw); + return zd_chip_set_channel(&mac->chip, conf->channel); } -int zd_mac_rx_irq(struct zd_mac *mac, const u8 *buffer, unsigned int length) +static int zd_op_config_interface(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + struct ieee80211_if_conf *conf) { - struct sk_buff *skb; - unsigned int reserved = - ALIGN(max_t(unsigned int, - sizeof(struct zd_rt_hdr), ZD_PLCP_HEADER_SIZE), 4) - - ZD_PLCP_HEADER_SIZE; - - skb = dev_alloc_skb(reserved + length); - if (!skb) { - struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac); - dev_warn(zd_mac_dev(mac), "Could not allocate skb.\n"); - ieee->stats.rx_dropped++; - return -ENOMEM; - } - skb_reserve(skb, reserved); - memcpy(__skb_put(skb, length), buffer, length); - skb_queue_tail(&mac->rx_queue, skb); - tasklet_schedule(&mac->rx_tasklet); + struct zd_mac *mac = zd_hw_mac(hw); + + spin_lock_irq(&mac->lock); + mac->associated = is_valid_ether_addr(conf->bssid); + spin_unlock_irq(&mac->lock); + + /* TODO: do hardware bssid filtering */ return 0; } -static int netdev_tx(struct ieee80211_txb *txb, struct net_device *netdev, - int pri) +static void set_multicast_hash_handler(struct work_struct *work) { - return zd_mac_tx(zd_netdev_mac(netdev), txb, pri); + struct zd_mac *mac = + container_of(work, struct zd_mac, set_multicast_hash_work); + struct zd_mc_hash hash; + + spin_lock_irq(&mac->lock); + hash = mac->multicast_hash; + spin_unlock_irq(&mac->lock); + + zd_chip_set_multicast_hash(&mac->chip, &hash); } -static void set_security(struct net_device *netdev, - struct ieee80211_security *sec) +static void set_rx_filter_handler(struct work_struct *work) { - struct ieee80211_device *ieee = zd_netdev_ieee80211(netdev); - struct ieee80211_security *secinfo = &ieee->sec; - int keyidx; - - dev_dbg_f(zd_mac_dev(zd_netdev_mac(netdev)), "\n"); - - for (keyidx = 0; keyidx<WEP_KEYS; keyidx++) - if (sec->flags & (1<<keyidx)) { - secinfo->encode_alg[keyidx] = sec->encode_alg[keyidx]; - secinfo->key_sizes[keyidx] = sec->key_sizes[keyidx]; - memcpy(secinfo->keys[keyidx], sec->keys[keyidx], - SCM_KEY_LEN); - } + struct zd_mac *mac = + container_of(work, struct zd_mac, set_rx_filter_work); + int r; - if (sec->flags & SEC_ACTIVE_KEY) { - secinfo->active_key = sec->active_key; - dev_dbg_f(zd_mac_dev(zd_netdev_mac(netdev)), - " .active_key = %d\n", sec->active_key); - } - if (sec->flags & SEC_UNICAST_GROUP) { - secinfo->unicast_uses_group = sec->unicast_uses_group; - dev_dbg_f(zd_mac_dev(zd_netdev_mac(netdev)), - " .unicast_uses_group = %d\n", - sec->unicast_uses_group); - } - if (sec->flags & SEC_LEVEL) { - secinfo->level = sec->level; - dev_dbg_f(zd_mac_dev(zd_netdev_mac(netdev)), - " .level = %d\n", sec->level); - } - if (sec->flags & SEC_ENABLED) { - secinfo->enabled = sec->enabled; - dev_dbg_f(zd_mac_dev(zd_netdev_mac(netdev)), - " .enabled = %d\n", sec->enabled); - } - if (sec->flags & SEC_ENCRYPT) { - secinfo->encrypt = sec->encrypt; - dev_dbg_f(zd_mac_dev(zd_netdev_mac(netdev)), - " .encrypt = %d\n", sec->encrypt); - } - if (sec->flags & SEC_AUTH_MODE) { - secinfo->auth_mode = sec->auth_mode; - dev_dbg_f(zd_mac_dev(zd_netdev_mac(netdev)), - " .auth_mode = %d\n", sec->auth_mode); + dev_dbg_f(zd_mac_dev(mac), "\n"); + r = set_rx_filter(mac); + if (r) + dev_err(zd_mac_dev(mac), "set_rx_filter_handler error %d\n", r); +} + +#define SUPPORTED_FIF_FLAGS \ + (FIF_PROMISC_IN_BSS | FIF_ALLMULTI | FIF_FCSFAIL | FIF_CONTROL | \ + FIF_OTHER_BSS) +static void zd_op_configure_filter(struct ieee80211_hw *hw, + unsigned int changed_flags, + unsigned int *new_flags, + int mc_count, struct dev_mc_list *mclist) +{ + struct zd_mc_hash hash; + struct zd_mac *mac = zd_hw_mac(hw); + unsigned long flags; + int i; + + /* Only deal with supported flags */ + changed_flags &= SUPPORTED_FIF_FLAGS; + *new_flags &= SUPPORTED_FIF_FLAGS; + + /* changed_flags is always populated but this driver + * doesn't support all FIF flags so its possible we don't + * need to do anything */ + if (!changed_flags) + return; + + if (*new_flags & (FIF_PROMISC_IN_BSS | FIF_ALLMULTI)) { + zd_mc_add_all(&hash); + } else { + DECLARE_MAC_BUF(macbuf); + + zd_mc_clear(&hash); + for (i = 0; i < mc_count; i++) { + if (!mclist) + break; + dev_dbg_f(zd_mac_dev(mac), "mc addr %s\n", + print_mac(macbuf, mclist->dmi_addr)); + zd_mc_add_addr(&hash, mclist->dmi_addr); + mclist = mclist->next; + } } + + spin_lock_irqsave(&mac->lock, flags); + mac->pass_failed_fcs = !!(*new_flags & FIF_FCSFAIL); + mac->pass_ctrl = !!(*new_flags & FIF_CONTROL); + mac->multicast_hash = hash; + spin_unlock_irqrestore(&mac->lock, flags); + queue_work(zd_workqueue, &mac->set_multicast_hash_work); + + if (changed_flags & FIF_CONTROL) + queue_work(zd_workqueue, &mac->set_rx_filter_work); + + /* no handling required for FIF_OTHER_BSS as we don't currently + * do BSSID filtering */ + /* FIXME: in future it would be nice to enable the probe response + * filter (so that the driver doesn't see them) until + * FIF_BCN_PRBRESP_PROMISC is set. however due to atomicity here, we'd + * have to schedule work to enable prbresp reception, which might + * happen too late. For now we'll just listen and forward them all the + * time. */ } -static void ieee_init(struct ieee80211_device *ieee) +static void set_rts_cts_work(struct work_struct *work) { - ieee->mode = IEEE_B | IEEE_G; - ieee->freq_band = IEEE80211_24GHZ_BAND; - ieee->modulation = IEEE80211_OFDM_MODULATION | IEEE80211_CCK_MODULATION; - ieee->tx_headroom = sizeof(struct zd_ctrlset); - ieee->set_security = set_security; - ieee->hard_start_xmit = netdev_tx; - - /* Software encryption/decryption for now */ - ieee->host_build_iv = 0; - ieee->host_encrypt = 1; - ieee->host_decrypt = 1; - - /* FIXME: default to managed mode, until ieee80211 and zd1211rw can - * correctly support AUTO */ - ieee->iw_mode = IW_MODE_INFRA; + struct zd_mac *mac = + container_of(work, struct zd_mac, set_rts_cts_work); + unsigned long flags; + unsigned int short_preamble; + + mutex_lock(&mac->chip.mutex); + + spin_lock_irqsave(&mac->lock, flags); + mac->updating_rts_rate = 0; + short_preamble = mac->short_preamble; + spin_unlock_irqrestore(&mac->lock, flags); + + zd_chip_set_rts_cts_rate_locked(&mac->chip, short_preamble); + mutex_unlock(&mac->chip.mutex); } -static void softmac_init(struct ieee80211softmac_device *sm) +static void zd_op_bss_info_changed(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + struct ieee80211_bss_conf *bss_conf, + u32 changes) { - sm->set_channel = set_channel; - sm->bssinfo_change = bssinfo_change; + struct zd_mac *mac = zd_hw_mac(hw); + unsigned long flags; + + dev_dbg_f(zd_mac_dev(mac), "changes: %x\n", changes); + + if (changes & BSS_CHANGED_ERP_PREAMBLE) { + spin_lock_irqsave(&mac->lock, flags); + mac->short_preamble = bss_conf->use_short_preamble; + if (!mac->updating_rts_rate) { + mac->updating_rts_rate = 1; + /* FIXME: should disable TX here, until work has + * completed and RTS_CTS reg is updated */ + queue_work(zd_workqueue, &mac->set_rts_cts_work); + } + spin_unlock_irqrestore(&mac->lock, flags); + } } -struct iw_statistics *zd_mac_get_wireless_stats(struct net_device *ndev) +static const struct ieee80211_ops zd_ops = { + .tx = zd_op_tx, + .start = zd_op_start, + .stop = zd_op_stop, + .add_interface = zd_op_add_interface, + .remove_interface = zd_op_remove_interface, + .config = zd_op_config, + .config_interface = zd_op_config_interface, + .configure_filter = zd_op_configure_filter, + .bss_info_changed = zd_op_bss_info_changed, +}; + +struct ieee80211_hw *zd_mac_alloc_hw(struct usb_interface *intf) { - struct zd_mac *mac = zd_netdev_mac(ndev); - struct iw_statistics *iw_stats = &mac->iw_stats; - unsigned int i, count, qual_total, rssi_total; + struct zd_mac *mac; + struct ieee80211_hw *hw; + int i; - memset(iw_stats, 0, sizeof(struct iw_statistics)); - /* We are not setting the status, because ieee->state is not updated - * at all and this driver doesn't track authentication state. - */ - spin_lock_irq(&mac->lock); - count = mac->stats_count < ZD_MAC_STATS_BUFFER_SIZE ? - mac->stats_count : ZD_MAC_STATS_BUFFER_SIZE; - qual_total = rssi_total = 0; - for (i = 0; i < count; i++) { - qual_total += mac->qual_buffer[i]; - rssi_total += mac->rssi_buffer[i]; + hw = ieee80211_alloc_hw(sizeof(struct zd_mac), &zd_ops); + if (!hw) { + dev_dbg_f(&intf->dev, "out of memory\n"); + return NULL; } - spin_unlock_irq(&mac->lock); - iw_stats->qual.updated = IW_QUAL_NOISE_INVALID; - if (count > 0) { - iw_stats->qual.qual = qual_total / count; - iw_stats->qual.level = rssi_total / count; - iw_stats->qual.updated |= - IW_QUAL_QUAL_UPDATED|IW_QUAL_LEVEL_UPDATED; - } else { - iw_stats->qual.updated |= - IW_QUAL_QUAL_INVALID|IW_QUAL_LEVEL_INVALID; + + mac = zd_hw_mac(hw); + + memset(mac, 0, sizeof(*mac)); + spin_lock_init(&mac->lock); + mac->hw = hw; + + mac->type = IEEE80211_IF_TYPE_INVALID; + + memcpy(mac->channels, zd_channels, sizeof(zd_channels)); + memcpy(mac->rates, zd_rates, sizeof(zd_rates)); + mac->modes[0].mode = MODE_IEEE80211G; + mac->modes[0].num_rates = ARRAY_SIZE(zd_rates); + mac->modes[0].rates = mac->rates; + mac->modes[0].num_channels = ARRAY_SIZE(zd_channels); + mac->modes[0].channels = mac->channels; + mac->modes[1].mode = MODE_IEEE80211B; + mac->modes[1].num_rates = 4; + mac->modes[1].rates = mac->rates; + mac->modes[1].num_channels = ARRAY_SIZE(zd_channels); + mac->modes[1].channels = mac->channels; + + hw->flags = IEEE80211_HW_RX_INCLUDES_FCS | + IEEE80211_HW_DEFAULT_REG_DOMAIN_CONFIGURED; + hw->max_rssi = 100; + hw->max_signal = 100; + + hw->queues = 1; + hw->extra_tx_headroom = sizeof(struct zd_ctrlset); + + skb_queue_head_init(&mac->ack_wait_queue); + + for (i = 0; i < 2; i++) { + if (ieee80211_register_hwmode(hw, &mac->modes[i])) { + dev_dbg_f(&intf->dev, "cannot register hwmode\n"); + ieee80211_free_hw(hw); + return NULL; + } } - /* TODO: update counter */ - return iw_stats; + + zd_chip_init(&mac->chip, hw, intf); + housekeeping_init(mac); + INIT_WORK(&mac->set_multicast_hash_work, set_multicast_hash_handler); + INIT_WORK(&mac->set_rts_cts_work, set_rts_cts_work); + INIT_WORK(&mac->set_rx_filter_work, set_rx_filter_handler); + + SET_IEEE80211_DEV(hw, &intf->dev); + return hw; } #define LINK_LED_WORK_DELAY HZ @@ -1308,18 +952,17 @@ static void link_led_handler(struct work_struct *work) struct zd_mac *mac = container_of(work, struct zd_mac, housekeeping.link_led_work.work); struct zd_chip *chip = &mac->chip; - struct ieee80211softmac_device *sm = ieee80211_priv(mac->netdev); int is_associated; int r; spin_lock_irq(&mac->lock); - is_associated = sm->associnfo.associated != 0; + is_associated = mac->associated; spin_unlock_irq(&mac->lock); r = zd_chip_control_leds(chip, is_associated ? LED_ASSOCIATED : LED_SCANNING); if (r) - dev_err(zd_mac_dev(mac), "zd_chip_control_leds error %d\n", r); + dev_dbg_f(zd_mac_dev(mac), "zd_chip_control_leds error %d\n", r); queue_delayed_work(zd_workqueue, &mac->housekeeping.link_led_work, LINK_LED_WORK_DELAY); |