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

Conflicts:
	net/batman-adv/bridge_loop_avoidance.c
	net/batman-adv/bridge_loop_avoidance.h
	net/batman-adv/soft-interface.c
	net/mac80211/mlme.c

With merge help from Antonio Quartulli (batman-adv) and
Stephen Rothwell (drivers/net/usb/qmi_wwan.c).

The net/mac80211/mlme.c conflict seemed easy enough, accounting for a
conversion to some new tracing macros.

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

diff --cc drivers/net/bonding/bond_main.c
Simple merge

diff --cc drivers/net/ethernet/atheros/atl1c/atl1c_main.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/cnic.c
Simple merge

diff --cc drivers/net/ethernet/freescale/gianfar.c
Simple merge

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

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

diff --cc drivers/net/usb/qmi_wwan.c
index b9cc5f703d7d2a138ba09412bb97eaf9c2f3aeb4,a051cedd64bde58179a1cb539b94a888fcd29416..85c983d525270a2190e1332d60f44202fb410536
--- 1/drivers/net/usb/qmi_wwan.c
--- 2/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@@ -374,6 -346,15 +374,15 @@@ static const struct driver_info  qmi_wwa
        .data           = BIT(1), /* interface whitelist bitmap */
  };
  
 -      .unbind         = qmi_wwan_unbind_shared,
+ static const struct driver_info qmi_wwan_force_int2 = {
+       .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(2), /* interface whitelist bitmap */
+ };
+ 
  static const struct driver_info       qmi_wwan_force_int3 = {
        .description    = "Qualcomm WWAN/QMI device",
        .flags          = FLAG_WWAN,

diff --cc drivers/net/wireless/b43legacy/dma.c
Simple merge

diff --cc drivers/net/wireless/iwlegacy/4965-mac.c
Simple merge

diff --cc drivers/net/wireless/iwlegacy/common.c
Simple merge

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

diff --cc net/batman-adv/bridge_loop_avoidance.c
index 3483e4035cbe3c0b96a04518c803376ed127381f,c5863f499133b466787b8b5044882c4ddded194a..6705d35b17cef3351ed9c202f5ce2bb17df933a7
--- 1/net/batman-adv/bridge_loop_avoidance.c
--- 2/net/batman-adv/bridge_loop_avoidance.c
+++ b/net/batman-adv/bridge_loop_avoidance.c
@@@ -1389,12 -1360,14 +1390,13 @@@ void batadv_bla_free(struct batadv_pri
   * in these cases, the skb is further handled by this function and
   * returns 1, otherwise it returns 0 and the caller shall further
   * process the skb.
 - *
   */
- int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, short vid)
 -int bla_rx(struct bat_priv *bat_priv, struct sk_buff *skb, short vid,
 -         bool is_bcast)
++int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, short vid,
++                bool is_bcast)
  {
        struct ethhdr *ethhdr;
 -      struct claim search_claim, *claim = NULL;
 -      struct hard_iface *primary_if;
 +      struct batadv_claim search_claim, *claim = NULL;
 +      struct batadv_hard_iface *primary_if;
        int ret;
  
        ethhdr = (struct ethhdr *)skb_mac_header(skb);

diff --cc net/batman-adv/bridge_loop_avoidance.h
index 08d13cb1e3df41040a8034384b3c995f29da15cc,dc5227b398d44c7b57eda34adc4b53b9a1281f9a..563cfbf94a7f5110c9dcd5eeffb6ff10da32b86b
--- 1/net/batman-adv/bridge_loop_avoidance.h
--- 2/net/batman-adv/bridge_loop_avoidance.h
+++ b/net/batman-adv/bridge_loop_avoidance.h
@@@ -21,26 -23,26 +21,28 @@@
  #define _NET_BATMAN_ADV_BLA_H_
  
  #ifdef CONFIG_BATMAN_ADV_BLA
- int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, short vid);
 -int bla_rx(struct bat_priv *bat_priv, struct sk_buff *skb, short vid,
 -         bool is_bcast);
 -int bla_tx(struct bat_priv *bat_priv, struct sk_buff *skb, short vid);
 -int bla_is_backbone_gw(struct sk_buff *skb,
 -                     struct orig_node *orig_node, int hdr_size);
 -int bla_claim_table_seq_print_text(struct seq_file *seq, void *offset);
 -int bla_is_backbone_gw_orig(struct bat_priv *bat_priv, uint8_t *orig);
 -int bla_check_bcast_duplist(struct bat_priv *bat_priv,
 -                          struct bcast_packet *bcast_packet, int hdr_size);
 -void bla_update_orig_address(struct bat_priv *bat_priv,
 -                           struct hard_iface *primary_if,
 -                           struct hard_iface *oldif);
 -int bla_init(struct bat_priv *bat_priv);
 -void bla_free(struct bat_priv *bat_priv);
