From: David S. Miller <davem@davemloft.net>
Date: Sun, 1 Apr 2018 23:49:34 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c0b458a9463bd6be165374a8e9e3235800ee132e;p=linux.git

Merge git://git./linux/kernel/git/davem/net

Minor conflicts in drivers/net/ethernet/mellanox/mlx5/core/en_rep.c,
we had some overlapping changes:

1) In 'net' MLX5E_PARAMS_LOG_{SQ,RQ}_SIZE -->
   MLX5E_REP_PARAMS_LOG_{SQ,RQ}_SIZE

2) In 'net-next' params->log_rq_size is renamed to be
   params->log_rq_mtu_frames.

3) In 'net-next' params->hard_mtu is added.

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

c0b458a9463bd6be165374a8e9e3235800ee132e
diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
index 8e70fa9ef39a3,500d817d2b0ae..d8f68e4d1018f
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
@@@ -877,10 -883,9 +883,10 @@@ static void mlx5e_build_rep_params(stru
  					 MLX5_CQ_PERIOD_MODE_START_FROM_CQE :
  					 MLX5_CQ_PERIOD_MODE_START_FROM_EQE;
  
 +	params->hard_mtu    = MLX5E_ETH_HARD_MTU;
- 	params->log_sq_size = MLX5E_PARAMS_MINIMUM_LOG_SQ_SIZE;
+ 	params->log_sq_size = MLX5E_REP_PARAMS_LOG_SQ_SIZE;
  	params->rq_wq_type  = MLX5_WQ_TYPE_LINKED_LIST;
- 	params->log_rq_mtu_frames = MLX5E_PARAMS_MINIMUM_LOG_RQ_SIZE;
 -	params->log_rq_size = MLX5E_REP_PARAMS_LOG_RQ_SIZE;
++	params->log_rq_mtu_frames = MLX5E_REP_PARAMS_LOG_RQ_SIZE;
  
  	params->rx_dim_enabled = MLX5_CAP_GEN(mdev, cq_moderation);
  	mlx5e_set_rx_cq_mode_params(params, cq_period_mode);
diff --cc drivers/net/ethernet/realtek/r8169.c
index 630409e0337fb,b4779acb6b5c1..604ae78381ae4
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@@ -8382,12 -8666,9 +8384,10 @@@ static int rtl_init_one(struct pci_dev 
  	if (rc < 0)
  		return rc;
  
- 	pci_set_drvdata(pdev, dev);
- 
  	netif_info(tp, probe, dev, "%s at 0x%p, %pM, XID %08x IRQ %d\n",
 -		   rtl_chip_infos[chipset].name, ioaddr, dev->dev_addr,
 -		   (u32)(RTL_R32(TxConfig) & 0x9cf0f8ff), pdev->irq);
 +		   rtl_chip_infos[chipset].name, tp->mmio_addr, dev->dev_addr,
 +		   (u32)(RTL_R32(tp, TxConfig) & 0x9cf0f8ff),
 +		   pci_irq_vector(pdev, 0));
  	if (rtl_chip_infos[chipset].jumbo_max != JUMBO_1K) {
  		netif_info(tp, probe, dev, "jumbo features [frames: %d bytes, "
  			   "tx checksumming: %s]\n",
diff --cc net/ipv4/ip_tunnel.c
index 5fcb17cb426bf,a7fd1c5a2a149..de6d94482fe7e
--- a/net/ipv4/ip_tunnel.c
+++ b/net/ipv4/ip_tunnel.c
@@@ -346,8 -362,11 +346,10 @@@ static struct ip_tunnel *ip_tunnel_crea
  	struct ip_tunnel *nt;
  	struct net_device *dev;
  	int t_hlen;
+ 	int mtu;
+ 	int err;
  
 -	BUG_ON(!itn->fb_tunnel_dev);
 -	dev = __ip_tunnel_create(net, itn->fb_tunnel_dev->rtnl_link_ops, parms);
 +	dev = __ip_tunnel_create(net, itn->rtnl_link_ops, parms);
  	if (IS_ERR(dev))
  		return ERR_CAST(dev);