Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [INET_DIAG]: Fix oops in netlink_rcv_skb
  [IPv6]: Fix NULL pointer dereference in ip6_flush_pending_frames
  [NETFILTER]: Fix/improve deadlock condition on module removal netfilter
  [NETFILTER]: nf_conntrack_ipv4: fix "Frag of proto ..." messages
  [NET] DOC: Update networking/multiqueue.txt with correct information.
  [IPV6]: Freeing alive inet6 address
  [DECNET]: Fix interface address listing regression.
  [IPV4] devinet: show all addresses assigned to interface
  [NET]: Do not dereference iov if length is zero
  [TG3]: Workaround MSI bug on 5714/5780.
  [Bluetooth] Fix parameter list for event filter command
  [Bluetooth] Update security filter for Bluetooth 2.1
  [Bluetooth] Add compat handling for timestamp structure
  [Bluetooth] Add missing stat.byte_rx counter modification

2 files changed, 15 insertions, 3 deletions

diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c
index 59b054810ed0..98a9cdeaffb6 100644
--- a/drivers/bluetooth/hci_usb.c
+++ b/drivers/bluetooth/hci_usb.c
@@ -691,15 +691,18 @@ static void hci_usb_rx_complete(struct urb *urb)
                                         urb->iso_frame_desc[i].offset,
                                         urb->iso_frame_desc[i].actual_length);
         
-                        if (!urb->iso_frame_desc[i].status)
+                        if (!urb->iso_frame_desc[i].status) {
+                                husb->hdev->stat.byte_rx += urb->iso_frame_desc[i].actual_length;
                                 hci_recv_fragment(husb->hdev, _urb->type, 
                                         urb->transfer_buffer + urb->iso_frame_desc[i].offset,
                                         urb->iso_frame_desc[i].actual_length);
+                        }
                 }
 #else
                 ;
 #endif
         } else {
+                husb->hdev->stat.byte_rx += count;
                 err = hci_recv_fragment(husb->hdev, _urb->type, urb->transfer_buffer, count);
                 if (err < 0) { 
                         BT_ERR("%s corrupted packet: type %d count %d",
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 58740428dd07..9034a05734ef 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -64,8 +64,8 @@
 
 #define DRV_MODULE_NAME         "tg3"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "3.80"
-#define DRV_MODULE_RELDATE      "August 2, 2007"
+#define DRV_MODULE_VERSION      "3.81"
+#define DRV_MODULE_RELDATE      "September 5, 2007"
 
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -7127,6 +7127,10 @@ static int tg3_open(struct net_device *dev)
                 } else if (pci_enable_msi(tp->pdev) == 0) {
                         u32 msi_mode;
 
+                        /* Hardware bug - MSI won't work if INTX disabled. */
+                        if (tp->tg3_flags2 & TG3_FLG2_5780_CLASS)
+                                pci_intx(tp->pdev, 1);
+
                         msi_mode = tr32(MSGINT_MODE);
                         tw32(MSGINT_MODE, msi_mode | MSGINT_MODE_ENABLE);
                         tp->tg3_flags2 |= TG3_FLG2_USING_MSI;
@@ -12172,6 +12176,11 @@ static int tg3_resume(struct pci_dev *pdev)
         if (err)
                 return err;
 
+        /* Hardware bug - MSI won't work if INTX disabled. */
+        if ((tp->tg3_flags2 & TG3_FLG2_5780_CLASS) &&
+            (tp->tg3_flags2 & TG3_FLG2_USING_MSI))
+                pci_intx(tp->pdev, 1);
+
         netif_device_attach(dev);
 
         tg3_full_lock(tp, 0);