++int batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, short vid,
++                bool is_bcast);
 +int batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, short vid);
 +int batadv_bla_is_backbone_gw(struct sk_buff *skb,
 +                            struct batadv_orig_node *orig_node, int hdr_size);
 +int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset);
 +int batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, uint8_t *orig);
 +int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv,
 +                                 struct batadv_bcast_packet *bcast_packet,
 +                                 int hdr_size);
 +void batadv_bla_update_orig_address(struct batadv_priv *bat_priv,
 +                                  struct batadv_hard_iface *primary_if,
 +                                  struct batadv_hard_iface *oldif);
 +int batadv_bla_init(struct batadv_priv *bat_priv);
 +void batadv_bla_free(struct batadv_priv *bat_priv);
  
 -#define BLA_CRC_INIT  0
 +#define BATADV_BLA_CRC_INIT   0
  #else /* ifdef CONFIG_BATMAN_ADV_BLA */
  
 -static inline int bla_rx(struct bat_priv *bat_priv, struct sk_buff *skb,
 -                       short vid, bool is_bcast)
 +static inline int batadv_bla_rx(struct batadv_priv *bat_priv,
-                               struct sk_buff *skb, short vid)
++                              struct sk_buff *skb, short vid,
++                              bool is_bcast)
  {
        return 0;
  }

diff --cc net/batman-adv/soft-interface.c
index 9e4bb61301ec1e155b9013585c5a02dc371bdc26,a0ec0e4ada4c0acf9392136cff17198b766acd1f..109ea2aae96cde266aef1123bb73a3fa7d219e79
--- 1/net/batman-adv/soft-interface.c
--- 2/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@@ -260,15 -249,18 +260,19 @@@ end
        return NETDEV_TX_OK;
  }
  
 -void interface_rx(struct net_device *soft_iface,
 -                struct sk_buff *skb, struct hard_iface *recv_if,
 -                int hdr_size)
 +void batadv_interface_rx(struct net_device *soft_iface,
 +                       struct sk_buff *skb, struct batadv_hard_iface *recv_if,
 +                       int hdr_size)
  {
 -      struct bat_priv *bat_priv = netdev_priv(soft_iface);
 +      struct batadv_priv *bat_priv = netdev_priv(soft_iface);
        struct ethhdr *ethhdr;
        struct vlan_ethhdr *vhdr;
 -      struct batman_header *batadv_header = (struct batman_header *)skb->data;
++      struct batadv_header *batadv_header = (struct batadv_header *)skb->data;
        short vid __maybe_unused = -1;
 -      is_bcast = (batadv_header->packet_type == BAT_BCAST);
 +      __be16 ethertype = __constant_htons(BATADV_ETH_P_BATMAN);
+       bool is_bcast;
+ 
++      is_bcast = (batadv_header->packet_type == BATADV_BCAST);
  
        /* check if enough space is available for pulling, and pull */
        if (!pskb_may_pull(skb, hdr_size))
@@@ -315,7 -306,7 +319,7 @@@
        /* Let the bridge loop avoidance check the packet. If will
         * not handle it, we can safely push it up.
         */
-       if (batadv_bla_rx(bat_priv, skb, vid))
 -      if (bla_rx(bat_priv, skb, vid, is_bcast))
++      if (batadv_bla_rx(bat_priv, skb, vid, is_bcast))
                goto out;
  
        netif_rx(skb);

diff --cc net/core/dev.c
Simple merge

diff --cc net/mac80211/mlme.c
index e6fe84a08443d1b2ba0b251e7d4e192466d6c915,0db5d34a06b69c8c72798a8a7d4e6c4f642f7560..aa69a331f374bceb37258c76bd681f247508f863
--- 1/net/mac80211/mlme.c
--- 2/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@@ -2148,19 -2170,17 +2148,17 @@@ ieee80211_rx_mgmt_assoc_resp(struct iee
        *bss = assoc_data->bss;
  
        if (status_code != WLAN_STATUS_SUCCESS) {
 -              printk(KERN_DEBUG "%s: %pM denied association (code=%d)\n",
 -                     sdata->name, mgmt->sa, status_code);
 +              sdata_info(sdata, "%pM denied association (code=%d)\n",
 +                         mgmt->sa, status_code);
                ieee80211_destroy_assoc_data(sdata, false);
        } else {
-               sdata_info(sdata, "associated\n");
- 
                if (!ieee80211_assoc_success(sdata, *bss, mgmt, len)) {
                        /* oops -- internal error -- send timeout for now */
-                       ieee80211_destroy_assoc_data(sdata, true);
-                       sta_info_destroy_addr(sdata, mgmt->bssid);
+                       ieee80211_destroy_assoc_data(sdata, false);
                        cfg80211_put_bss(*bss);
                        return RX_MGMT_CFG80211_ASSOC_TIMEOUT;
                }
 -              printk(KERN_DEBUG "%s: associated\n", sdata->name);
++              sdata_info(sdata, "associated\n");
  
                /*
                 * destroy assoc_data afterwards, as otherwise an idle

diff --cc net/nfc/llcp/sock.c
Simple merge