[PATCH] rt2x00: Allways memset memory obtained from skb_push()
[safe/jmp/linux-2.6] / drivers / net / wireless / rt2x00 / rt73usb.c
index 3397881..3e42759 100644 (file)
@@ -195,12 +195,13 @@ rf_write:
        reg = 0;
        rt2x00_set_field32(&reg, PHY_CSR4_VALUE, value);
 
-       if (rt2x00_rf(&rt2x00dev->chip, RF5225) ||
-           rt2x00_rf(&rt2x00dev->chip, RF2527))
-               rt2x00_set_field32(&reg, PHY_CSR4_NUMBER_OF_BITS, 21);
-       else
-               rt2x00_set_field32(&reg, PHY_CSR4_NUMBER_OF_BITS, 20);
-
+       /*
+        * RF5225 and RF2527 contain 21 bits per RF register value,
+        * all others contain 20 bits.
+        */
+       rt2x00_set_field32(&reg, PHY_CSR4_NUMBER_OF_BITS,
+                          20 + !!(rt2x00_rf(&rt2x00dev->chip, RF5225) ||
+                                  rt2x00_rf(&rt2x00dev->chip, RF2527)));
        rt2x00_set_field32(&reg, PHY_CSR4_IF_SELECT, 0);
        rt2x00_set_field32(&reg, PHY_CSR4_BUSY, 1);
 
