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

Conflicts:
	drivers/net/usb/qmi_wwan.c
	net/batman-adv/translation-table.c
	net/ipv6/route.c

qmi_wwan.c resolution provided by Bjørn Mork.

batman-adv conflict is dealing merely with the changes
of global function names to have a proper subsystem
prefix.

ipv6's route.c conflict is merely two side-by-side additions
of network namespace methods.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc drivers/bluetooth/btmrvl_sdio.c
Simple merge

diff --cc drivers/bluetooth/btusb.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
index 3e662bf7e5d8fa482b5b9237a7780b34b1319ea2,6e7d5c0843b4c4bd825b0cd505b489011fd748bd..e04b282c039d99537d9aae3080e15176e1d50d9b
--- 1/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
--- 2/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
@@@ -9978,9 -9752,9 +9984,9 @@@ static int bnx2x_848x3_config_init(stru
        u16 cmd_args[PHY84833_CMDHDLR_MAX_ARGS];
        int rc = 0;
  
 -      msleep(1);
 +       usleep_range(1000, 2000);
  
-       if (!(CHIP_IS_E1(bp)))
+       if (!(CHIP_IS_E1x(bp)))
                port = BP_PATH(bp);
        else
                port = params->port;

diff --cc drivers/net/ethernet/emulex/benet/be_cmds.c
Simple merge

diff --cc drivers/net/ethernet/emulex/benet/be_cmds.h
Simple merge

diff --cc drivers/net/ethernet/emulex/benet/be_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
Simple merge

diff --cc drivers/net/usb/qmi_wwan.c
index f1e7791358997bd05e891891c68f3392f304d24e,3767a122586043512cd6ded88b562fd9b97df88f..68ca6769210fe3eed6b765d1c0ddfdd55937829a
--- 1/drivers/net/usb/qmi_wwan.c
--- 2/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@@ -269,53 -257,14 +269,30 @@@ err
        return rv;
  }
  
- /* Gobi devices uses identical class/protocol codes for all interfaces regardless
-  * of function. Some of these are CDC ACM like and have the exact same endpoints
-  * we are looking for. This leaves two possible strategies for identifying the
-  * correct interface:
-  *   a) hardcoding interface number, or
-  *   b) use the fact that the wwan interface is the only one lacking additional
-  *      (CDC functional) descriptors
-  *
-  * Let's see if we can get away with the generic b) solution.
-  */
- static int qmi_wwan_bind_gobi(struct usbnet *dev, struct usb_interface *intf)
- {
-       int rv = -EINVAL;
- 
-       /* ignore any interface with additional descriptors */
-       if (intf->cur_altsetting->extralen)
-               goto err;
- 
-       rv = qmi_wwan_bind_shared(dev, intf);
- err:
-       return rv;
- }
- 
 -static void qmi_wwan_unbind_shared(struct usbnet *dev, struct usb_interface *intf)
 +static void qmi_wwan_unbind(struct usbnet *dev, struct usb_interface *intf)
  {
 -      struct usb_driver *subdriver = (void *)dev->data[0];
 -
 -      if (subdriver && subdriver->disconnect)
 -              subdriver->disconnect(intf);
 +      struct qmi_wwan_state *info = (void *)&dev->data;
 +      struct usb_driver *driver = driver_of(intf);
 +      struct usb_interface *other;
 +
 +      if (info->subdriver && info->subdriver->disconnect)
 +              info->subdriver->disconnect(info->control);
 +
 +      /* allow user to unbind using either control or data */
 +      if (intf == info->control)
 +              other = info->data;
 +      else
 +              other = info->control;
 +
 +      /* only if not shared */
 +      if (other && intf != other) {
 +              usb_set_intfdata(other, NULL);
 +              usb_driver_release_interface(driver, other);
 +      }
  
 -      dev->data[0] = (unsigned long)NULL;
 +      info->subdriver = NULL;
 +      info->data = NULL;
 +      info->control = NULL;
  }
  
  /* suspend/resume wrappers calling both usbnet and the cdc-wdm
@@@ -375,15 -324,15 +352,15 @@@ static const struct driver_info qmi_wwa
        .manage_power   = qmi_wwan_manage_power,
  };
  
- static const struct driver_info       qmi_wwan_gobi = {
-       .description    = "Qualcomm Gobi wwan/QMI device",
+ static const struct driver_info       qmi_wwan_force_int0 = {
+       .description    = "Qualcomm WWAN/QMI device",
        .flags          = FLAG_WWAN,
-       .bind           = qmi_wwan_bind_gobi,
+       .bind           = qmi_wwan_bind_shared,
 -      .unbind         = qmi_wwan_unbind_shared,
 +      .unbind         = qmi_wwan_unbind,
        .manage_power   = qmi_wwan_manage_power,
+       .data           = BIT(0), /* interface whitelist bitmap */
  };
  
