From: David S. Miller <davem@davemloft.net>
Date: Sun, 22 Dec 2019 23:15:05 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: v5.6-rc1~151^2~213
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=ac80010fc94eb0680d9a432b639583bd7ac29066;p=linux.git

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

Mere overlapping changes in the conflicts here.

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

ac80010fc94eb0680d9a432b639583bd7ac29066
diff --cc drivers/net/ethernet/amazon/ena/ena_netdev.c
index 26954fde4766,948583fdcc28..081acf077bb5
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.c
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
@@@ -1861,8 -1237,9 +1861,8 @@@ static int ena_io_poll(struct napi_stru
  {
  	struct ena_napi *ena_napi = container_of(napi, struct ena_napi, napi);
  	struct ena_ring *tx_ring, *rx_ring;
- 	u32 tx_work_done;
- 	u32 rx_work_done;
 -
+ 	int tx_work_done;
+ 	int rx_work_done = 0;
  	int tx_budget;
  	int napi_comp_call = 0;
  	int ret;
diff --cc drivers/net/ethernet/stmicro/stmmac/common.h
index 09c72025ed3e,94f94686cf7d..31003b67d24f
--- a/drivers/net/ethernet/stmicro/stmmac/common.h
+++ b/drivers/net/ethernet/stmicro/stmmac/common.h
@@@ -363,16 -363,10 +363,15 @@@ struct dma_features 
  	unsigned int dvlan;
  	unsigned int l3l4fnum;
  	unsigned int arpoffsel;
 +	/* TSN Features */
 +	unsigned int estwid;
 +	unsigned int estdep;
 +	unsigned int estsel;
 +	unsigned int fpesel;
  };
  
- /* GMAC TX FIFO is 8K, Rx FIFO is 16K */
- #define BUF_SIZE_16KiB 16384
- /* RX Buffer size must be < 8191 and multiple of 4/8/16 bytes */
+ /* RX Buffer size must be multiple of 4/8/16 bytes */
+ #define BUF_SIZE_16KiB 16368
  #define BUF_SIZE_8KiB 8188
  #define BUF_SIZE_4KiB 4096
  #define BUF_SIZE_2KiB 2048
diff --cc drivers/net/phy/phylink.c
index a917f95372cd,1585eebb73fe..ba9468cc8e13
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@@ -445,9 -441,8 +445,8 @@@ static void phylink_mac_link_up(struct 
  	struct net_device *ndev = pl->netdev;
  
  	pl->cur_interface = link_state.interface;
 -	pl->ops->mac_link_up(pl->config, pl->link_an_mode,
 +	pl->ops->mac_link_up(pl->config, pl->cur_link_an_mode,
- 			     pl->phy_state.interface,
- 			     pl->phydev);
+ 			     pl->cur_interface, pl->phydev);
  
  	if (ndev)
  		netif_carrier_on(ndev);