Merge branch 'master' into upstream

4 files changed, 21 insertions, 2 deletions

diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 66ea5fc5c2e2..5669b95162b3 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -2675,6 +2675,18 @@ static int nv_nway_reset(struct net_device *dev)
         return ret;
 }
 
+#ifdef NETIF_F_TSO
+static int nv_set_tso(struct net_device *dev, u32 value)
+{
+        struct fe_priv *np = netdev_priv(dev);
+
+        if ((np->driver_data & DEV_HAS_CHECKSUM))
+                return ethtool_op_set_tso(dev, value);
+        else
+                return value ? -EOPNOTSUPP : 0;
+}
+#endif
+
 static struct ethtool_ops ops = {
         .get_drvinfo = nv_get_drvinfo,
         .get_link = ethtool_op_get_link,
@@ -2686,6 +2698,10 @@ static struct ethtool_ops ops = {
         .get_regs = nv_get_regs,
         .nway_reset = nv_nway_reset,
         .get_perm_addr = ethtool_op_get_perm_addr,
+#ifdef NETIF_F_TSO
+        .get_tso = ethtool_op_get_tso,
+        .set_tso = nv_set_tso
+#endif
 };
 
 static void nv_vlan_rx_register(struct net_device *dev, struct vlan_group *grp)
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index 66e74f740261..bf58db29e2ed 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -107,7 +107,7 @@ static int init_netconsole(void)
 
         if(!configured) {
                 printk("netconsole: not configured, aborting\n");
-                return -EINVAL;
+                return 0;
         }
 
         if(netpoll_setup(&np))
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c
index 4260c2128f47..a8f6bfc96fd2 100644
--- a/drivers/net/pcmcia/nmclan_cs.c
+++ b/drivers/net/pcmcia/nmclan_cs.c
@@ -1204,7 +1204,7 @@ static int mace_rx(struct net_device *dev, unsigned char RxCnt)
 
         dev->last_rx = jiffies;
         lp->linux_stats.rx_packets++;
-        lp->linux_stats.rx_bytes += skb->len;
+        lp->linux_stats.rx_bytes += pkt_len;
         outb(0xFF, ioaddr + AM2150_RCV_NEXT); /* skip to next frame */
         continue;
       } else {
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index 475dc930380f..0d101a18026a 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -861,6 +861,9 @@ static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb)
                  * give dev_queue_xmit something it can free.
                  */
                 skb2 = skb_clone(skb, GFP_ATOMIC);
+
+                if (skb2 == NULL)
+                        goto abort;
         }
 
         ph = (struct pppoe_hdr *) skb_push(skb2, sizeof(struct pppoe_hdr));