4 files changed, 36 insertions, 26 deletions

diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c
index e7c800f4c3ad..07eafbc5dc3a 100644
--- a/drivers/bluetooth/dtl1_cs.c
+++ b/drivers/bluetooth/dtl1_cs.c
@@ -711,6 +711,7 @@ static void dtl1_release(struct pcmcia_device *link)
 
 static struct pcmcia_device_id dtl1_ids[] = {
         PCMCIA_DEVICE_PROD_ID12("Nokia Mobile Phones", "DTL-1", 0xe1bfdd64, 0xe168480d),
+        PCMCIA_DEVICE_PROD_ID12("Nokia Mobile Phones", "DTL-4", 0xe1bfdd64, 0x9102bc82),
         PCMCIA_DEVICE_PROD_ID12("Socket", "CF", 0xb38bcc2e, 0x44ebf863),
         PCMCIA_DEVICE_PROD_ID12("Socket", "CF+ Personal Network Card", 0xb38bcc2e, 0xe732bae3),
         PCMCIA_DEVICE_NULL
diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c
index 7565642a007a..fdea58ae16b2 100644
--- a/drivers/bluetooth/hci_usb.c
+++ b/drivers/bluetooth/hci_usb.c
@@ -118,6 +118,9 @@ static struct usb_device_id blacklist_ids[] = {
         /* IBM/Lenovo ThinkPad with Broadcom chip */
         { USB_DEVICE(0x0a5c, 0x201e), .driver_info = HCI_WRONG_SCO_MTU },
 
+        /* ANYCOM Bluetooth USB-200 and USB-250 */
+        { USB_DEVICE(0x0a5c, 0x2111), .driver_info = HCI_RESET },
+
         /* Microsoft Wireless Transceiver for Bluetooth 2.0 */
         { USB_DEVICE(0x045e, 0x009c), .driver_info = HCI_RESET },
 
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index 4178b4b1d2df..82c10dec1b5a 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -58,7 +58,11 @@
 #include <linux/tcp.h>
 #include <linux/percpu.h>
 
-static DEFINE_PER_CPU(struct net_device_stats, loopback_stats);
+struct pcpu_lstats {
+        unsigned long packets;
+        unsigned long bytes;
+};
+static DEFINE_PER_CPU(struct pcpu_lstats, pcpu_lstats);
 
 #define LOOPBACK_OVERHEAD (128 + MAX_HEADER + 16 + 16)
 
@@ -128,7 +132,7 @@ static void emulate_large_send_offload(struct sk_buff *skb)
  */
 static int loopback_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-        struct net_device_stats *lb_stats;
+        struct pcpu_lstats *lb_stats;
 
         skb_orphan(skb);
 
@@ -149,16 +153,14 @@ static int loopback_xmit(struct sk_buff *skb, struct net_device *dev)
 #endif
         dev->last_rx = jiffies;
 
-        lb_stats = &per_cpu(loopback_stats, get_cpu());
-        lb_stats->rx_bytes += skb->len;
-        lb_stats->tx_bytes = lb_stats->rx_bytes;
-        lb_stats->rx_packets++;
-        lb_stats->tx_packets = lb_stats->rx_packets;
-        put_cpu();
+        /* it's OK to use __get_cpu_var() because BHs are off */
+        lb_stats = &__get_cpu_var(pcpu_lstats);
+        lb_stats->bytes += skb->len;
+        lb_stats->packets++;
 
         netif_rx(skb);
 
-        return(0);
+        return 0;
 }
 
 static struct net_device_stats loopback_stats;
@@ -166,20 +168,21 @@ static struct net_device_stats loopback_stats;
 static struct net_device_stats *get_stats(struct net_device *dev)
 {
         struct net_device_stats *stats = &loopback_stats;
+        unsigned long bytes = 0;
+        unsigned long packets = 0;
         int i;
 
-        memset(stats, 0, sizeof(struct net_device_stats));
-
         for_each_possible_cpu(i) {
-                struct net_device_stats *lb_stats;
+                const struct pcpu_lstats *lb_stats;
 
-                lb_stats = &per_cpu(loopback_stats, i);
-                stats->rx_bytes   += lb_stats->rx_bytes;
-                stats->tx_bytes   += lb_stats->tx_bytes;
-                stats->rx_packets += lb_stats->rx_packets;
-                stats->tx_packets += lb_stats->tx_packets;
+                lb_stats = &per_cpu(pcpu_lstats, i);
+                bytes   += lb_stats->bytes;
+                packets += lb_stats->packets;
         }
-
+        stats->rx_packets = packets;
+        stats->tx_packets = packets;
+        stats->rx_bytes = bytes;
+        stats->tx_bytes = bytes;
         return stats;
 }
 
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 327836b1014e..8e398499c045 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -68,8 +68,8 @@
 
 #define DRV_MODULE_NAME         "tg3"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "3.66"
-#define DRV_MODULE_RELDATE      "September 23, 2006"
+#define DRV_MODULE_VERSION      "3.67"
+#define DRV_MODULE_RELDATE      "October 18, 2006"
 
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -129,7 +129,7 @@
 #define RX_JUMBO_PKT_BUF_SZ     (9046 + tp->rx_offset + 64)
 
 /* minimum number of free TX descriptors required to wake up TX process */
-#define TG3_TX_WAKEUP_THRESH            (TG3_TX_RING_SIZE / 4)
+#define TG3_TX_WAKEUP_THRESH(tp)                ((tp)->tx_pending / 4)
 
 /* number of ETHTOOL_GSTATS u64's */
 #define TG3_NUM_STATS           (sizeof(struct tg3_ethtool_stats)/sizeof(u64))
@@ -3075,10 +3075,10 @@ static void tg3_tx(struct tg3 *tp)
         smp_mb();
 
         if (unlikely(netif_queue_stopped(tp->dev) &&
-                     (tg3_tx_avail(tp) > TG3_TX_WAKEUP_THRESH))) {
+                     (tg3_tx_avail(tp) > TG3_TX_WAKEUP_THRESH(tp)))) {
                 netif_tx_lock(tp->dev);
                 if (netif_queue_stopped(tp->dev) &&
-                    (tg3_tx_avail(tp) > TG3_TX_WAKEUP_THRESH))
+                    (tg3_tx_avail(tp) > TG3_TX_WAKEUP_THRESH(tp)))
                         netif_wake_queue(tp->dev);
                 netif_tx_unlock(tp->dev);
         }