- /* ZTE suck at making USB descriptors */
  static const struct driver_info       qmi_wwan_force_int1 = {
        .description    = "Qualcomm WWAN/QMI device",
        .flags          = FLAG_WWAN,
@@@ -393,6 -342,15 +370,15 @@@
        .data           = BIT(1), /* interface whitelist bitmap */
  };
  
 -      .unbind         = qmi_wwan_unbind_shared,
+ static const struct driver_info       qmi_wwan_force_int3 = {
+       .description    = "Qualcomm WWAN/QMI device",
+       .flags          = FLAG_WWAN,
+       .bind           = qmi_wwan_bind_shared,
++      .unbind         = qmi_wwan_unbind,
+       .manage_power   = qmi_wwan_manage_power,
+       .data           = BIT(3), /* interface whitelist bitmap */
+ };
+ 
  static const struct driver_info       qmi_wwan_force_int4 = {
        .description    = "Qualcomm WWAN/QMI device",
        .flags          = FLAG_WWAN,
@@@ -418,8 -376,8 +404,8 @@@
  static const struct driver_info       qmi_wwan_sierra = {
        .description    = "Sierra Wireless wwan/QMI device",
        .flags          = FLAG_WWAN,
-       .bind           = qmi_wwan_bind_gobi,
+       .bind           = qmi_wwan_bind_shared,
 -      .unbind         = qmi_wwan_unbind_shared,
 +      .unbind         = qmi_wwan_unbind,
        .manage_power   = qmi_wwan_manage_power,
        .data           = BIT(8) | BIT(19), /* interface whitelist bitmap */
  };

diff --cc drivers/net/usb/usbnet.c
Simple merge

diff --cc drivers/net/wireless/airo.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/ath9k.h
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/hw.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/xmit.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/dvm/debugfs.c
Simple merge

diff --cc drivers/net/wireless/mwifiex/cfg80211.c
Simple merge

diff --cc net/batman-adv/translation-table.c
index 5180d50e909ddd624c48f16061b0ea9765fe2cd2,2ab83d7fb1f84c864d5bb2a49295e9b4f8071811..3806d9bbf55e7ee9e2c81f79aab5a4d13da9c35c
--- 1/net/batman-adv/translation-table.c
--- 2/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@@ -139,8 -141,7 +139,7 @@@ static void tt_orig_list_entry_free_rcu
        struct tt_orig_list_entry *orig_entry;
  
        orig_entry = container_of(rcu, struct tt_orig_list_entry, rcu);
-       atomic_dec(&orig_entry->orig_node->tt_size);
 -      orig_node_free_ref(orig_entry->orig_node);
 +      batadv_orig_node_free_ref(orig_entry->orig_node);
        kfree(orig_entry);
  }
  

diff --cc net/bluetooth/l2cap_core.c
Simple merge

diff --cc net/bluetooth/mgmt.c
Simple merge

diff --cc net/ipv6/ip6_fib.c
Simple merge

diff --cc net/ipv6/route.c
index e649cd78c15f83a6c05e52dee40df63d12ee868e,becb048d18d402f0335bee4e9d0c198f94eba6c4..c5bbece7f9f2a2619f3af781874fbd177c435ded
--- 1/net/ipv6/route.c
--- 2/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@@ -2929,31 -3007,11 +2938,36 @@@ static struct pernet_operations ip6_rou
        .exit = ip6_route_net_exit,
  };
  
 +static int __net_init ipv6_inetpeer_init(struct net *net)
 +{
 +      struct inet_peer_base *bp = kmalloc(sizeof(*bp), GFP_KERNEL);
 +
 +      if (!bp)
 +              return -ENOMEM;
 +      inet_peer_base_init(bp);
 +      net->ipv6.peers = bp;
 +      return 0;
 +}
 +
 +static void __net_exit ipv6_inetpeer_exit(struct net *net)
 +{
 +      struct inet_peer_base *bp = net->ipv6.peers;
 +
 +      net->ipv6.peers = NULL;
 +      inetpeer_invalidate_tree(bp);
 +      kfree(bp);
 +}
 +
 +static struct pernet_operations ipv6_inetpeer_ops = {
 +      .init   =       ipv6_inetpeer_init,
 +      .exit   =       ipv6_inetpeer_exit,
 +};
 +
+ static struct pernet_operations ip6_route_net_late_ops = {
+       .init = ip6_route_net_init_late,
+       .exit = ip6_route_net_exit_late,
+ };
+ 
  static struct notifier_block ip6_route_dev_notifier = {
        .notifier_call = ip6_route_dev_notify,
        .priority = 0,