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

8 files changed, 15 insertions, 21 deletions

diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c
index 39214e512452..7ca0eded2561 100644
--- a/drivers/net/ariadne.c
+++ b/drivers/net/ariadne.c
@@ -425,11 +425,6 @@ static irqreturn_t ariadne_interrupt(int irq, void *data)
     int csr0, boguscnt;
     int handled = 0;
 
-    if (dev == NULL) {
-        printk(KERN_WARNING "ariadne_interrupt(): irq for unknown device.\n");
-        return IRQ_NONE;
-    }
-
     lance->RAP = CSR0;                  /* PCnet-ISA Controller Status */
 
     if (!(lance->RDP & INTR))           /* Check if any interrupt has been */
diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c
index bba21d5f708b..9d48659e3b28 100644
--- a/drivers/net/bnx2x/bnx2x_main.c
+++ b/drivers/net/bnx2x/bnx2x_main.c
@@ -4229,7 +4229,7 @@ void bnx2x_update_coalesce(struct bnx2x *bp)
 
         for_each_eth_queue(bp, i)
                 bnx2x_update_coalesce_sb(bp, bp->fp[i].fw_sb_id,
-                                         bp->rx_ticks, bp->tx_ticks);
+                                         bp->tx_ticks, bp->rx_ticks);
 }
 
 static void bnx2x_init_sp_ring(struct bnx2x *bp)
diff --git a/drivers/net/can/usb/esd_usb2.c b/drivers/net/can/usb/esd_usb2.c
index 05a52754f486..dc53c831ea95 100644
--- a/drivers/net/can/usb/esd_usb2.c
+++ b/drivers/net/can/usb/esd_usb2.c
@@ -659,7 +659,7 @@ failed:
 static void unlink_all_urbs(struct esd_usb2 *dev)
 {
         struct esd_usb2_net_priv *priv;
-        int i;
+        int i, j;
 
         usb_kill_anchored_urbs(&dev->rx_submitted);
         for (i = 0; i < dev->net_count; i++) {
@@ -668,8 +668,8 @@ static void unlink_all_urbs(struct esd_usb2 *dev)
                         usb_kill_anchored_urbs(&priv->tx_submitted);
                         atomic_set(&priv->active_tx_jobs, 0);
 
-                        for (i = 0; i < MAX_TX_URBS; i++)
-                                priv->tx_contexts[i].echo_index = MAX_TX_URBS;
+                        for (j = 0; j < MAX_TX_URBS; j++)
+                                priv->tx_contexts[j].echo_index = MAX_TX_URBS;
                 }
         }
 }
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index 7018bfe408a4..082d6ea69920 100644
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -1730,7 +1730,7 @@ static struct net_device_stats *emac_dev_getnetstats(struct net_device *ndev)
                 emac_read(EMAC_TXCARRIERSENSE);
         emac_write(EMAC_TXCARRIERSENSE, stats_clear_mask);
 
-        ndev->stats.tx_fifo_errors = emac_read(EMAC_TXUNDERRUN);
+        ndev->stats.tx_fifo_errors += emac_read(EMAC_TXUNDERRUN);
         emac_write(EMAC_TXUNDERRUN, stats_clear_mask);
 
         return &ndev->stats;
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 6ed577b065df..497991bd3b64 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -219,9 +219,11 @@ static int macvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev)
         const struct macvlan_dev *vlan = netdev_priv(dev);
         const struct macvlan_port *port = vlan->port;
         const struct macvlan_dev *dest;
+        __u8 ip_summed = skb->ip_summed;
 
         if (vlan->mode == MACVLAN_MODE_BRIDGE) {
                 const struct ethhdr *eth = (void *)skb->data;
+                skb->ip_summed = CHECKSUM_UNNECESSARY;
 
                 /* send to other bridge ports directly */
                 if (is_multicast_ether_addr(eth->h_dest)) {
@@ -241,6 +243,7 @@ static int macvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev)
         }
 
 xmit_world:
+        skb->ip_summed = ip_summed;
         skb_set_dev(skb, vlan->lowerdev);
         return dev_queue_xmit(skb);
 }
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c
index d70bde95460b..1566259c1f27 100644
--- a/drivers/net/smsc911x.c
+++ b/drivers/net/smsc911x.c
@@ -791,8 +791,8 @@ static int smsc911x_mii_probe(struct net_device *dev)
                 return -ENODEV;
         }
 
-        SMSC_TRACE(PROBE, "PHY %d: addr %d, phy_id 0x%08X",
-                        phy_addr, phydev->addr, phydev->phy_id);
+        SMSC_TRACE(PROBE, "PHY: addr %d, phy_id 0x%08X",
+                        phydev->addr, phydev->phy_id);
 
         ret = phy_connect_direct(dev, phydev,
                         &smsc911x_phy_adjust_link, 0,
diff --git a/drivers/net/usb/cdc-phonet.c b/drivers/net/usb/cdc-phonet.c
index 109751bad3bb..f967913e11bc 100644
--- a/drivers/net/usb/cdc-phonet.c
+++ b/drivers/net/usb/cdc-phonet.c
@@ -328,13 +328,13 @@ int usbpn_probe(struct usb_interface *intf, const struct usb_device_id *id)
 {
         static const char ifname[] = "usbpn%d";
         const struct usb_cdc_union_desc *union_header = NULL;
-        const struct usb_cdc_header_desc *phonet_header = NULL;
         const struct usb_host_interface *data_desc;
         struct usb_interface *data_intf;
         struct usb_device *usbdev = interface_to_usbdev(intf);
         struct net_device *dev;
         struct usbpn_dev *pnd;
         u8 *data;
+        int phonet = 0;
         int len, err;
 
         data = intf->altsetting->extra;
@@ -355,10 +355,7 @@ int usbpn_probe(struct usb_interface *intf, const struct usb_device_id *id)
                                         (struct usb_cdc_union_desc *)data;
                                 break;
                         case 0xAB:
-                                if (phonet_header || dlen < 5)
-                                        break;
-                                phonet_header =
-                                        (struct usb_cdc_header_desc *)data;
+                                phonet = 1;
                                 break;
                         }
                 }
@@ -366,7 +363,7 @@ int usbpn_probe(struct usb_interface *intf, const struct usb_device_id *id)
                 len -= dlen;
         }
 
-        if (!union_header || !phonet_header)
+        if (!union_header || !phonet)
                 return -EINVAL;
 
         data_intf = usb_ifnum_to_if(usbdev, union_header->bSlaveInterface0);
@@ -392,7 +389,6 @@ int usbpn_probe(struct usb_interface *intf, const struct usb_device_id *id)
 
         pnd = netdev_priv(dev);
         SET_NETDEV_DEV(dev, &intf->dev);
-        netif_stop_queue(dev);
 
         pnd->dev = dev;
         pnd->usb = usb_get_dev(usbdev);
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index da1f12120346..5b399b54fef7 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -122,7 +122,7 @@ struct netfront_info {
         struct mmu_update rx_mmu[NET_RX_RING_SIZE];
 
         /* Statistics */
-        int rx_gso_checksum_fixup;
+        unsigned long rx_gso_checksum_fixup;
 };
 
 struct netfront_rx_info {
@@ -1692,7 +1692,7 @@ static void xennet_get_ethtool_stats(struct net_device *dev,
         int i;
 
         for (i = 0; i < ARRAY_SIZE(xennet_stats); i++)
-                data[i] = *(int *)(np + xennet_stats[i].offset);
+                data[i] = *(unsigned long *)(np + xennet_stats[i].offset);
 }
 
 static void xennet_get_strings(struct net_device *dev, u32 stringset, u8 * data)