Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

Pull networking update from David Miller:

 1) Checkpoint/restarted TCP sockets now can properly propagate the TCP
    timestamp offset.  From Andrey Vagin.

 2) VMWARE VM VSOCK layer, from Andy King.

 3) Much improved support for virtual functions and SR-IOV in bnx2x,
    from Ariel ELior.

 4) All protocols on ipv4 and ipv6 are now network namespace aware, and
    all the compatability checks for initial-namespace-only protocols is
    removed.  Thanks to Tom Parkin for helping deal with the last major
    holdout, L2TP.

 5) IPV6 support in netpoll and network namespace support in pktgen,
    from Cong Wang.

 6) Multiple Registration Protocol (MRP) and Multiple VLAN Registration
    Protocol (MVRP) support, from David Ward.

 7) Compute packet lengths more accurately in the packet scheduler, from
    Eric Dumazet.

 8) Use per-task page fragment allocator in skb_append_datato_frags(),
    also from Eric Dumazet.

 9) Add support for connection tracking labels in netfilter, from
    Florian Westphal.

10) Fix default multicast group joining on ipv6, and add anti-spoofing
    checks to 6to4 and 6rd.  From Hannes Frederic Sowa.

11) Make ipv4/ipv6 fragmentation memory limits more reasonable in modern
    times, rearrange inet frag datastructures for better cacheline
    locality, and move more operations outside of locking.  From Jesper
    Dangaard Brouer.

12) Instead of strict master <--> slave relationships, allow arbitrary
    scenerios with "upper device lists".  From Jiri Pirko.

13) Improve rate limiting accuracy in TBF and act_police, also from Jiri
    Pirko.

14) Add a BPF filter netfilter match target, from Willem de Bruijn.

15) Orphan and delete a bunch of pre-historic networking drivers from
    Paul Gortmaker.

16) Add TSO support for GRE tunnels, from Pravin B SHelar.  Although
    this still needs some minor bug fixing before it's %100 correct in
    all cases.

17) Handle unresolved IPSEC states like ARP, with a resolution packet
    queue.  From Steffen Klassert.

18) Remove TCP Appropriate Byte Count support (ABC), from Stephen
    Hemminger.  This was long overdue.

19) Support SO_REUSEPORT, from Tom Herbert.

20) Allow locking a socket BPF filter, so that it cannot change after a
    process drops capabilities.

21) Add VLAN filtering to bridge, from Vlad Yasevich.

22) Bring ipv6 on-par with ipv4 and do not cache neighbour entries in
    the ipv6 routes, from YOSHIFUJI Hideaki.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1538 commits)
  ipv6: fix race condition regarding dst->expires and dst->from.
  net: fix a wrong assignment in skb_split()
  ip_gre: remove an extra dst_release()
  ppp: set qdisc_tx_busylock to avoid LOCKDEP splat
  atl1c: restore buffer state
  net: fix a build failure when !CONFIG_PROC_FS
  net: ipv4: fix waring -Wunused-variable
  net: proc: fix build failed when procfs is not configured
  Revert "xen: netback: remove redundant xenvif_put"
  net: move procfs code to net/core/net-procfs.c
  qmi_wwan, cdc-ether: add ADU960S
  bonding: set sysfs device_type to 'bond'
  bonding: fix bond_release_all inconsistencies
  b44: use netdev_alloc_skb_ip_align()
  xen: netback: remove redundant xenvif_put
  net: fec: Do a sanity check on the gpio number
  ip_gre: propogate target device GSO capability to the tunnel device
  ip_gre: allow CSUM capable devices to handle packets
  bonding: Fix initialize after use for 3ad machine state spinlock
  bonding: Fix race condition between bond_enslave() and bond_3ad_update_lacp_rate()
  ...

6 files changed, 24 insertions, 15 deletions

diff --git a/drivers/net/can/sja1000/Kconfig b/drivers/net/can/sja1000/Kconfig
index 92f73c708a3d..b39ca5b3ea7f 100644
--- a/drivers/net/can/sja1000/Kconfig
+++ b/drivers/net/can/sja1000/Kconfig
@@ -1,6 +1,6 @@
 menuconfig CAN_SJA1000
         tristate "Philips/NXP SJA1000 devices"
-        depends on CAN_DEV && HAS_IOMEM
+        depends on HAS_IOMEM
 
 if CAN_SJA1000
 
@@ -99,11 +99,11 @@ config CAN_TSCAN1
         tristate "TS-CAN1 PC104 boards"
         depends on ISA
         help
-        This driver is for Technologic Systems' TSCAN-1 PC104 boards.
-        http://www.embeddedarm.com/products/board-detail.php?product=TS-CAN1
-        The driver supports multiple boards and automatically configures them:
-        PLD IO base addresses are read from jumpers JP1 and JP2,
-        IRQ numbers are read from jumpers JP4 and JP5,
-        SJA1000 IO base addresses are chosen heuristically (first that works).
+          This driver is for Technologic Systems' TSCAN-1 PC104 boards.
+          http://www.embeddedarm.com/products/board-detail.php?product=TS-CAN1
+          The driver supports multiple boards and automatically configures them:
+          PLD IO base addresses are read from jumpers JP1 and JP2,
+          IRQ numbers are read from jumpers JP4 and JP5,
+          SJA1000 IO base addresses are chosen heuristically (first that works).
 
 endif
