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

Minor overlapping changes in xfrm_device.c, between the double
ESP trailing bug fix setting the XFRM_INIT flag and the changes
in net-next preparing for bonding encryption support.

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

diff --cc drivers/net/dsa/sja1105/sja1105_vl.c
Simple merge

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

diff --cc drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/sge.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
Simple merge

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

diff --cc drivers/net/ethernet/freescale/enetc/enetc_hw.h
Simple merge

diff --cc drivers/net/ethernet/marvell/mvneta.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlxsw/spectrum.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlxsw/spectrum.h
Simple merge

diff --cc drivers/net/ethernet/netronome/nfp/flower/offload.c
Simple merge

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

diff --cc drivers/net/phy/mscc/mscc_macsec.c
Simple merge

diff --cc drivers/net/phy/phy_device.c
Simple merge

diff --cc drivers/net/phy/phylink.c
Simple merge

diff --cc drivers/of/of_mdio.c
Simple merge

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

diff --cc include/net/flow_offload.h
Simple merge

diff --cc include/net/xfrm.h
Simple merge

diff --cc net/bridge/br_private.h
Simple merge

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

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

diff --cc net/mptcp/protocol.h
Simple merge

diff --cc net/sched/act_gate.c
Simple merge

diff --cc net/sched/cls_api.c
Simple merge

diff --cc net/sched/sch_cake.c
Simple merge

diff --cc net/xfrm/xfrm_device.c
index 7b64bb6,626096b..edf1189
--- 1/net/xfrm/xfrm_device.c
--- 2/net/xfrm/xfrm_device.c
+++ b/net/xfrm/xfrm_device.c
@@@ -106,10 -106,9 +106,10 @@@ struct sk_buff *validate_xmit_xfrm(stru
        struct sk_buff *skb2, *nskb, *pskb = NULL;
        netdev_features_t esp_features = features;
        struct xfrm_offload *xo = xfrm_offload(skb);
 +      struct net_device *dev = skb->dev;
        struct sec_path *sp;
  
-       if (!xo)
+       if (!xo || (xo->flags & XFRM_XMIT))
                return skb;
  
        if (!(features & NETIF_F_HW_ESP))
@@@ -134,20 -129,27 +134,22 @@@
                return skb;
        }
  
 -      if (skb_is_gso(skb)) {
 -              struct net_device *dev = skb->dev;
+       xo->flags |= XFRM_XMIT;
+ 
 +      if (skb_is_gso(skb) && unlikely(x->xso.dev != dev)) {
 +              struct sk_buff *segs;
  
 -              if (unlikely(x->xso.dev != dev)) {
 -                      struct sk_buff *segs;
 +              /* Packet got rerouted, fixup features and segment it. */
 +              esp_features = esp_features & ~(NETIF_F_HW_ESP | NETIF_F_GSO_ESP);
  
 -                      /* Packet got rerouted, fixup features and segment it. */
 -                      esp_features = esp_features & ~(NETIF_F_HW_ESP
 -                                                      | NETIF_F_GSO_ESP);
 -
 -                      segs = skb_gso_segment(skb, esp_features);
 -                      if (IS_ERR(segs)) {
 -                              kfree_skb(skb);
 -                              atomic_long_inc(&dev->tx_dropped);
 -                              return NULL;
 -                      } else {
 -                              consume_skb(skb);
 -                              skb = segs;
 -                      }
 +              segs = skb_gso_segment(skb, esp_features);
 +              if (IS_ERR(segs)) {
 +                      kfree_skb(skb);
 +                      atomic_long_inc(&dev->tx_dropped);
 +                      return NULL;
 +              } else {
 +                      consume_skb(skb);
 +                      skb = segs;
                }
        }