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

Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
	drivers/net/ethernet/emulex/benet/be.h
	include/net/tcp.h
	net/mac802154/mac802154.h

Most conflicts were minor overlapping stuff.

The be2net driver brought in some fixes that added __vlan_put_tag
calls, which in net-next take an additional argument.

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

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

diff --cc drivers/net/caif/caif_spi.c
Simple merge

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

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 91a0434,a8f1ee3..a024eec
--- 1/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
--- 2/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@@ -6041,19 -6030,22 +6042,27 @@@ void bnx2x_pre_irq_nic_init(struct bnx2
        rmb();
        bnx2x_init_rx_rings(bp);
        bnx2x_init_tx_rings(bp);
-       /* Initialize MOD_ABS interrupts */
-       bnx2x_init_mod_abs_int(bp, &bp->link_vars, bp->common.chip_id,
-                              bp->common.shmem_base, bp->common.shmem2_base,
-                              BP_PORT(bp));
+ 
 +      if (IS_VF(bp)) {
 +              bnx2x_memset_stats(bp);
 +              return;
 +      }
 +
+       if (IS_PF(bp)) {
+               /* Initialize MOD_ABS interrupts */
+               bnx2x_init_mod_abs_int(bp, &bp->link_vars, bp->common.chip_id,
+                                      bp->common.shmem_base,
+                                      bp->common.shmem2_base, BP_PORT(bp));
+ 
+               /* initialize the default status block and sp ring */
+               bnx2x_init_def_sb(bp);
+               bnx2x_update_dsb_idx(bp);
+               bnx2x_init_sp_ring(bp);
+       }
+ }
  
-       bnx2x_init_def_sb(bp);
-       bnx2x_update_dsb_idx(bp);
-       bnx2x_init_sp_ring(bp);
+ void bnx2x_post_irq_nic_init(struct bnx2x *bp, u32 load_code)
+ {
        bnx2x_init_eq_ring(bp);
        bnx2x_init_internal(bp, load_code);
        bnx2x_pf_init(bp);

diff --cc drivers/net/ethernet/emulex/benet/be.h
index 9045903,941aa1f..234ce6f
--- 1/drivers/net/ethernet/emulex/benet/be.h
--- 2/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@@ -435,7 -435,7 +436,8 @@@ struct be_adapter 
        u8 wol_cap;
        bool wol;
        u32 uc_macs;            /* Count of secondary UC MAC programmed */
 +      u16 asic_rev;
+       u16 qnq_vid;
        u32 msg_enable;
        int be_get_temp_freq;
        u16 max_mcast_mac;

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_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/emulex/benet/be_main.c
index 1c73491,1232e91..4babc8a
--- 1/drivers/net/ethernet/emulex/benet/be_main.c
--- 2/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@@ -777,6 -762,31 +775,31 @@@ static struct sk_buff *be_insert_vlan_i
                        skb->vlan_tci = 0;
        }
  
 -              skb = __vlan_put_tag(skb, vlan_tag);
+       if (qnq_async_evt_rcvd(adapter) && adapter->pvid) {
+               if (!vlan_tag)
+                       vlan_tag = adapter->pvid;
+               if (skip_hw_vlan)
+                       *skip_hw_vlan = true;
+       }
+ 
+       if (vlan_tag) {
 -              skb = __vlan_put_tag(skb, vlan_tag);
++              skb = __vlan_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);
+               if (unlikely(!skb))
+                       return skb;
+ 
+               skb->vlan_tci = 0;
+       }
+ 
+       /* Insert the outer VLAN, if any */
+       if (adapter->qnq_vid) {
+               vlan_tag = adapter->qnq_vid;
++              skb = __vlan_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);
+               if (unlikely(!skb))
+                       return skb;
+               if (skip_hw_vlan)
+                       *skip_hw_vlan = true;
+       }
+ 
        return skb;
  }
  

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

diff --cc drivers/net/ethernet/realtek/r8169.c
Simple merge

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

