Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (37 commits)
  forcedeth bug fix: realtek phy
  forcedeth bug fix: vitesse phy
  forcedeth bug fix: cicada phy
  atl1: reorder atl1_main functions
  atl1: fix excessively indented code
  atl1: cleanup atl1_main
  atl1: header file cleanup
  atl1: remove irq_sem
  cdc-subset to support new vendor/product ID
  8139cp: implement the missing dev->tx_timeout
  myri10ge: Remove nonsensical limit in the tx done routine
  gianfar: kill unused header
  EP93XX_ETH must select MII
  macb: Add multicast capability
  macb: Use generic PHY layer
  s390: add barriers to qeth driver
  s390: scatter-gather for inbound traffic in qeth driver
  eHEA: Introducing support vor DLPAR memory add
  Fix a potential NULL pointer dereference in free_shared_mem() in drivers/net/s2io.c
  [PATCH] softmac: Fix ESSID problem
  ...

12 files changed, 152 insertions, 135 deletions

diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c
index 5b624bfc01a6..c39f1984b84d 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.c
+++ b/drivers/net/wireless/zd1211rw/zd_chip.c
@@ -49,8 +49,9 @@ void zd_chip_clear(struct zd_chip *chip)
         ZD_MEMCLEAR(chip, sizeof(*chip));
 }
 
-static int scnprint_mac_oui(const u8 *addr, char *buffer, size_t size)
+static int scnprint_mac_oui(struct zd_chip *chip, char *buffer, size_t size)
 {
+        u8 *addr = zd_usb_to_netdev(&chip->usb)->dev_addr;
         return scnprintf(buffer, size, "%02x-%02x-%02x",
                          addr[0], addr[1], addr[2]);
 }
@@ -61,10 +62,10 @@ static int scnprint_id(struct zd_chip *chip, char *buffer, size_t size)
         int i = 0;
 
         i = scnprintf(buffer, size, "zd1211%s chip ",
-                      chip->is_zd1211b ? "b" : "");
+                      zd_chip_is_zd1211b(chip) ? "b" : "");
         i += zd_usb_scnprint_id(&chip->usb, buffer+i, size-i);
         i += scnprintf(buffer+i, size-i, " ");
-        i += scnprint_mac_oui(chip->e2p_mac, buffer+i, size-i);
+        i += scnprint_mac_oui(chip, buffer+i, size-i);
         i += scnprintf(buffer+i, size-i, " ");
         i += zd_rf_scnprint_id(&chip->rf, buffer+i, size-i);
         i += scnprintf(buffer+i, size-i, " pa%1x %c%c%c%c%c", chip->pa_type,
@@ -366,64 +367,9 @@ error:
         return r;
 }
 
-static int _read_mac_addr(struct zd_chip *chip, u8 *mac_addr,
-                          const zd_addr_t *addr)
-{
-        int r;
-        u32 parts[2];
-
-        r = zd_ioread32v_locked(chip, parts, (const zd_addr_t *)addr, 2);
-        if (r) {
-                dev_dbg_f(zd_chip_dev(chip),
-                        "error: couldn't read e2p macs. Error number %d\n", r);
-                return r;
-        }
-
-        mac_addr[0] = parts[0];
-        mac_addr[1] = parts[0] >>  8;
-        mac_addr[2] = parts[0] >> 16;
-        mac_addr[3] = parts[0] >> 24;
-        mac_addr[4] = parts[1];
-        mac_addr[5] = parts[1] >>  8;
-
-        return 0;
-}
-
-static int read_e2p_mac_addr(struct zd_chip *chip)
-{
-        static const zd_addr_t addr[2] = { E2P_MAC_ADDR_P1, E2P_MAC_ADDR_P2 };
-
-        ZD_ASSERT(mutex_is_locked(&chip->mutex));
-        return _read_mac_addr(chip, chip->e2p_mac, (const zd_addr_t *)addr);
-}
-
 /* MAC address: if custom mac addresses are to to be used CR_MAC_ADDR_P1 and
  *              CR_MAC_ADDR_P2 must be overwritten
  */