diff --git a/drivers/net/can/sja1000/ems_pci.c b/drivers/net/can/sja1000/ems_pci.c
index 036a326836b2..36d298da2af6 100644
--- a/drivers/net/can/sja1000/ems_pci.c
+++ b/drivers/net/can/sja1000/ems_pci.c
@@ -238,7 +238,6 @@ static int ems_pci_add_card(struct pci_dev *pdev,
         /* Allocating card structures to hold addresses, ... */
         card = kzalloc(sizeof(struct ems_pci_card), GFP_KERNEL);
         if (card == NULL) {
-                dev_err(&pdev->dev, "Unable to allocate memory\n");
                 pci_disable_device(pdev);
                 return -ENOMEM;
         }
diff --git a/drivers/net/can/sja1000/peak_pci.c b/drivers/net/can/sja1000/peak_pci.c
index 600ac7226e5c..d1e7f1006ddd 100644
--- a/drivers/net/can/sja1000/peak_pci.c
+++ b/drivers/net/can/sja1000/peak_pci.c
@@ -450,11 +450,8 @@ static int peak_pciec_probe(struct pci_dev *pdev, struct net_device *dev)
         } else {
                 /* create the bit banging I2C adapter structure */
                 card = kzalloc(sizeof(struct peak_pciec_card), GFP_KERNEL);
-                if (!card) {
-                        dev_err(&pdev->dev,
-                                 "failed allocating memory for i2c chip\n");
+                if (!card)
                         return -ENOMEM;
-                }
 
                 card->cfg_base = chan->cfg_base;
                 card->reg_base = priv->reg_base;
diff --git a/drivers/net/can/sja1000/peak_pcmcia.c b/drivers/net/can/sja1000/peak_pcmcia.c
index f1175142b0a0..1a7020ba37f5 100644
--- a/drivers/net/can/sja1000/peak_pcmcia.c
+++ b/drivers/net/can/sja1000/peak_pcmcia.c
@@ -660,7 +660,6 @@ static int pcan_probe(struct pcmcia_device *pdev)
 
         card = kzalloc(sizeof(struct pcan_pccard), GFP_KERNEL);
         if (!card) {
-                dev_err(&pdev->dev, "couldn't allocate card memory\n");
                 err = -ENOMEM;
                 goto probe_err_2;
         }
diff --git a/drivers/net/can/sja1000/plx_pci.c b/drivers/net/can/sja1000/plx_pci.c
index 11d1062a9449..a042cdc260dc 100644
--- a/drivers/net/can/sja1000/plx_pci.c
+++ b/drivers/net/can/sja1000/plx_pci.c
@@ -508,7 +508,6 @@ static int plx_pci_add_card(struct pci_dev *pdev,
         /* Allocate card structures to hold addresses, ... */
         card = kzalloc(sizeof(*card), GFP_KERNEL);
         if (!card) {
-                dev_err(&pdev->dev, "Unable to allocate memory\n");
                 pci_disable_device(pdev);
                 return -ENOMEM;
         }
diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c
index 83ee11eca0e2..daf4013a8fc7 100644
--- a/drivers/net/can/sja1000/sja1000.c
+++ b/drivers/net/can/sja1000/sja1000.c
@@ -60,6 +60,7 @@
 
 #include <linux/can/dev.h>
 #include <linux/can/error.h>
+#include <linux/can/led.h>
 
 #include "sja1000.h"
 
@@ -368,6 +369,8 @@ static void sja1000_rx(struct net_device *dev)
 
         stats->rx_packets++;
         stats->rx_bytes += cf->can_dlc;
+
+        can_led_event(dev, CAN_LED_EVENT_RX);
 }
 
 static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)
@@ -521,6 +524,7 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id)
                                 can_get_echo_skb(dev, 0);
                         }
                         netif_wake_queue(dev);
+                        can_led_event(dev, CAN_LED_EVENT_TX);
                 }
                 if (isrc & IRQ_RI) {
                         /* receive interrupt */
@@ -575,6 +579,8 @@ static int sja1000_open(struct net_device *dev)
         /* init and start chi */
         sja1000_start(dev);
 
+        can_led_event(dev, CAN_LED_EVENT_OPEN);
+
         netif_start_queue(dev);
 
         return 0;
@@ -592,6 +598,8 @@ static int sja1000_close(struct net_device *dev)
 
         close_candev(dev);
 
+        can_led_event(dev, CAN_LED_EVENT_STOP);
+
         return 0;
 }
 
@@ -639,6 +647,8 @@ static const struct net_device_ops sja1000_netdev_ops = {
 
 int register_sja1000dev(struct net_device *dev)
 {
+        int ret;
+
         if (!sja1000_probe_chip(dev))
                 return -ENODEV;
 
@@ -648,7 +658,12 @@ int register_sja1000dev(struct net_device *dev)
         set_reset_mode(dev);
         chipset_init(dev);
 
-        return register_candev(dev);
+        ret =  register_candev(dev);
+
+        if (!ret)
+                devm_can_led_init(dev);
+
+        return ret;
 }
 EXPORT_SYMBOL_GPL(register_sja1000dev);