diff --cc net/batman-adv/routing.c
index 2f1f889,7de0336..b27a4d7
--- 1/net/batman-adv/routing.c
--- 2/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@@ -1061,19 -1046,9 +1061,18 @@@ int batadv_recv_unicast_packet(struct s
        if (is4addr)
                hdr_size = sizeof(*unicast_4addr_packet);
  
 -      if (batadv_check_unicast_packet(bat_priv, skb, hdr_size) < 0)
 +      /* function returns -EREMOTE for promiscuous packets */
 +      check = batadv_check_unicast_packet(bat_priv, skb, hdr_size);
 +
 +      /* Even though the packet is not for us, we might save it to use for
 +       * decoding a later received coded packet
 +       */
 +      if (check == -EREMOTE)
 +              batadv_nc_skb_store_sniffed_unicast(bat_priv, skb);
 +
 +      if (check < 0)
                return NET_RX_DROP;
- 
-       if (!batadv_check_unicast_ttvn(bat_priv, skb))
+       if (!batadv_check_unicast_ttvn(bat_priv, skb, hdr_size))
                return NET_RX_DROP;
  
        /* packet for me */

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

diff --cc net/ipv4/tcp_ipv4.c
index 8ea9751,d09203c..d979657
--- 1/net/ipv4/tcp_ipv4.c
--- 2/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@@ -1909,50 -1950,6 +1909,51 @@@ void tcp_v4_early_demux(struct sk_buff 
        }
  }
  
 +/* Packet is added to VJ-style prequeue for processing in process
 + * context, if a reader task is waiting. Apparently, this exciting
 + * idea (VJ's mail "Re: query about TCP header on tcp-ip" of 07 Sep 93)
 + * failed somewhere. Latency? Burstiness? Well, at least now we will
 + * see, why it failed. 8)8)                             --ANK
 + *
 + */
 +bool tcp_prequeue(struct sock *sk, struct sk_buff *skb)
 +{
 +      struct tcp_sock *tp = tcp_sk(sk);
 +
 +      if (sysctl_tcp_low_latency || !tp->ucopy.task)
 +              return false;
 +
 +      if (skb->len <= tcp_hdrlen(skb) &&
 +          skb_queue_len(&tp->ucopy.prequeue) == 0)
 +              return false;
 +
++      skb_dst_force(skb);
 +      __skb_queue_tail(&tp->ucopy.prequeue, skb);
 +      tp->ucopy.memory += skb->truesize;
 +      if (tp->ucopy.memory > sk->sk_rcvbuf) {
 +              struct sk_buff *skb1;
 +
 +              BUG_ON(sock_owned_by_user(sk));
 +
 +              while ((skb1 = __skb_dequeue(&tp->ucopy.prequeue)) != NULL) {
 +                      sk_backlog_rcv(sk, skb1);
 +                      NET_INC_STATS_BH(sock_net(sk),
 +                                       LINUX_MIB_TCPPREQUEUEDROPPED);
 +              }
 +
 +              tp->ucopy.memory = 0;
 +      } else if (skb_queue_len(&tp->ucopy.prequeue) == 1) {
 +              wake_up_interruptible_sync_poll(sk_sleep(sk),
 +                                         POLLIN | POLLRDNORM | POLLRDBAND);
 +              if (!inet_csk_ack_scheduled(sk))
 +                      inet_csk_reset_xmit_timer(sk, ICSK_TIME_DACK,
 +                                                (3 * tcp_rto_min(sk)) / 4,
 +                                                TCP_RTO_MAX);
 +      }
 +      return true;
 +}
 +EXPORT_SYMBOL(tcp_prequeue);
 +
  /*
   *    From tcp_input.c
   */

diff --cc net/mac802154/mac802154.h
index 5c9e021,703c121..d48422e
--- 1/net/mac802154/mac802154.h
--- 2/net/mac802154/mac802154.h
+++ b/net/mac802154/mac802154.h
@@@ -88,7 -88,9 +88,7 @@@ struct mac802154_sub_if_data 
  
  #define mac802154_to_priv(_hw)        container_of(_hw, struct mac802154_priv, hw)
  
- #define MAC802154_CHAN_NONE           (~(u8)0) /* No channel is assigned */
 -#define MAC802154_MAX_XMIT_ATTEMPTS   3
 -
+ #define MAC802154_CHAN_NONE           0xff /* No channel is assigned */
  
  extern struct ieee802154_reduced_mlme_ops mac802154_mlme_reduced;
  extern struct ieee802154_mlme_ops mac802154_mlme_wpan;

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

diff --cc net/nfc/llcp_sock.c
Simple merge

diff --cc net/unix/af_unix.c
Simple merge