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: (48 commits)
  [PATCH] bonding: update version number
  [PATCH] git-netdev-all: pc300_tty build fix
  [PATCH] Make PC300 WAN driver compile again
  [PATCH] Modularize generic HDLC
  [PATCH] more s2io __iomem annotations
  [PATCH] restore __iomem annotations in e1000
  [PATCH] 64bit bugs in s2io
  [PATCH] bonding: Fix primary selection error at enslavement time
  [PATCH] bonding: Don't mangle LACPDUs
  [PATCH] bonding: Validate probe replies in ARP monitor
  [PATCH] bonding: Don't release slaves when master is admin down
  [PATCH] bonding: Add priv_flag to avoid event mishandling
  [PATCH] bonding: Handle large hard_header_len
  [PATCH] bonding: Remove unneeded NULL test
  [PATCH] bonding: Format fix in seq_printf call
  [PATCH] bonding: Convert delay value from s16 to int
  [PATCH] bonding: Allow bonding to enslave a 10 Gig adapter
  Delete unused drivers/net/gt64240eth.h
  [PATCH] skge: fiber support
  [PATCH] fix possible NULL ptr deref in forcedeth
  ...

5 files changed, 15 insertions, 18 deletions

diff --git a/drivers/net/wireless/bcm43xx/bcm43xx.h b/drivers/net/wireless/bcm43xx/bcm43xx.h
index 6d4ea36bc564..d6a8bf09878e 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx.h
+++ b/drivers/net/wireless/bcm43xx/bcm43xx.h
@@ -666,7 +666,6 @@ struct bcm43xx_noise_calculation {
 };
 
 struct bcm43xx_stats {
-        u8 link_quality;
         u8 noise;
         struct iw_statistics wstats;
         /* Store the last TX/RX times here for updating the leds. */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index cb9a3ae8463a..eb65db7393ba 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -2405,9 +2405,10 @@ static int bcm43xx_chip_init(struct bcm43xx_private *bcm)
                                    BCM43xx_UCODE_TIME) & 0x1f);
 
         if ( value16 > 0x128 ) {
-                dprintk(KERN_ERR PFX
-                        "Firmware: no support for microcode rev > 0x128\n");
-                err = -1;
+                printk(KERN_ERR PFX
+                        "Firmware: no support for microcode extracted "
+                        "from version 4.x binary drivers.\n");
+                err = -EOPNOTSUPP;
                 goto err_release_fw;
         }
 
@@ -3169,8 +3170,7 @@ static void bcm43xx_periodic_work_handler(void *d)
                  * be preemtible.
                  */
                 mutex_lock(&bcm->mutex);
-                netif_stop_queue(bcm->net_dev);
-                synchronize_net();
+                netif_tx_disable(bcm->net_dev);
                 spin_lock_irqsave(&bcm->irq_lock, flags);
                 bcm43xx_mac_suspend(bcm);
                 if (bcm43xx_using_pio(bcm))
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
index eafd0f662686..52ce2a9334fb 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
@@ -361,7 +361,7 @@ static void bcm43xx_phy_setupg(struct bcm43xx_private *bcm)
         if (phy->rev <= 2)
                 for (i = 0; i < BCM43xx_ILT_NOISESCALEG_SIZE; i++)
                         bcm43xx_ilt_write(bcm, 0x1400 + i, bcm43xx_ilt_noisescaleg1[i]);
-        else if ((phy->rev == 7) && (bcm43xx_phy_read(bcm, 0x0449) & 0x0200))
+        else if ((phy->rev >= 7) && (bcm43xx_phy_read(bcm, 0x0449) & 0x0200))
                 for (i = 0; i < BCM43xx_ILT_NOISESCALEG_SIZE; i++)
                         bcm43xx_ilt_write(bcm, 0x1400 + i, bcm43xx_ilt_noisescaleg3[i]);
         else
@@ -371,7 +371,7 @@ static void bcm43xx_phy_setupg(struct bcm43xx_private *bcm)
         if (phy->rev == 2)
                 for (i = 0; i < BCM43xx_ILT_SIGMASQR_SIZE; i++)
                         bcm43xx_ilt_write(bcm, 0x5000 + i, bcm43xx_ilt_sigmasqr1[i]);