@@ -3928,7 +3928,7 @@ static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
         tp->tx_prod = entry;
         if (unlikely(tg3_tx_avail(tp) <= (MAX_SKB_FRAGS + 1))) {
                 netif_stop_queue(dev);
-                if (tg3_tx_avail(tp) > TG3_TX_WAKEUP_THRESH)
+                if (tg3_tx_avail(tp) > TG3_TX_WAKEUP_THRESH(tp))
                         netif_wake_queue(tp->dev);
         }
 
@@ -4143,7 +4143,7 @@ static int tg3_start_xmit_dma_bug(struct sk_buff *skb, struct net_device *dev)
         tp->tx_prod = entry;
         if (unlikely(tg3_tx_avail(tp) <= (MAX_SKB_FRAGS + 1))) {
                 netif_stop_queue(dev);
-                if (tg3_tx_avail(tp) > TG3_TX_WAKEUP_THRESH)
+                if (tg3_tx_avail(tp) > TG3_TX_WAKEUP_THRESH(tp))
                         netif_wake_queue(tp->dev);
         }
 
@@ -8106,7 +8106,10 @@ static int tg3_set_ringparam(struct net_device *dev, struct ethtool_ringparam *e
 
         if ((ering->rx_pending > TG3_RX_RING_SIZE - 1) ||
             (ering->rx_jumbo_pending > TG3_RX_JUMBO_RING_SIZE - 1) ||
-            (ering->tx_pending > TG3_TX_RING_SIZE - 1))
+            (ering->tx_pending > TG3_TX_RING_SIZE - 1) ||
+            (ering->tx_pending <= MAX_SKB_FRAGS) ||
+            ((tp->tg3_flags2 & TG3_FLG2_HW_TSO_1_BUG) &&
+             (ering->tx_pending <= (MAX_SKB_FRAGS * 3))))
                 return -EINVAL;
 
         if (netif_running(dev)) {