-void zd_get_e2p_mac_addr(struct zd_chip *chip, u8 *mac_addr)
-{
-        mutex_lock(&chip->mutex);
-        memcpy(mac_addr, chip->e2p_mac, ETH_ALEN);
-        mutex_unlock(&chip->mutex);
-}
-
-static int read_mac_addr(struct zd_chip *chip, u8 *mac_addr)
-{
-        static const zd_addr_t addr[2] = { CR_MAC_ADDR_P1, CR_MAC_ADDR_P2 };
-        return _read_mac_addr(chip, mac_addr, (const zd_addr_t *)addr);
-}
-
-int zd_read_mac_addr(struct zd_chip *chip, u8 *mac_addr)
-{
-        int r;
-
-        dev_dbg_f(zd_chip_dev(chip), "\n");
-        mutex_lock(&chip->mutex);
-        r = read_mac_addr(chip, mac_addr);
-        mutex_unlock(&chip->mutex);
-        return r;
-}
-
 int zd_write_mac_addr(struct zd_chip *chip, const u8 *mac_addr)
 {
         int r;
@@ -444,12 +390,6 @@ int zd_write_mac_addr(struct zd_chip *chip, const u8 *mac_addr)
 
         mutex_lock(&chip->mutex);
         r = zd_iowrite32a_locked(chip, reqs, ARRAY_SIZE(reqs));
-#ifdef DEBUG
-        {
-                u8 tmp[ETH_ALEN];
-                read_mac_addr(chip, tmp);
-        }
-#endif /* DEBUG */
         mutex_unlock(&chip->mutex);
         return r;
 }
@@ -809,7 +749,7 @@ out:
 
 static int hw_reset_phy(struct zd_chip *chip)
 {
-        return chip->is_zd1211b ? zd1211b_hw_reset_phy(chip) :
+        return zd_chip_is_zd1211b(chip) ? zd1211b_hw_reset_phy(chip) :
                                   zd1211_hw_reset_phy(chip);
 }
 
@@ -874,7 +814,7 @@ static int hw_init_hmac(struct zd_chip *chip)
         if (r)
                 return r;
 
-        return chip->is_zd1211b ?
+        return zd_chip_is_zd1211b(chip) ?
                 zd1211b_hw_init_hmac(chip) : zd1211_hw_init_hmac(chip);
 }
 
@@ -1136,8 +1076,15 @@ static int read_fw_regs_offset(struct zd_chip *chip)
         return 0;
 }
 
+/* Read mac address using pre-firmware interface */
+int zd_chip_read_mac_addr_fw(struct zd_chip *chip, u8 *addr)
+{
+        dev_dbg_f(zd_chip_dev(chip), "\n");
+        return zd_usb_read_fw(&chip->usb, E2P_MAC_ADDR_P1, addr,
+                ETH_ALEN);
+}
 