-        else if ((phy->rev > 2) && (phy->rev <= 7))
+        else if ((phy->rev > 2) && (phy->rev <= 8))
                 for (i = 0; i < BCM43xx_ILT_SIGMASQR_SIZE; i++)
                         bcm43xx_ilt_write(bcm, 0x5000 + i, bcm43xx_ilt_sigmasqr2[i]);
         
@@ -1197,7 +1197,7 @@ static void bcm43xx_phy_initg(struct bcm43xx_private *bcm)
 
         if (phy->rev == 1)
                 bcm43xx_phy_initb5(bcm);
-        else if (phy->rev >= 2 && phy->rev <= 7)
+        else
                 bcm43xx_phy_initb6(bcm);
         if (phy->rev >= 2 || phy->connected)
                 bcm43xx_phy_inita(bcm);
@@ -1241,23 +1241,22 @@ static void bcm43xx_phy_initg(struct bcm43xx_private *bcm)
                 bcm43xx_phy_lo_g_measure(bcm);
         } else {
                 if (radio->version == 0x2050 && radio->revision == 8) {
-                        //FIXME
+                        bcm43xx_radio_write16(bcm, 0x0052,
+                                              (radio->txctl1 << 4) | radio->txctl2);
                 } else {
                         bcm43xx_radio_write16(bcm, 0x0052,
                                               (bcm43xx_radio_read16(bcm, 0x0052)
                                                & 0xFFF0) | radio->txctl1);
                 }
                 if (phy->rev >= 6) {
-                        /*
                         bcm43xx_phy_write(bcm, 0x0036,
                                           (bcm43xx_phy_read(bcm, 0x0036)
-                                           & 0xF000) | (FIXME << 12));
-                        */
+                                           & 0xF000) | (radio->txctl2 << 12));
                 }
                 if (bcm->sprom.boardflags & BCM43xx_BFL_PACTRL)
                         bcm43xx_phy_write(bcm, 0x002E, 0x8075);
                 else
-                        bcm43xx_phy_write(bcm, 0x003E, 0x807F);
+                        bcm43xx_phy_write(bcm, 0x002E, 0x807F);
                 if (phy->rev < 2)
                         bcm43xx_phy_write(bcm, 0x002F, 0x0101);
                 else
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
index 888077fc14c4..9b7b15cf6561 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
@@ -334,7 +334,7 @@ static int bcm43xx_wx_get_nick(struct net_device *net_dev,
         size_t len;
 
         mutex_lock(&bcm->mutex);
-        len = strlen(bcm->nick) + 1;
+        len = strlen(bcm->nick);
         memcpy(extra, bcm->nick, len);
         data->data.length = (__u16)len;
         data->data.flags = 1;
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c b/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
index c0efbfe605a5..0159e4e93201 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
@@ -496,15 +496,14 @@ int bcm43xx_rx(struct bcm43xx_private *bcm,
         stats.signal = bcm43xx_rssi_postprocess(bcm, rxhdr->rssi, is_ofdm,
                                               !!(rxflags1 & BCM43xx_RXHDR_FLAGS1_2053RSSIADJ),
                                               !!(rxflags3 & BCM43xx_RXHDR_FLAGS3_2050RSSIADJ));
-//TODO  stats.noise = 
+        stats.noise = bcm->stats.noise;
         if (is_ofdm)
                 stats.rate = bcm43xx_plcp_get_bitrate_ofdm(plcp);
         else
                 stats.rate = bcm43xx_plcp_get_bitrate_cck(plcp);
         stats.received_channel = radio->channel;
-//TODO  stats.control = 
         stats.mask = IEEE80211_STATMASK_SIGNAL |
-//TODO               IEEE80211_STATMASK_NOISE |
+                     IEEE80211_STATMASK_NOISE |
                      IEEE80211_STATMASK_RATE |
                      IEEE80211_STATMASK_RSSI;
         if (phy->type == BCM43xx_PHYTYPE_A)