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

Pull networking updates and fixes from David Miller:

1) Reinstate the no-ref optimization for input route lookups in ipv4 to
   fix some routing cache removal perf regressions.

2) Make TCP socket pre-demux work on ipv6 side too, from Eric Dumazet.

3) Get RX hash value from correct place in be2net driver, from
   Sarveshwar Bandi.

4) Validation of FIB cached routes missing critical check, from Eric
   Dumazet.

5) EEH support in mlx4 driver, from Kleber Sacilotto de Souza.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (23 commits)
  ipv6: Early TCP socket demux
  ipv4: Fix input route performance regression.
  pch_gbe: vlan skb len fix
  pch_gbe: add extra clean tx
  pch_gbe: fix transmit watchdog timeout
  ixgbe: fix panic while dumping packets on Tx hang with IOMMU
  be2net: Fix to parse RSS hash from Receive completions correctly.
  net/mlx4_en: Limit the RFS filter IDs to be < RPS_NO_FILTER
  hyperv: Add error handling to rndis_filter_device_add()
  hyperv: Add a check for ring_size value
  ipv4: rt_cache_valid must check expired routes
  net/pch_gpe: Cannot disable ethernet autonegation
  qeth: repair crash in qeth_l3_vlan_rx_kill_vid()
  netiucv: cleanup attribute usage
  net: wiznet add missing HAS_IOMEM dependency
  be2net: Missing byteswap in be_get_fw_log_level causes oops on PowerPC
  mlx4: Add support for EEH error recovery
  cdc-ncm: tag Ericsson WWAN devices (eg F5521gw) with FLAG_WWAN
  wanmain: comparing array with NULL
  caif: fix NULL pointer check
  ...

2 files changed, 10 insertions, 28 deletions

diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index 8160591913f9..4ffa66c87ea5 100644
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -1854,26 +1854,11 @@ static struct attribute_group netiucv_stat_attr_group = {
         .attrs = netiucv_stat_attrs,
 };
 
-static int netiucv_add_files(struct device *dev)
-{
-        int ret;
-
-        IUCV_DBF_TEXT(trace, 3, __func__);
-        ret = sysfs_create_group(&dev->kobj, &netiucv_attr_group);
-        if (ret)
-                return ret;
-        ret = sysfs_create_group(&dev->kobj, &netiucv_stat_attr_group);
-        if (ret)
-                sysfs_remove_group(&dev->kobj, &netiucv_attr_group);
-        return ret;
-}
-
-static void netiucv_remove_files(struct device *dev)
-{
-        IUCV_DBF_TEXT(trace, 3, __func__);
-        sysfs_remove_group(&dev->kobj, &netiucv_stat_attr_group);
-        sysfs_remove_group(&dev->kobj, &netiucv_attr_group);
-}
+static const struct attribute_group *netiucv_attr_groups[] = {
+        &netiucv_stat_attr_group,
+        &netiucv_attr_group,
+        NULL,
+};
 
 static int netiucv_register_device(struct net_device *ndev)
 {
@@ -1887,6 +1872,7 @@ static int netiucv_register_device(struct net_device *ndev)
                 dev_set_name(dev, "net%s", ndev->name);
                 dev->bus = &iucv_bus;
                 dev->parent = iucv_root;
+                dev->groups = netiucv_attr_groups;
                 /*
                  * The release function could be called after the
                  * module has been unloaded. It's _only_ task is to
@@ -1904,22 +1890,14 @@ static int netiucv_register_device(struct net_device *ndev)
                 put_device(dev);
                 return ret;
         }
-        ret = netiucv_add_files(dev);
-        if (ret)
-                goto out_unreg;
         priv->dev = dev;
         dev_set_drvdata(dev, priv);
         return 0;
-
-out_unreg:
-        device_unregister(dev);
-        return ret;
 }
 
 static void netiucv_unregister_device(struct device *dev)
 {
         IUCV_DBF_TEXT(trace, 3, __func__);
-        netiucv_remove_files(dev);
         device_unregister(dev);
 }
 
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 0cf706699a04..c5f03fa70fba 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -1758,6 +1758,8 @@ static void qeth_l3_free_vlan_addresses4(struct qeth_card *card,
         QETH_CARD_TEXT(card, 4, "frvaddr4");
 
         netdev = __vlan_find_dev_deep(card->dev, vid);
+        if (!netdev)
+                return;
         in_dev = in_dev_get(netdev);
         if (!in_dev)
                 return;
@@ -1786,6 +1788,8 @@ static void qeth_l3_free_vlan_addresses6(struct qeth_card *card,
         QETH_CARD_TEXT(card, 4, "frvaddr6");
 
         netdev = __vlan_find_dev_deep(card->dev, vid);
+        if (!netdev)
+                return;
         in6_dev = in6_dev_get(netdev);
         if (!in6_dev)
                 return;