@@ -255,60 +256,32 @@ static const struct rt2x00debug rt73usb_rt2x00debug = {
 /*
  * Configuration handlers.
  */
-static void rt73usb_config_mac_addr(struct rt2x00_dev *rt2x00dev, u8 *addr)
+static void rt73usb_config_mac_addr(struct rt2x00_dev *rt2x00dev, __le32 *mac)
 {
-       __le32 reg[2];
        u32 tmp;
 
-       memset(&reg, 0, sizeof(reg));
-       memcpy(&reg, addr, ETH_ALEN);
-
-       tmp = le32_to_cpu(reg[1]);
+       tmp = le32_to_cpu(mac[1]);
        rt2x00_set_field32(&tmp, MAC_CSR3_UNICAST_TO_ME_MASK, 0xff);
-       reg[1] = cpu_to_le32(tmp);
+       mac[1] = cpu_to_le32(tmp);
 
-       /*
-        * The MAC address is passed to us as an array of bytes,
-        * that array is little endian, so no need for byte ordering.
-        */
-       rt73usb_register_multiwrite(rt2x00dev, MAC_CSR2, &reg, sizeof(reg));
+       rt73usb_register_multiwrite(rt2x00dev, MAC_CSR2, mac,
+                                   (2 * sizeof(__le32)));
 }
 
-static void rt73usb_config_bssid(struct rt2x00_dev *rt2x00dev, u8 *bssid)
+static void rt73usb_config_bssid(struct rt2x00_dev *rt2x00dev, __le32 *bssid)
 {
-       __le32 reg[2];
        u32 tmp;
 
-       memset(&reg, 0, sizeof(reg));
-       memcpy(&reg, bssid, ETH_ALEN);
-
-       tmp = le32_to_cpu(reg[1]);
+       tmp = le32_to_cpu(bssid[1]);
        rt2x00_set_field32(&tmp, MAC_CSR5_BSS_ID_MASK, 3);
-       reg[1] = cpu_to_le32(tmp);
+       bssid[1] = cpu_to_le32(tmp);
 
-       /*
-        * The BSSID is passed to us as an array of bytes,
-        * that array is little endian, so no need for byte ordering.
-        */
-       rt73usb_register_multiwrite(rt2x00dev, MAC_CSR4, &reg, sizeof(reg));
+       rt73usb_register_multiwrite(rt2x00dev, MAC_CSR4, bssid,
+                                   (2 * sizeof(__le32)));
 }
 
-static void rt73usb_config_packet_filter(struct rt2x00_dev *rt2x00dev,
-                                        const unsigned int filter)
-{
-       int promisc = !!(filter & IFF_PROMISC);
-       int multicast = !!(filter & IFF_MULTICAST);
-       int broadcast = !!(filter & IFF_BROADCAST);
-       u32 reg;
-
-       rt73usb_register_read(rt2x00dev, TXRX_CSR0, &reg);
-       rt2x00_set_field32(&reg, TXRX_CSR0_DROP_NOT_TO_ME, !promisc);
-       rt2x00_set_field32(&reg, TXRX_CSR0_DROP_MULTICAST, !multicast);
-       rt2x00_set_field32(&reg, TXRX_CSR0_DROP_BORADCAST, !broadcast);
-       rt73usb_register_write(rt2x00dev, TXRX_CSR0, reg);
-}
-
-static void rt73usb_config_type(struct rt2x00_dev *rt2x00dev, const int type)
+static void rt73usb_config_type(struct rt2x00_dev *rt2x00dev, const int type,
+                               const int tsf_sync)
 {
        u32 reg;
 
@@ -325,112 +298,50 @@ static void rt73usb_config_type(struct rt2x00_dev *rt2x00dev, const int type)
        rt73usb_register_write(rt2x00dev, HW_BEACON_BASE3, 0);
 
        /*
-        * Apply hardware packet filter.
-        */
-       rt73usb_register_read(rt2x00dev, TXRX_CSR0, &reg);
-
-       if (!is_monitor_present(&rt2x00dev->interface) &&
-           (type == IEEE80211_IF_TYPE_IBSS || type == IEEE80211_IF_TYPE_STA))
-               rt2x00_set_field32(&reg, TXRX_CSR0_DROP_TO_DS, 1);
-       else
-               rt2x00_set_field32(&reg, TXRX_CSR0_DROP_TO_DS, 0);
-
-       /*
-        * If there is a non-monitor interface present
-        * the packet should be strict (even if a monitor interface is present!).
-        * When there is only 1 interface present which is in monitor mode
-        * we should start accepting _all_ frames.
-        */
-       if (is_interface_present(&rt2x00dev->interface)) {
-               rt2x00_set_field32(&reg, TXRX_CSR0_DROP_CRC, 1);
-               rt2x00_set_field32(&reg, TXRX_CSR0_DROP_PHYSICAL, 1);
-               rt2x00_set_field32(&reg, TXRX_CSR0_DROP_CONTROL, 1);
-               rt2x00_set_field32(&reg, TXRX_CSR0_DROP_VERSION_ERROR, 1);
-               rt2x00_set_field32(&reg, TXRX_CSR0_DROP_ACK_CTS, 1);
-       } else if (is_monitor_present(&rt2x00dev->interface)) {
-               rt2x00_set_field32(&reg, TXRX_CSR0_DROP_CRC, 0);
-               rt2x00_set_field32(&reg, TXRX_CSR0_DROP_PHYSICAL, 0);
-               rt2x00_set_field32(&reg, TXRX_CSR0_DROP_CONTROL, 0);
-               rt2x00_set_field32(&reg, TXRX_CSR0_DROP_VERSION_ERROR, 0);
-               rt2x00_set_field32(&reg, TXRX_CSR0_DROP_ACK_CTS, 0);
-       }
-
-       rt73usb_register_write(rt2x00dev, TXRX_CSR0, reg);
-
-       /*
         * Enable synchronisation.
         */
        rt73usb_register_read(rt2x00dev, TXRX_CSR9, &reg);
-       if (is_interface_present(&rt2x00dev->interface)) {
-               rt2x00_set_field32(&reg, TXRX_CSR9_TSF_TICKING, 1);
-               rt2x00_set_field32(&reg, TXRX_CSR9_TBTT_ENABLE, 1);
-       }
-
+       rt2x00_set_field32(&reg, TXRX_CSR9_TSF_TICKING, 1);
+       rt2x00_set_field32(&reg, TXRX_CSR9_TBTT_ENABLE, 1);
        rt2x00_set_field32(&reg, TXRX_CSR9_BEACON_GEN, 0);
-       if (type == IEEE80211_IF_TYPE_IBSS || type == IEEE80211_IF_TYPE_AP)
-               rt2x00_set_field32(&reg, TXRX_CSR9_TSF_SYNC, 2);
-       else if (type == IEEE80211_IF_TYPE_STA)
-               rt2x00_set_field32(&reg, TXRX_CSR9_TSF_SYNC, 1);
-       else if (is_monitor_present(&rt2x00dev->interface) &&
-                !is_interface_present(&rt2x00dev->interface))
-               rt2x00_set_field32(&reg, TXRX_CSR9_TSF_SYNC, 0);
-
+       rt2x00_set_field32(&reg, TXRX_CSR9_TSF_SYNC, tsf_sync);
        rt73usb_register_write(rt2x00dev, TXRX_CSR9, reg);
 }
 
-static void rt73usb_config_rate(struct rt2x00_dev *rt2x00dev, const int rate)
+static void rt73usb_config_preamble(struct rt2x00_dev *rt2x00dev,
+                                     const int short_preamble,
+                                     const int ack_timeout,
+                                     const int ack_consume_time)
 {
-       struct ieee80211_conf *conf = &rt2x00dev->hw->conf;
        u32 reg;
-       u32 value;
-       u32 preamble;
-
-       if (DEVICE_GET_RATE_FIELD(rate, PREAMBLE))
-               preamble = SHORT_PREAMBLE;
-       else
-               preamble = PREAMBLE;
-
-       reg = DEVICE_GET_RATE_FIELD(rate, RATEMASK) & DEV_BASIC_RATEMASK;
 
-       rt73usb_register_write(rt2x00dev, TXRX_CSR5, reg);
+       /*
+        * When in atomic context, reschedule and let rt2x00lib
+        * call this function again.
+        */
+       if (in_atomic()) {
+               queue_work(rt2x00dev->hw->workqueue, &rt2x00dev->config_work);
+               return;
+       }
 
        rt73usb_register_read(rt2x00dev, TXRX_CSR0, &reg);
-       value = ((conf->flags & IEEE80211_CONF_SHORT_SLOT_TIME) ?
-                SHORT_DIFS : DIFS) +
-           PLCP + preamble + get_duration(ACK_SIZE, 10);
-       rt2x00_set_field32(&reg, TXRX_CSR0_RX_ACK_TIMEOUT, value);
+       rt2x00_set_field32(&reg, TXRX_CSR0_RX_ACK_TIMEOUT, ack_timeout);
        rt73usb_register_write(rt2x00dev, TXRX_CSR0, reg);
 
        rt73usb_register_read(rt2x00dev, TXRX_CSR4, &reg);
-       if (preamble == SHORT_PREAMBLE)
-               rt2x00_set_field32(&reg, TXRX_CSR4_AUTORESPOND_PREAMBLE, 1);
-       else
-               rt2x00_set_field32(&reg, TXRX_CSR4_AUTORESPOND_PREAMBLE, 0);
+       rt2x00_set_field32(&reg, TXRX_CSR4_AUTORESPOND_PREAMBLE,
+                          !!short_preamble);
        rt73usb_register_write(rt2x00dev, TXRX_CSR4, reg);
 }
 
 static void rt73usb_config_phymode(struct rt2x00_dev *rt2x00dev,
-                                  const int phymode)
+                                  const int basic_rate_mask)
 {
-       struct ieee80211_hw_mode *mode;
-       struct ieee80211_rate *rate;
-
-       if (phymode == MODE_IEEE80211A)
-               rt2x00dev->curr_hwmode = HWMODE_A;
-       else if (phymode == MODE_IEEE80211B)
-               rt2x00dev->curr_hwmode = HWMODE_B;
-       else
-               rt2x00dev->curr_hwmode = HWMODE_G;
-
-       mode = &rt2x00dev->hwmodes[rt2x00dev->curr_hwmode];
-       rate = &mode->rates[mode->num_rates - 1];
-
-       rt73usb_config_rate(rt2x00dev, rate->val2);
+       rt73usb_register_write(rt2x00dev, TXRX_CSR5, basic_rate_mask);
 }
 
