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

Simple overlapping changes in stmmac driver.

Adjust skb_gro_flush_final_remcsum function signature to make GRO list
changes in net-next, as per Stephen Rothwell's example merge
resolution.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/atm/zatm.c
Simple merge

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

diff --cc drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
index 52f4a6b46cb2782365efd22111a76b7080c987d7,ab02057ac7304f088242a2a07481820302d3556b..65a22cd9aef26197f79877862756133b4109b895
--- 1/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
--- 2/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
+++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
@@@ -1617,22 -1618,10 +1620,22 @@@ static struct sk_buff *dpaa_cleanup_tx_
        skbh = (struct sk_buff **)phys_to_virt(addr);
        skb = *skbh;
  
 +      if (priv->tx_tstamp && skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) {
 +              memset(&shhwtstamps, 0, sizeof(shhwtstamps));
 +
 +              if (!fman_port_get_tstamp(priv->mac_dev->port[TX], (void *)skbh,
 +                                        &ns)) {
 +                      shhwtstamps.hwtstamp = ns_to_ktime(ns);
 +                      skb_tstamp_tx(skb, &shhwtstamps);
 +              } else {
 +                      dev_warn(dev, "fman_port_get_tstamp failed!\n");
 +              }
 +      }
 +
        if (unlikely(qm_fd_get_format(fd) == qm_fd_sg)) {
                nr_frags = skb_shinfo(skb)->nr_frags;
-               dma_unmap_single(dev, addr, qm_fd_get_offset(fd) +
-                                sizeof(struct qm_sg_entry) * (1 + nr_frags),
+               dma_unmap_single(dev, addr,
+                                qm_fd_get_offset(fd) + DPAA_SGT_SIZE,
                                 dma_dir);
  
                /* The sgt buffer has been allocated with netdev_alloc_frag(),

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

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

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
Simple merge

diff --cc drivers/net/ethernet/netronome/nfp/bpf/main.c
Simple merge

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

diff --cc drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c
index 6e32f8a3710be1767d9b0e493230cb022b08956a,65bc3556bd8f8c25b9b37421c80d6a663d8eb0db..edb6053bd9802574ee5b5ec9a1cea4de7678214e
--- 1/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c
--- 2/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c
@@@ -407,19 -407,16 +407,29 @@@ static void dwmac4_enable_tso(void __io
        }
  }
  
 +static void dwmac4_qmode(void __iomem *ioaddr, u32 channel, u8 qmode)
 +{
 +      u32 mtl_tx_op = readl(ioaddr + MTL_CHAN_TX_OP_MODE(channel));
 +
 +      mtl_tx_op &= ~MTL_OP_MODE_TXQEN_MASK;
 +      if (qmode != MTL_QUEUE_AVB)
 +              mtl_tx_op |= MTL_OP_MODE_TXQEN;
 +      else
 +              mtl_tx_op |= MTL_OP_MODE_TXQEN_AV;
 +
 +      writel(mtl_tx_op, ioaddr +  MTL_CHAN_TX_OP_MODE(channel));
 +}
 +
+ static void dwmac4_set_bfsize(void __iomem *ioaddr, int bfsize, u32 chan)
+ {
+       u32 value = readl(ioaddr + DMA_CHAN_RX_CONTROL(chan));
+ 
+       value &= ~DMA_RBSZ_MASK;
+       value |= (bfsize << DMA_RBSZ_SHIFT) & DMA_RBSZ_MASK;
+ 
+       writel(value, ioaddr + DMA_CHAN_RX_CONTROL(chan));
+ }
+ 
  const struct stmmac_dma_ops dwmac4_dma_ops = {
        .reset = dwmac4_dma_reset,
        .init = dwmac4_dma_init,
@@@ -444,7 -441,7 +454,8 @@@
        .set_rx_tail_ptr = dwmac4_set_rx_tail_ptr,
        .set_tx_tail_ptr = dwmac4_set_tx_tail_ptr,
        .enable_tso = dwmac4_enable_tso,
 +      .qmode = dwmac4_qmode,
+       .set_bfsize = dwmac4_set_bfsize,
  };
  
  const struct stmmac_dma_ops dwmac410_dma_ops = {
@@@ -471,5 -468,5 +482,6 @@@
        .set_rx_tail_ptr = dwmac4_set_rx_tail_ptr,
        .set_tx_tail_ptr = dwmac4_set_tx_tail_ptr,
        .enable_tso = dwmac4_enable_tso,
 +      .qmode = dwmac4_qmode,
+       .set_bfsize = dwmac4_set_bfsize,
  };

diff --cc drivers/net/ethernet/stmicro/stmmac/hwif.h
index e2a965790648c574b749a86c363347fcd8711bd1,fe8b536b13f864bfff723ea2236a3e5982026533..79911eefc2a7249ec347260e4026d5ebdbfe499a
--- 1/drivers/net/ethernet/stmicro/stmmac/hwif.h
--- 2/drivers/net/ethernet/stmicro/stmmac/hwif.h
+++ b/drivers/net/ethernet/stmicro/stmmac/hwif.h
@@@ -183,7 -183,7 +183,8 @@@ struct stmmac_dma_ops 
        void (*set_rx_tail_ptr)(void __iomem *ioaddr, u32 tail_ptr, u32 chan);
        void (*set_tx_tail_ptr)(void __iomem *ioaddr, u32 tail_ptr, u32 chan);
        void (*enable_tso)(void __iomem *ioaddr, bool en, u32 chan);
 +      void (*qmode)(void __iomem *ioaddr, u32 channel, u8 qmode);
+       void (*set_bfsize)(void __iomem *ioaddr, int bfsize, u32 chan);
  };
  
  #define stmmac_reset(__priv, __args...) \
@@@ -236,8 -236,8 +237,10 @@@
        stmmac_do_void_callback(__priv, dma, set_tx_tail_ptr, __args)
  #define stmmac_enable_tso(__priv, __args...) \
        stmmac_do_void_callback(__priv, dma, enable_tso, __args)
 +#define stmmac_dma_qmode(__priv, __args...) \
 +      stmmac_do_void_callback(__priv, dma, qmode, __args)
+ #define stmmac_set_dma_bfsize(__priv, __args...) \
+       stmmac_do_void_callback(__priv, dma, set_bfsize, __args)
  
  struct mac_device_info;
  struct net_device;

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

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

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

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

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

diff --cc include/linux/netdevice.h
index 8bf8d6149f79210163d6de2edaa60fa66c300b14,3d0cc0b5cec2d7514dbebf32effab9b1e6388c3c..64480a0f2c1690d250c8e1d7607f23a2713d47d6
--- 1/include/linux/netdevice.h
--- 2/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@@ -2796,11 -2789,31 +2796,31 @@@ static inline void skb_gro_flush_final(
        if (PTR_ERR(pp) != -EINPROGRESS)
                NAPI_GRO_CB(skb)->flush |= flush;
  }
 -                                             struct sk_buff **pp,
+ static inline void skb_gro_flush_final_remcsum(struct sk_buff *skb,
++                                             struct sk_buff *pp,
+                                              int flush,
+                                              struct gro_remcsum *grc)
+ {
+       if (PTR_ERR(pp) != -EINPROGRESS) {
+               NAPI_GRO_CB(skb)->flush |= flush;
+               skb_gro_remcsum_cleanup(skb, grc);
+               skb->remcsum_offload = 0;
+       }
+ }
  #else
 -static inline void skb_gro_flush_final(struct sk_buff *skb, struct sk_buff **pp, int flush)
 +static inline void skb_gro_flush_final(struct sk_buff *skb, struct sk_buff *pp, int flush)
  {
        NAPI_GRO_CB(skb)->flush |= flush;
  }
 -                                             struct sk_buff **pp,
+ static inline void skb_gro_flush_final_remcsum(struct sk_buff *skb,
++                                             struct sk_buff *pp,
+                                              int flush,
+                                              struct gro_remcsum *grc)
+ {
+       NAPI_GRO_CB(skb)->flush |= flush;
+       skb_gro_remcsum_cleanup(skb, grc);
+       skb->remcsum_offload = 0;
+ }
  #endif
  
  static inline int dev_hard_header(struct sk_buff *skb, struct net_device *dev,

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

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

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

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

diff --cc net/8021q/vlan.c
Simple merge

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

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

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

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

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

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

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

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

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

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

diff --cc net/l2tp/l2tp_ppp.c
Simple merge

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

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

diff --cc net/smc/af_smc.c
Simple merge

diff --cc net/smc/smc.h
index 8c6231011779ce6208e729ca16fe39118d34f62a,d7ca265704821a1862f84f209550c4b19fc0db59..be20acd7b5aba34161edec7eaad18456abcb8ffb
--- 1/net/smc/smc.h
--- 2/net/smc/smc.h
+++ b/net/smc/smc.h
@@@ -183,13 -185,14 +183,19 @@@ struct smc_connection 
        spinlock_t              acurs_lock;     /* protect cursors */
  #endif
        struct work_struct      close_work;     /* peer sent some closing */
 +      struct tasklet_struct   rx_tsklet;      /* Receiver tasklet for SMC-D */
 +      u8                      rx_off;         /* receive offset:
 +                                               * 0 for SMC-R, 32 for SMC-D
 +                                               */
 +      u64                     peer_token;     /* SMC-D token of peer */
  };
  
+ struct smc_connect_info {
+       int                     flags;
+       int                     alen;
+       struct sockaddr         addr;
+ };
+ 
  struct smc_sock {                             /* smc sock container */
        struct sock             sk;
        struct socket           *clcsock;       /* internal tcp socket */

diff --cc net/strparser/strparser.c
Simple merge

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

diff --cc net/tls/tls_sw.c
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge