Merge remote-tracking branch 'net-next/master'

Conflicts:
	drivers/net/wireless/ath/ath9k/Kconfig
	drivers/net/xen-netback/netback.c
	net/batman-adv/bat_iv_ogm.c

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/net/bonding/bonding.h
Simple merge

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

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

diff --cc drivers/net/ethernet/renesas/sh_eth.c
Simple merge

diff --cc drivers/net/ethernet/ti/cpsw.c
Simple merge

diff --cc drivers/net/macvlan.c
Simple merge

diff --cc drivers/net/phy/Kconfig
Simple merge

diff --cc drivers/net/team/team.c
Simple merge

diff --cc drivers/net/team/team_mode_roundrobin.c
index 472623f8ce3d1c3cb20efe4403e50341b6cbc86e,90311c7375fbd3ede4e29478dca5ba81a863a949..53665850b59e280c171155690848ca5b5fcbb814
--- 1/drivers/net/team/team_mode_roundrobin.c
--- 2/drivers/net/team/team_mode_roundrobin.c
+++ b/drivers/net/team/team_mode_roundrobin.c
@@@ -30,10 -30,9 +30,11 @@@ static bool rr_transmit(struct team *te
        struct team_port *port;
        int port_index;
  
-       port_index = rr_priv(team)->sent_packets++ % team->en_port_count;
+       port_index = team_num_to_port_index(team,
+                                           rr_priv(team)->sent_packets++);
        port = team_get_port_by_index_rcu(team, port_index);
 +      if (unlikely(!port))
 +              goto drop;
        port = team_get_first_port_txable_rcu(team, port);
        if (unlikely(!port))
                goto drop;

diff --cc drivers/net/tun.c
Simple merge

diff --cc drivers/net/vxlan.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/Kconfig
index 3c2cbc9d6295df0e16afce4a4d541bde93f9164a,3b078515b422a4634942beefa8658be8e486b66f..760ab3fe09e2f753c360e1b1a149700ef5beca04
--- 1/drivers/net/wireless/ath/ath9k/Kconfig
--- 2/drivers/net/wireless/ath/ath9k/Kconfig
+++ b/drivers/net/wireless/ath/ath9k/Kconfig
@@@ -84,25 -84,13 +84,17 @@@ config ATH9K_DFS_CERTIFIE
          developed. At this point enabling this option won't do anything
          except increase code size.
  
- config ATH9K_MAC_DEBUG
-       bool "Atheros MAC statistics"
-       depends on ATH9K_DEBUGFS
-       default y
-       ---help---
-         This option enables collection of statistics for Rx/Tx status
-         data and some other MAC related statistics
- 
 -config ATH9K_RATE_CONTROL
 +config ATH9K_LEGACY_RATE_CONTROL
        bool "Atheros ath9k rate control"
        depends on ATH9K
 -      default y
 +      default n
        ---help---
          Say Y, if you want to use the ath9k specific rate control
 -        module instead of minstrel_ht.
 +        module instead of minstrel_ht. Be warned that there are various
 +        issues with the ath9k RC and minstrel is a more robust algorithm.
 +        Note that even if this option is selected, "ath9k_rate_control"
 +        has to be passed to mac80211 using the module parameter,
 +        ieee80211_default_rc_algo.
  
  config ATH9K_HTC
         tristate "Atheros HTC based wireless cards support"

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

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

diff --cc drivers/net/wireless/iwlwifi/iwl-drv.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/rs.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/tx.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2800lib.c
Simple merge

diff --cc drivers/net/xen-netback/netback.c
index 8c20935d72c959123838003612e0e382bb7f23fb,82576fffb4526a9964cd4f5074e77770bbb7373b..a0b50ad2ef319e26dae5bcb1baf259345b1b4645
--- 1/drivers/net/xen-netback/netback.c
--- 2/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@@ -783,9 -789,8 +790,9 @@@ static void xen_netbk_rx_action(struct 
        }
  
        list_for_each_entry_safe(vif, tmp, &notify, notify_list) {
-               notify_remote_via_irq(vif->irq);
+               notify_remote_via_irq(vif->rx_irq);
                list_del_init(&vif->notify_list);
 +              xenvif_put(vif);
        }
  
        /* More work to do? */

diff --cc include/linux/filter.h
Simple merge

diff --cc include/linux/if_team.h
Simple merge

diff --cc include/net/ip_tunnels.h
index 09b1360e10bf0de6c78cbb8cdf6156b5ccdc8061,40b4dfce01fc0324e6fda08ac9a6ade1f64e5a09..1be442f894064bb06fb6016db0cf8f02388ff555
--- 1/include/net/ip_tunnels.h
--- 2/include/net/ip_tunnels.h
+++ b/include/net/ip_tunnels.h
@@@ -95,13 -95,13 +95,13 @@@ struct ip_tunnel_net 
  int ip_tunnel_init(struct net_device *dev);
  void ip_tunnel_uninit(struct net_device *dev);
  void  ip_tunnel_dellink(struct net_device *dev, struct list_head *head);
 -int __net_init ip_tunnel_init_net(struct net *net, int ip_tnl_net_id,
 -                                struct rtnl_link_ops *ops, char *devname);
 +int ip_tunnel_init_net(struct net *net, int ip_tnl_net_id,
 +                     struct rtnl_link_ops *ops, char *devname);
  
 -void __net_exit ip_tunnel_delete_net(struct ip_tunnel_net *itn);
 +void ip_tunnel_delete_net(struct ip_tunnel_net *itn);
  
  void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev,
-                   const struct iphdr *tnl_params);
+                   const struct iphdr *tnl_params, const u8 protocol);
  int ip_tunnel_ioctl(struct net_device *dev, struct ip_tunnel_parm *p, int cmd);
  int ip_tunnel_change_mtu(struct net_device *dev, int new_mtu);
  

diff --cc net/batman-adv/bat_iv_ogm.c
index f680ee101878690520c1c99a9acf336bbb8cb19c,d07323b3e9b8e611e99f44b116934c1bf750a79e..f3810c1adb2e60be1514afdc601fa9c8eb026197
--- 1/net/batman-adv/bat_iv_ogm.c
--- 2/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@@ -29,21 -28,48 +28,64 @@@
  #include "bat_algo.h"
  #include "network-coding.h"
  
 +/**
 + * batadv_dup_status - duplicate status
 + * @BATADV_NO_DUP: the packet is a duplicate
 + * @BATADV_ORIG_DUP: OGM is a duplicate in the originator (but not for the
 + *  neighbor)
 + * @BATADV_NEIGH_DUP: OGM is a duplicate for the neighbor
 + * @BATADV_PROTECTED: originator is currently protected (after reboot)
 + */
 +enum batadv_dup_status {
 +      BATADV_NO_DUP = 0,
 +      BATADV_ORIG_DUP,
 +      BATADV_NEIGH_DUP,
 +      BATADV_PROTECTED,
 +};
 +
+ /**
+  * batadv_ring_buffer_set - update the ring buffer with the given value
+  * @lq_recv: pointer to the ring buffer
+  * @lq_index: index to store the value at
+  * @value: value to store in the ring buffer
+  */
+ static void batadv_ring_buffer_set(uint8_t lq_recv[], uint8_t *lq_index,
+                                  uint8_t value)
+ {
+       lq_recv[*lq_index] = value;
+       *lq_index = (*lq_index + 1) % BATADV_TQ_GLOBAL_WINDOW_SIZE;
+ }
+ 
+ /**
+  * batadv_ring_buffer_set - compute the average of all non-zero values stored
+  * in the given ring buffer
+  * @lq_recv: pointer to the ring buffer
+  *
+  * Returns computed average value.
+  */
+ static uint8_t batadv_ring_buffer_avg(const uint8_t lq_recv[])
+ {
+       const uint8_t *ptr;
+       uint16_t count = 0, i = 0, sum = 0;
+ 
+       ptr = lq_recv;
+ 
+       while (i < BATADV_TQ_GLOBAL_WINDOW_SIZE) {
+               if (*ptr != 0) {
+                       count++;
+                       sum += *ptr;
+               }
+ 
+               i++;
+               ptr++;
+       }
+ 
+       if (count == 0)
+               return 0;
+ 
+       return (uint8_t)(sum / count);
+ }
++
  static struct batadv_neigh_node *
  batadv_iv_ogm_neigh_new(struct batadv_hard_iface *hard_iface,
                        const uint8_t *neigh_addr,
@@@ -1013,11 -1062,10 +1085,11 @@@ static void batadv_iv_ogm_process(cons
        struct batadv_neigh_node *orig_neigh_router = NULL;
        int has_directlink_flag;
        int is_my_addr = 0, is_my_orig = 0, is_my_oldorig = 0;
-       int is_broadcast = 0, is_bidirect;
+       int is_bidirect;
        bool is_single_hop_neigh = false;
        bool is_from_best_next_hop = false;
 -      int is_duplicate, sameseq, simlar_ttl;
 +      int sameseq, similar_ttl;
 +      enum batadv_dup_status dup_status;
        uint32_t if_incoming_seqno;
        uint8_t *prev_sender;
  

diff --cc net/batman-adv/bridge_loop_avoidance.c
Simple merge

diff --cc net/bridge/br_multicast.c
Simple merge

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

diff --cc net/ipv4/ip_tunnel.c
Simple merge

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

diff --cc net/mac80211/cfg.c
Simple merge

diff --cc net/mac80211/ieee80211_i.h
Simple merge

diff --cc net/mac80211/mlme.c
index 741448b308257c3a6f01c3d09ca36d7ddaa31ca3,f44f4caa69ee15e6bb234fc94d3b273e39ae37e4..118540b16729be256abbc2b4c2bf756ac44304b4
--- 1/net/mac80211/mlme.c
--- 2/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@@ -2743,16 -2637,12 +2707,15 @@@ static bool ieee80211_assoc_success(str
        ieee80211_sta_rx_notify(sdata, (struct ieee80211_hdr *)mgmt);
        ieee80211_sta_reset_beacon_monitor(sdata);
  
 -      return true;
 +      ret = true;
 + out:
 +      kfree(bss_ies);
 +      return ret;
  }
  
- static enum rx_mgmt_action __must_check
- ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
-                            struct ieee80211_mgmt *mgmt, size_t len,
-                            struct cfg80211_bss **bss)
+ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
+                                        struct ieee80211_mgmt *mgmt,
+                                        size_t len)
  {
        struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
        struct ieee80211_mgd_assoc_data *assoc_data = ifmgd->assoc_data;

diff --cc net/mac80211/util.c
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_ctl.c
Simple merge

diff --cc net/netfilter/nfnetlink_queue_core.c
Simple merge

diff --cc net/netlink/af_netlink.c
Simple merge

diff --cc net/packet/af_packet.c
Simple merge

diff --cc net/sctp/socket.c
Simple merge

diff --cc net/sunrpc/xprtsock.c
Simple merge