-static void rt73usb_config_lock_channel(struct rt2x00_dev *rt2x00dev,
-                                       struct rf_channel *rf,
-                                       const int txpower)
+static void rt73usb_config_channel(struct rt2x00_dev *rt2x00dev,
+                                  struct rf_channel *rf, const int txpower)
 {
        u8 r3;
        u8 r94;
@@ -471,20 +382,6 @@ static void rt73usb_config_lock_channel(struct rt2x00_dev *rt2x00dev,
        udelay(10);
 }
 
-static void rt73usb_config_channel(struct rt2x00_dev *rt2x00dev,
-                                  const int index, const int channel,
-                                  const int txpower)
-{
-       struct rf_channel rf;
-
-       /*
-        * Fill rf_reg structure.
-        */
-       memcpy(&rf, &rt2x00dev->spec.channels[index], sizeof(rf));
-
-       rt73usb_config_lock_channel(rt2x00dev, &rf, txpower);
-}
-
 static void rt73usb_config_txpower(struct rt2x00_dev *rt2x00dev,
                                   const int txpower)
 {
@@ -495,7 +392,7 @@ static void rt73usb_config_txpower(struct rt2x00_dev *rt2x00dev,
        rt2x00_rf_read(rt2x00dev, 3, &rf.rf3);
        rt2x00_rf_read(rt2x00dev, 4, &rf.rf4);
 
-       rt73usb_config_lock_channel(rt2x00dev, &rf, txpower);
+       rt73usb_config_channel(rt2x00dev, &rf, txpower);
 }
 
 static void rt73usb_config_antenna_5x(struct rt2x00_dev *rt2x00dev,
@@ -649,20 +546,18 @@ static void rt73usb_config_antenna(struct rt2x00_dev *rt2x00dev,
 }
 
 static void rt73usb_config_duration(struct rt2x00_dev *rt2x00dev,
-                                   const int short_slot_time,
-                                   const int beacon_int)
+                                   struct rt2x00lib_conf *libconf)
 {
        u32 reg;
 
        rt73usb_register_read(rt2x00dev, MAC_CSR9, &reg);
-       rt2x00_set_field32(&reg, MAC_CSR9_SLOT_TIME,
-                          short_slot_time ? SHORT_SLOT_TIME : SLOT_TIME);
+       rt2x00_set_field32(&reg, MAC_CSR9_SLOT_TIME, libconf->slot_time);
        rt73usb_register_write(rt2x00dev, MAC_CSR9, reg);
 
        rt73usb_register_read(rt2x00dev, MAC_CSR8, &reg);
-       rt2x00_set_field32(&reg, MAC_CSR8_SIFS, SIFS);
+       rt2x00_set_field32(&reg, MAC_CSR8_SIFS, libconf->sifs);
        rt2x00_set_field32(&reg, MAC_CSR8_SIFS_AFTER_RX_OFDM, 3);
-       rt2x00_set_field32(&reg, MAC_CSR8_EIFS, EIFS);
+       rt2x00_set_field32(&reg, MAC_CSR8_EIFS, libconf->eifs);
        rt73usb_register_write(rt2x00dev, MAC_CSR8, reg);
 
        rt73usb_register_read(rt2x00dev, TXRX_CSR0, &reg);
@@ -674,29 +569,27 @@ static void rt73usb_config_duration(struct rt2x00_dev *rt2x00dev,
        rt73usb_register_write(rt2x00dev, TXRX_CSR4, reg);
 
        rt73usb_register_read(rt2x00dev, TXRX_CSR9, &reg);
-       rt2x00_set_field32(&reg, TXRX_CSR9_BEACON_INTERVAL, beacon_int * 16);
+       rt2x00_set_field32(&reg, TXRX_CSR9_BEACON_INTERVAL,
+                          libconf->conf->beacon_int * 16);
        rt73usb_register_write(rt2x00dev, TXRX_CSR9, reg);
 }
 
 static void rt73usb_config(struct rt2x00_dev *rt2x00dev,
                           const unsigned int flags,
-                          struct ieee80211_conf *conf)
+                          struct rt2x00lib_conf *libconf)
 {
-       int short_slot_time = conf->flags & IEEE80211_CONF_SHORT_SLOT_TIME;
-
        if (flags & CONFIG_UPDATE_PHYMODE)
-               rt73usb_config_phymode(rt2x00dev, conf->phymode);
+               rt73usb_config_phymode(rt2x00dev, libconf->basic_rates);
        if (flags & CONFIG_UPDATE_CHANNEL)
-               rt73usb_config_channel(rt2x00dev, conf->channel_val,
-                                      conf->channel, conf->power_level);
+               rt73usb_config_channel(rt2x00dev, &libconf->rf,
+                                      libconf->conf->power_level);
        if ((flags & CONFIG_UPDATE_TXPOWER) && !(flags & CONFIG_UPDATE_CHANNEL))
-               rt73usb_config_txpower(rt2x00dev, conf->power_level);
+               rt73usb_config_txpower(rt2x00dev, libconf->conf->power_level);
        if (flags & CONFIG_UPDATE_ANTENNA)
-               rt73usb_config_antenna(rt2x00dev, conf->antenna_sel_tx,
-                                      conf->antenna_sel_rx);
+               rt73usb_config_antenna(rt2x00dev, libconf->conf->antenna_sel_tx,
+                                      libconf->conf->antenna_sel_rx);
        if (flags & (CONFIG_UPDATE_SLOT_TIME | CONFIG_UPDATE_BEACON_INT))
-               rt73usb_config_duration(rt2x00dev, short_slot_time,
-                                       conf->beacon_int);
+               rt73usb_config_duration(rt2x00dev, libconf);
 }
 
 /*
@@ -1301,7 +1194,7 @@ static int rt73usb_set_device_state(struct rt2x00_dev *rt2x00dev,
  */
 static void rt73usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,
                                  struct data_desc *txd,
-                                 struct data_entry_desc *desc,
+                                 struct txdata_entry_desc *desc,
                                  struct ieee80211_hdr *ieee80211hdr,
                                  unsigned int length,
                                  struct ieee80211_tx_control *control)
@@ -1357,6 +1250,21 @@ static void rt73usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,
        rt2x00_desc_write(txd, 0, word);
 }
 