-int zd_chip_init_hw(struct zd_chip *chip, u8 device_type)
+int zd_chip_init_hw(struct zd_chip *chip)
 {
         int r;
         u8 rf_type;
@@ -1145,7 +1092,6 @@ int zd_chip_init_hw(struct zd_chip *chip, u8 device_type)
         dev_dbg_f(zd_chip_dev(chip), "\n");
 
         mutex_lock(&chip->mutex);
-        chip->is_zd1211b = (device_type == DEVICE_ZD1211B) != 0;
 
 #ifdef DEBUG
         r = test_init(chip);
@@ -1201,10 +1147,6 @@ int zd_chip_init_hw(struct zd_chip *chip, u8 device_type)
                 goto out;
 #endif /* DEBUG */
 
-        r = read_e2p_mac_addr(chip);
-        if (r)
-                goto out;
-
         r = read_cal_int_tables(chip);
         if (r)
                 goto out;
@@ -1259,7 +1201,7 @@ static int update_channel_integration_and_calibration(struct zd_chip *chip,
         r = update_pwr_int(chip, channel);
         if (r)
                 return r;
-        if (chip->is_zd1211b) {
+        if (zd_chip_is_zd1211b(chip)) {
                 static const struct zd_ioreq16 ioreqs[] = {
                         { CR69, 0x28 },
                         {},
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.h b/drivers/net/wireless/zd1211rw/zd_chip.h
index 79d0288c193a..f4698576ab71 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.h
+++ b/drivers/net/wireless/zd1211rw/zd_chip.h
@@ -704,7 +704,6 @@ struct zd_chip {
         struct mutex mutex;
         /* Base address of FW_REG_ registers */
         zd_addr_t fw_regs_base;
-        u8 e2p_mac[ETH_ALEN];
         /* EepSetPoint in the vendor driver */
         u8 pwr_cal_values[E2P_CHANNEL_COUNT];
         /* integration values in the vendor driver */
@@ -715,7 +714,7 @@ struct zd_chip {
         unsigned int pa_type:4,
                 patch_cck_gain:1, patch_cr157:1, patch_6m_band_edge:1,
                 new_phy_layout:1, al2230s_bit:1,
-                is_zd1211b:1, supports_tx_led:1;
+                supports_tx_led:1;
 };
 
 static inline struct zd_chip *zd_usb_to_chip(struct zd_usb *usb)
@@ -734,9 +733,15 @@ void zd_chip_init(struct zd_chip *chip,
                  struct net_device *netdev,
                  struct usb_interface *intf);
 void zd_chip_clear(struct zd_chip *chip);
-int zd_chip_init_hw(struct zd_chip *chip, u8 device_type);
+int zd_chip_read_mac_addr_fw(struct zd_chip *chip, u8 *addr);
+int zd_chip_init_hw(struct zd_chip *chip);
 int zd_chip_reset(struct zd_chip *chip);
 
+static inline int zd_chip_is_zd1211b(struct zd_chip *chip)
+{
+        return chip->usb.is_zd1211b;
+}
+
 static inline int zd_ioread16v_locked(struct zd_chip *chip, u16 *values,
                                       const zd_addr_t *addresses,
                                       unsigned int count)
@@ -825,8 +830,6 @@ static inline u8 _zd_chip_get_channel(struct zd_chip *chip)
 }
 u8  zd_chip_get_channel(struct zd_chip *chip);
 int zd_read_regdomain(struct zd_chip *chip, u8 *regdomain);
-void zd_get_e2p_mac_addr(struct zd_chip *chip, u8 *mac_addr);
-int zd_read_mac_addr(struct zd_chip *chip, u8 *mac_addr);
 int zd_write_mac_addr(struct zd_chip *chip, const u8 *mac_addr);
 int zd_chip_switch_radio_on(struct zd_chip *chip);
 int zd_chip_switch_radio_off(struct zd_chip *chip);
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index 6753d240c168..f6c487aa8246 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -86,38 +86,46 @@ out:
         return r;
 }
 
-int zd_mac_init_hw(struct zd_mac *mac, u8 device_type)
+int zd_mac_preinit_hw(struct zd_mac *mac)
 {
         int r;
-        struct zd_chip *chip = &mac->chip;
         u8 addr[ETH_ALEN];
+
+        r = zd_chip_read_mac_addr_fw(&mac->chip, addr);
+        if (r)
+                return r;
+
+        memcpy(mac->netdev->dev_addr, addr, ETH_ALEN);
+        return 0;
+}
+
+int zd_mac_init_hw(struct zd_mac *mac)
+{
+        int r;
+        struct zd_chip *chip = &mac->chip;
         u8 default_regdomain;
 
         r = zd_chip_enable_int(chip);
         if (r)
                 goto out;
-        r = zd_chip_init_hw(chip, device_type);
+        r = zd_chip_init_hw(chip);
         if (r)
                 goto disable_int;
 
-        zd_get_e2p_mac_addr(chip, addr);
-        r = zd_write_mac_addr(chip, addr);
-        if (r)
-                goto disable_int;
         ZD_ASSERT(!irqs_disabled());
-        spin_lock_irq(&mac->lock);
-        memcpy(mac->netdev->dev_addr, addr, ETH_ALEN);
-        spin_unlock_irq(&mac->lock);
 
         r = zd_read_regdomain(chip, &default_regdomain);
         if (r)
                 goto disable_int;
         if (!zd_regdomain_supported(default_regdomain)) {
-                dev_dbg_f(zd_mac_dev(mac),
-                          "Regulatory Domain %#04x is not supported.\n",
-                          default_regdomain);
-                r = -EINVAL;
-                goto disable_int;
+                /* 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;
@@ -164,14 +172,25 @@ int zd_mac_open(struct net_device *netdev)
 {
         struct zd_mac *mac = zd_netdev_mac(netdev);
         struct zd_chip *chip = &mac->chip;
+        struct zd_usb *usb = &chip->usb;
         int r;
 
+        if (!usb->initialized) {
+                r = zd_usb_init_hw(usb);
+                if (r)
+                        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;
@@ -251,9 +270,11 @@ int zd_mac_set_mac_address(struct net_device *netdev, void *p)
         dev_dbg_f(zd_mac_dev(mac),
                   "Setting MAC to " MAC_FMT "\n", MAC_ARG(addr->sa_data));
 
-        r = zd_write_mac_addr(chip, addr->sa_data);
-        if (r)
-                return r;
+        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);
@@ -855,7 +876,7 @@ static int fill_ctrlset(struct zd_mac *mac,
         /* ZD1211B: Computing the length difference this way, gives us
          * flexibility to compute the packet length.
          */
-        cs->packet_length = cpu_to_le16(mac->chip.is_zd1211b ?
+        cs->packet_length = cpu_to_le16(zd_chip_is_zd1211b(&mac->chip) ?
                         packet_length - frag_len : packet_length);
 
         /*
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.h b/drivers/net/wireless/zd1211rw/zd_mac.h
index faf4c7828d4e..9f9344eb50f9 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.h
+++ b/drivers/net/wireless/zd1211rw/zd_mac.h
@@ -189,7 +189,8 @@ int zd_mac_init(struct zd_mac *mac,
                 struct usb_interface *intf);
 void zd_mac_clear(struct zd_mac *mac);
 
-int zd_mac_init_hw(struct zd_mac *mac, u8 device_type);
+int zd_mac_preinit_hw(struct zd_mac *mac);
+int zd_mac_init_hw(struct zd_mac *mac);
 
 int zd_mac_open(struct net_device *netdev);
 int zd_mac_stop(struct net_device *netdev);
diff --git a/drivers/net/wireless/zd1211rw/zd_rf.c b/drivers/net/wireless/zd1211rw/zd_rf.c
index 7407409b60b1..abe5d38f7f4d 100644
--- a/drivers/net/wireless/zd1211rw/zd_rf.c
+++ b/drivers/net/wireless/zd1211rw/zd_rf.c
@@ -34,7 +34,7 @@ static const char * const rfs[] = {
         [AL2210_RF]     = "AL2210_RF",
         [MAXIM_NEW_RF]  = "MAXIM_NEW_RF",
         [UW2453_RF]     = "UW2453_RF",
-        [UNKNOWN_A_RF]  = "UNKNOWN_A_RF",
+        [AL2230S_RF]    = "AL2230S_RF",
         [RALINK_RF]     = "RALINK_RF",
         [INTERSIL_RF]   = "INTERSIL_RF",
         [RF2959_RF]     = "RF2959_RF",
@@ -77,6 +77,7 @@ int zd_rf_init_hw(struct zd_rf *rf, u8 type)
                 r = zd_rf_init_rf2959(rf);
                 break;
         case AL2230_RF:
+        case AL2230S_RF:
                 r = zd_rf_init_al2230(rf);
                 break;
         case AL7230B_RF:
diff --git a/drivers/net/wireless/zd1211rw/zd_rf.h b/drivers/net/wireless/zd1211rw/zd_rf.h
index c6dfd8227f6e..30502f26b71c 100644
--- a/drivers/net/wireless/zd1211rw/zd_rf.h
+++ b/drivers/net/wireless/zd1211rw/zd_rf.h
@@ -26,7 +26,7 @@
 #define AL2210_RF                       0x7
 #define MAXIM_NEW_RF                    0x8
 #define UW2453_RF                       0x9
-#define UNKNOWN_A_RF                    0xa
+#define AL2230S_RF                      0xa
 #define RALINK_RF                       0xb
 #define INTERSIL_RF                     0xc
 #define RF2959_RF                       0xd
diff --git a/drivers/net/wireless/zd1211rw/zd_rf_al2230.c b/drivers/net/wireless/zd1211rw/zd_rf_al2230.c
index e7a4ecf7b6e2..006774de3202 100644
--- a/drivers/net/wireless/zd1211rw/zd_rf_al2230.c
+++ b/drivers/net/wireless/zd1211rw/zd_rf_al2230.c
@@ -21,6 +21,8 @@
 #include "zd_usb.h"
 #include "zd_chip.h"
 
+#define IS_AL2230S(chip) ((chip)->al2230s_bit || (chip)->rf.type == AL2230S_RF)
+
 static const u32 zd1211_al2230_table[][3] = {
         RF_CHANNEL( 1) = { 0x03f790, 0x033331, 0x00000d, },
         RF_CHANNEL( 2) = { 0x03f790, 0x0b3331, 0x00000d, },
@@ -176,7 +178,7 @@ static int zd1211_al2230_init_hw(struct zd_rf *rf)
         if (r)
                 return r;
 
-        if (chip->al2230s_bit) {
+        if (IS_AL2230S(chip)) {
                 r = zd_iowrite16a_locked(chip, ioreqs_init_al2230s,
                         ARRAY_SIZE(ioreqs_init_al2230s));
                 if (r)
@@ -188,7 +190,7 @@ static int zd1211_al2230_init_hw(struct zd_rf *rf)
                 return r;
 
         /* improve band edge for AL2230S */
-        if (chip->al2230s_bit)
+        if (IS_AL2230S(chip))
                 r = zd_rfwrite_locked(chip, 0x000824, RF_RV_BITS);
         else
                 r = zd_rfwrite_locked(chip, 0x0005a4, RF_RV_BITS);
@@ -314,7 +316,7 @@ static int zd1211b_al2230_init_hw(struct zd_rf *rf)
         if (r)
                 return r;
 
-        if (chip->al2230s_bit) {
+        if (IS_AL2230S(chip)) {
                 r = zd_iowrite16a_locked(chip, ioreqs_init_al2230s,
                         ARRAY_SIZE(ioreqs_init_al2230s));
                 if (r)
@@ -328,7 +330,7 @@ static int zd1211b_al2230_init_hw(struct zd_rf *rf)
         if (r)
                 return r;
 
-        if (chip->al2230s_bit)
+        if (IS_AL2230S(chip))
                 r = zd_rfwrite_locked(chip, 0x241000, RF_RV_BITS);
         else
                 r = zd_rfwrite_locked(chip, 0x25a000, RF_RV_BITS);
@@ -422,7 +424,7 @@ int zd_rf_init_al2230(struct zd_rf *rf)
         struct zd_chip *chip = zd_rf_to_chip(rf);
 
         rf->switch_radio_off = al2230_switch_radio_off;
-        if (chip->is_zd1211b) {
+        if (zd_chip_is_zd1211b(chip)) {
                 rf->init_hw = zd1211b_al2230_init_hw;
                 rf->set_channel = zd1211b_al2230_set_channel;
                 rf->switch_radio_on = zd1211b_al2230_switch_radio_on;
diff --git a/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c b/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c
index f4e8b6ada854..73d0bb26f810 100644
--- a/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c
+++ b/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c
@@ -473,7 +473,7 @@ int zd_rf_init_al7230b(struct zd_rf *rf)
 {
         struct zd_chip *chip = zd_rf_to_chip(rf);
 
-        if (chip->is_zd1211b) {
+        if (zd_chip_is_zd1211b(chip)) {
                 rf->init_hw = zd1211b_al7230b_init_hw;
                 rf->switch_radio_on = zd1211b_al7230b_switch_radio_on;
                 rf->set_channel = zd1211b_al7230b_set_channel;
diff --git a/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c b/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
index 2d736bdf707c..cc70d40684ea 100644
--- a/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
+++ b/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
@@ -265,7 +265,7 @@ int zd_rf_init_rf2959(struct zd_rf *rf)
 {
         struct zd_chip *chip = zd_rf_to_chip(rf);
 
-        if (chip->is_zd1211b) {
+        if (zd_chip_is_zd1211b(chip)) {
                 dev_err(zd_chip_dev(chip),
                        "RF2959 is currently not supported for ZD1211B"
                        " devices\n");
diff --git a/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c b/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c
index 414e40d571ab..857dcf3eae61 100644
--- a/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c
+++ b/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c
@@ -486,7 +486,7 @@ static int uw2453_switch_radio_on(struct zd_rf *rf)
         if (r)
                 return r;
 
-        if (chip->is_zd1211b)
+        if (zd_chip_is_zd1211b(chip))
                 ioreqs[1].value = 0x7f;
 
         return zd_iowrite16a_locked(chip, ioreqs, ARRAY_SIZE(ioreqs));
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
index ca24299a26c6..28d41a29d7b1 100644
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
@@ -71,6 +71,7 @@ static struct usb_device_id usb_ids[] = {
         { USB_DEVICE(0x0586, 0x3412), .driver_info = DEVICE_ZD1211B },
         { USB_DEVICE(0x0586, 0x3413), .driver_info = DEVICE_ZD1211B },
         { USB_DEVICE(0x0053, 0x5301), .driver_info = DEVICE_ZD1211B },
+        { USB_DEVICE(0x0411, 0x00da), .driver_info = DEVICE_ZD1211B },
         /* "Driverless" devices that need ejecting */
         { USB_DEVICE(0x0ace, 0x2011), .driver_info = DEVICE_INSTALLER },
         { USB_DEVICE(0x0ace, 0x20ff), .driver_info = DEVICE_INSTALLER },
@@ -195,26 +196,27 @@ static u16 get_word(const void *data, u16 offset)
         return le16_to_cpu(p[offset]);
 }
 
-static char *get_fw_name(char *buffer, size_t size, u8 device_type,
+static char *get_fw_name(struct zd_usb *usb, char *buffer, size_t size,
                        const char* postfix)
 {
         scnprintf(buffer, size, "%s%s",
-                device_type == DEVICE_ZD1211B ?
+                usb->is_zd1211b ?
                         FW_ZD1211B_PREFIX : FW_ZD1211_PREFIX,
                 postfix);
         return buffer;
 }
 
-static int handle_version_mismatch(struct usb_device *udev, u8 device_type,
+static int handle_version_mismatch(struct zd_usb *usb,
         const struct firmware *ub_fw)
 {
+        struct usb_device *udev = zd_usb_to_usbdev(usb);
         const struct firmware *ur_fw = NULL;
         int offset;
         int r = 0;
         char fw_name[128];
 
         r = request_fw_file(&ur_fw,
-                get_fw_name(fw_name, sizeof(fw_name), device_type, "ur"),
+                get_fw_name(usb, fw_name, sizeof(fw_name), "ur"),
                 &udev->dev);
         if (r)
                 goto error;
@@ -237,11 +239,12 @@ error:
         return r;
 }
 
-static int upload_firmware(struct usb_device *udev, u8 device_type)
+static int upload_firmware(struct zd_usb *usb)
 {
         int r;
         u16 fw_bcdDevice;
         u16 bcdDevice;
+        struct usb_device *udev = zd_usb_to_usbdev(usb);
         const struct firmware *ub_fw = NULL;
         const struct firmware *uph_fw = NULL;
         char fw_name[128];
@@ -249,7 +252,7 @@ static int upload_firmware(struct usb_device *udev, u8 device_type)
         bcdDevice = get_bcdDevice(udev);
 
         r = request_fw_file(&ub_fw,
-                get_fw_name(fw_name, sizeof(fw_name), device_type,  "ub"),
+                get_fw_name(usb, fw_name, sizeof(fw_name), "ub"),
                 &udev->dev);
         if (r)
                 goto error;
@@ -264,7 +267,7 @@ static int upload_firmware(struct usb_device *udev, u8 device_type)
                         dev_warn(&udev->dev, "device has old bootcode, please "
                                 "report success or failure\n");
 
-                r = handle_version_mismatch(udev, device_type, ub_fw);
+                r = handle_version_mismatch(usb, ub_fw);
                 if (r)
                         goto error;
         } else {
@@ -275,7 +278,7 @@ static int upload_firmware(struct usb_device *udev, u8 device_type)
 
 
         r = request_fw_file(&uph_fw,
-                get_fw_name(fw_name, sizeof(fw_name), device_type, "uphr"),
+                get_fw_name(usb, fw_name, sizeof(fw_name), "uphr"),
                 &udev->dev);
         if (r)
                 goto error;
@@ -294,6 +297,30 @@ error:
         return r;
 }
 
+/* Read data from device address space using "firmware interface" which does
+ * not require firmware to be loaded. */
+int zd_usb_read_fw(struct zd_usb *usb, zd_addr_t addr, u8 *data, u16 len)
+{
+        int r;
+        struct usb_device *udev = zd_usb_to_usbdev(usb);
+
+        r = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
+                USB_REQ_FIRMWARE_READ_DATA, USB_DIR_IN | 0x40, addr, 0,
+                data, len, 5000);
+        if (r < 0) {
+                dev_err(&udev->dev,
+                        "read over firmware interface failed: %d\n", r);
+                return r;
+        } else if (r != len) {
+                dev_err(&udev->dev,
+                        "incomplete read over firmware interface: %d/%d\n",
+                        r, len);
+                return -EIO;
+        }
+
+        return 0;
+}
+
 #define urb_dev(urb) (&(urb)->dev->dev)
 
 static inline void handle_regs_int(struct urb *urb)
@@ -920,9 +947,42 @@ static int eject_installer(struct usb_interface *intf)
         return 0;
 }
 
+int zd_usb_init_hw(struct zd_usb *usb)
+{
+        int r;
+        struct zd_mac *mac = zd_usb_to_mac(usb);
+
+        dev_dbg_f(zd_usb_dev(usb), "\n");
+
+        r = upload_firmware(usb);
+        if (r) {
+                dev_err(zd_usb_dev(usb),
+                       "couldn't load firmware. Error number %d\n", r);
+                return r;
+        }
+
+        r = usb_reset_configuration(zd_usb_to_usbdev(usb));
+        if (r) {
+                dev_dbg_f(zd_usb_dev(usb),
+                        "couldn't reset configuration. Error number %d\n", r);
+                return r;
+        }
+
+        r = zd_mac_init_hw(mac);
+        if (r) {
+                dev_dbg_f(zd_usb_dev(usb),
+                         "couldn't initialize mac. Error number %d\n", r);
+                return r;
+        }
+
+        usb->initialized = 1;
+        return 0;
+}
+
 static int probe(struct usb_interface *intf, const struct usb_device_id *id)
 {
         int r;
+        struct zd_usb *usb;
         struct usb_device *udev = interface_to_usbdev(intf);
         struct net_device *netdev = NULL;
 
@@ -950,26 +1010,10 @@ static int probe(struct usb_interface *intf, const struct usb_device_id *id)
                 goto error;
         }
 
-        r = upload_firmware(udev, id->driver_info);
-        if (r) {
-                dev_err(&intf->dev,
-                       "couldn't load firmware. Error number %d\n", r);
-                goto error;
-        }
+        usb = &zd_netdev_mac(netdev)->chip.usb;
+        usb->is_zd1211b = (id->driver_info == DEVICE_ZD1211B) != 0;
 
-        r = usb_reset_configuration(udev);
-        if (r) {
-                dev_dbg_f(&intf->dev,
-                        "couldn't reset configuration. Error number %d\n", r);
-                goto error;
-        }
-
-        /* At this point the interrupt endpoint is not generally enabled. We
-         * save the USB bandwidth until the network device is opened. But
-         * notify that the initialization of the MAC will require the
-         * interrupts to be temporary enabled.
-         */
-        r = zd_mac_init_hw(zd_netdev_mac(netdev), id->driver_info);
+        r = zd_mac_preinit_hw(zd_netdev_mac(netdev));
         if (r) {
                 dev_dbg_f(&intf->dev,
                          "couldn't initialize mac. Error number %d\n", r);
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.h b/drivers/net/wireless/zd1211rw/zd_usb.h
index 506ea6a74393..961a7a12ad68 100644
--- a/drivers/net/wireless/zd1211rw/zd_usb.h
+++ b/drivers/net/wireless/zd1211rw/zd_usb.h
@@ -188,6 +188,7 @@ struct zd_usb {
         struct zd_usb_rx rx;
         struct zd_usb_tx tx;
         struct usb_interface *intf;
+        u8 is_zd1211b:1, initialized:1;
 };
 
 #define zd_usb_dev(usb) (&usb->intf->dev)
@@ -236,6 +237,8 @@ int zd_usb_iowrite16v(struct zd_usb *usb, const struct zd_ioreq16 *ioreqs,
 
 int zd_usb_rfwrite(struct zd_usb *usb, u32 value, u8 bits);
 
+int zd_usb_read_fw(struct zd_usb *usb, zd_addr_t addr, u8 *data, u16 len);
+
 extern struct workqueue_struct *zd_workqueue;
 
 #endif /* _ZD_USB_H */