+static int rt73usb_get_tx_data_len(struct rt2x00_dev *rt2x00dev,
+                                  int maxpacket, struct sk_buff *skb)
+{
+       int length;
+
+       /*
+        * The length _must_ be a multiple of 4,
+        * but it must _not_ be a multiple of the USB packet size.
+        */
+       length = roundup(skb->len, 4);
+       length += (4 * !(length % maxpacket));
+
+       return length;
+}
+
 /*
  * TX data initialization
  */
@@ -1429,8 +1337,8 @@ static int rt73usb_agc_to_rssi(struct rt2x00_dev *rt2x00dev, int rxd_w1)
        return rt2x00_get_field32(rxd_w1, RXD_W1_RSSI_AGC) * 2 - offset;
 }
 
-static int rt73usb_fill_rxdone(struct data_entry *entry,
-                              int *signal, int *rssi, int *ofdm, int *size)
+static void rt73usb_fill_rxdone(struct data_entry *entry,
+                               struct rxdata_entry_desc *desc)
 {
        struct data_desc *rxd = (struct data_desc *)entry->skb->data;
        u32 word0;
@@ -1439,24 +1347,24 @@ static int rt73usb_fill_rxdone(struct data_entry *entry,
        rt2x00_desc_read(rxd, 0, &word0);
        rt2x00_desc_read(rxd, 1, &word1);
 
-       if (rt2x00_get_field32(word0, RXD_W0_CRC_ERROR) ||
-           rt2x00_get_field32(word0, RXD_W0_CIPHER_ERROR))
-               return -EINVAL;
+       desc->flags = 0;
+       if (rt2x00_get_field32(word0, RXD_W0_CRC_ERROR))
+               desc->flags |= RX_FLAG_FAILED_FCS_CRC;
 
        /*
         * Obtain the status about this packet.
         */
-       *signal = rt2x00_get_field32(word1, RXD_W1_SIGNAL);
-       *rssi = rt73usb_agc_to_rssi(entry->ring->rt2x00dev, word1);
-       *ofdm = rt2x00_get_field32(word0, RXD_W0_OFDM);
-       *size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);
+       desc->signal = rt2x00_get_field32(word1, RXD_W1_SIGNAL);
+       desc->rssi = rt73usb_agc_to_rssi(entry->ring->rt2x00dev, word1);
+       desc->ofdm = rt2x00_get_field32(word0, RXD_W0_OFDM);
+       desc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);
 
        /*
         * Pull the skb to clear the descriptor area.
         */
        skb_pull(entry->skb, entry->ring->desc_size);
 
-       return 0;
+       return;
 }
 
 /*
@@ -1802,9 +1710,7 @@ static void rt73usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
         */
        rt2x00dev->hw->flags =
            IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE |
-           IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |
-           IEEE80211_HW_MONITOR_DURING_OPER |
-           IEEE80211_HW_NO_PROBE_FILTERING;
+           IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING;
        rt2x00dev->hw->extra_tx_headroom = TXD_DESC_SIZE;
        rt2x00dev->hw->max_signal = MAX_SIGNAL;
        rt2x00dev->hw->max_rssi = MAX_RX_SSI;
@@ -1878,11 +1784,9 @@ static int rt73usb_probe_hw(struct rt2x00_dev *rt2x00dev)
        rt73usb_probe_hw_mode(rt2x00dev);
 
        /*
-        * USB devices require scheduled packet filter toggling
         * This device requires firmware
         */
-       __set_bit(REQUIRE_FIRMWARE, &rt2x00dev->flags);
-       __set_bit(PACKET_FILTER_SCHEDULED, &rt2x00dev->flags);
+       __set_bit(DRIVER_REQUIRE_FIRMWARE, &rt2x00dev->flags);
 
        /*
         * Set the rssi offset.
@@ -1895,6 +1799,83 @@ static int rt73usb_probe_hw(struct rt2x00_dev *rt2x00dev)
 /*
  * IEEE80211 stack callback functions.
  */
+static void rt73usb_configure_filter(struct ieee80211_hw *hw,
+                                    unsigned int changed_flags,
+                                    unsigned int *total_flags,
+                                    int mc_count,
+                                    struct dev_addr_list *mc_list)
+{
+       struct rt2x00_dev *rt2x00dev = hw->priv;
+       struct interface *intf = &rt2x00dev->interface;
+       u32 reg;
+
+       /*
+        * Mask off any flags we are going to ignore from
+        * the total_flags field.
+        */
+       *total_flags &=
+           FIF_ALLMULTI |
+           FIF_FCSFAIL |
+           FIF_PLCPFAIL |
+           FIF_CONTROL |
+           FIF_OTHER_BSS |
+           FIF_PROMISC_IN_BSS;
+
+       /*
+        * Apply some rules to the filters:
+        * - Some filters imply different filters to be set.
+        * - Some things we can't filter out at all.
+        * - Some filters are set based on interface type.
+        */
+       if (mc_count)
+               *total_flags |= FIF_ALLMULTI;
+       if (*total_flags & FIF_OTHER_BSS ||
+           *total_flags & FIF_PROMISC_IN_BSS)
+               *total_flags |= FIF_PROMISC_IN_BSS | FIF_OTHER_BSS;
+       if (is_interface_type(intf, IEEE80211_IF_TYPE_AP))
+               *total_flags |= FIF_PROMISC_IN_BSS;
+
+       /*
+        * Check if there is any work left for us.
+        */
+       if (intf->filter == *total_flags)
+               return;
+       intf->filter = *total_flags;
+
+       /*
+        * When in atomic context, reschedule and let rt2x00lib
+        * call this function again.
+        */
+       if (in_atomic()) {
+               queue_work(rt2x00dev->hw->workqueue, &rt2x00dev->filter_work);
+               return;
+       }
+
+       /*
+        * Start configuration steps.
+        * Note that the version error will always be dropped
+        * and broadcast frames will always be accepted since
+        * there is no filter for it at this time.
+        */
+       rt73usb_register_read(rt2x00dev, TXRX_CSR0, &reg);
+       rt2x00_set_field32(&reg, TXRX_CSR0_DROP_CRC,
+                          !(*total_flags & FIF_FCSFAIL));
+       rt2x00_set_field32(&reg, TXRX_CSR0_DROP_PHYSICAL,
+                          !(*total_flags & FIF_PLCPFAIL));
+       rt2x00_set_field32(&reg, TXRX_CSR0_DROP_CONTROL,
+                          !(*total_flags & FIF_CONTROL));
+       rt2x00_set_field32(&reg, TXRX_CSR0_DROP_NOT_TO_ME,
+                          !(*total_flags & FIF_PROMISC_IN_BSS));
+       rt2x00_set_field32(&reg, TXRX_CSR0_DROP_TO_DS,
+                          !(*total_flags & FIF_PROMISC_IN_BSS));
+       rt2x00_set_field32(&reg, TXRX_CSR0_DROP_VERSION_ERROR, 1);
+       rt2x00_set_field32(&reg, TXRX_CSR0_DROP_MULTICAST,
+                          !(*total_flags & FIF_ALLMULTI));
+       rt2x00_set_field32(&reg, TXRX_CSR0_DROP_BROADCAST, 0);
+       rt2x00_set_field32(&reg, TXRX_CSR0_DROP_ACK_CTS, 1);
+       rt73usb_register_write(rt2x00dev, TXRX_CSR0, reg);
+}
+
 static int rt73usb_set_retry_limit(struct ieee80211_hw *hw,
                                   u32 short_retry, u32 long_retry)
 {
@@ -1929,6 +1910,8 @@ static u64 rt73usb_get_tsf(struct ieee80211_hw *hw)
 
        return tsf;
 }
+#else
+#define rt73usb_get_tsf        NULL
 #endif
 
 static void rt73usb_reset_tsf(struct ieee80211_hw *hw)
@@ -1939,7 +1922,7 @@ static void rt73usb_reset_tsf(struct ieee80211_hw *hw)
        rt73usb_register_write(rt2x00dev, TXRX_CSR13, 0);
 }
 
-int rt73usb_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb,
+static int rt73usb_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb,
                          struct ieee80211_tx_control *control)
 {
        struct rt2x00_dev *rt2x00dev = hw->priv;
@@ -1956,6 +1939,8 @@ int rt73usb_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb,
         * First we create the beacon.
         */
        skb_push(skb, TXD_DESC_SIZE);
+       memset(skb->data, 0, TXD_DESC_SIZE);
+
        rt2x00lib_write_tx_desc(rt2x00dev, (struct data_desc *)skb->data,
                                (struct ieee80211_hdr *)(skb->data +
                                                         TXD_DESC_SIZE),
@@ -1977,21 +1962,19 @@ int rt73usb_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb,
 
 static const struct ieee80211_ops rt73usb_mac80211_ops = {
        .tx                     = rt2x00mac_tx,
+       .start                  = rt2x00mac_start,
+       .stop                   = rt2x00mac_stop,
        .add_interface          = rt2x00mac_add_interface,
        .remove_interface       = rt2x00mac_remove_interface,
        .config                 = rt2x00mac_config,
        .config_interface       = rt2x00mac_config_interface,
-       .set_multicast_list     = rt2x00mac_set_multicast_list,
+       .configure_filter       = rt73usb_configure_filter,
        .get_stats              = rt2x00mac_get_stats,
        .set_retry_limit        = rt73usb_set_retry_limit,
+       .erp_ie_changed         = rt2x00mac_erp_ie_changed,
        .conf_tx                = rt2x00mac_conf_tx,
        .get_tx_stats           = rt2x00mac_get_tx_stats,
-#if 0
-/*
- * See comment at the rt73usb_get_tsf function.
- */
        .get_tsf                = rt73usb_get_tsf,
-#endif
        .reset_tsf              = rt73usb_reset_tsf,
        .beacon_update          = rt73usb_beacon_update,
 };
@@ -2008,12 +1991,13 @@ static const struct rt2x00lib_ops rt73usb_rt2x00_ops = {
        .link_tuner             = rt73usb_link_tuner,
        .write_tx_desc          = rt73usb_write_tx_desc,
        .write_tx_data          = rt2x00usb_write_tx_data,
+       .get_tx_data_len        = rt73usb_get_tx_data_len,
        .kick_tx_queue          = rt73usb_kick_tx_queue,
        .fill_rxdone            = rt73usb_fill_rxdone,
        .config_mac_addr        = rt73usb_config_mac_addr,
        .config_bssid           = rt73usb_config_bssid,
-       .config_packet_filter   = rt73usb_config_packet_filter,
        .config_type            = rt73usb_config_type,
+       .config_preamble        = rt73usb_config_preamble,
        .config                 = rt73usb_config,
 };