From: Jakub Kicinski <kuba@kernel.org>
Date: Sat, 5 Sep 2020 04:18:58 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=44a8c4f33c0073ca614db79f22e023811bdd0f3c;p=linux.git

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

We got slightly different patches removing a double word
in a comment in net/ipv4/raw.c - picked the version from net.

Simple conflict in drivers/net/ethernet/ibm/ibmvnic.c. Use cached
values instead of VNIC login response buffer (following what
commit 507ebe6444a4 ("ibmvnic: Fix use-after-free of VNIC login
response buffer") did).

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

44a8c4f33c0073ca614db79f22e023811bdd0f3c
diff --cc drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
index cb3083d2b4abc,cf5383bb83319..ceaf76158e232
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
@@@ -377,12 -376,12 +377,12 @@@ static u32 dpaa2_eth_run_xdp(struct dpa
  		break;
  	default:
  		bpf_warn_invalid_xdp_action(xdp_act);
- 		/* fall through */
+ 		fallthrough;
  	case XDP_ABORTED:
  		trace_xdp_exception(priv->net_dev, xdp_prog, xdp_act);
- 		/* fall through */
+ 		fallthrough;
  	case XDP_DROP:
 -		xdp_release_buf(priv, ch, addr);
 +		dpaa2_eth_xdp_release_buf(priv, ch, addr);
  		ch->stats.xdp_drop++;
  		break;
  	case XDP_REDIRECT:
diff --cc drivers/net/ethernet/ibm/ibmvnic.c
index 994358689de99,d3a774331afc7..6b619c1902390
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@@ -467,12 -475,17 +467,15 @@@ static int init_stats_token(struct ibmv
  static int reset_rx_pools(struct ibmvnic_adapter *adapter)
  {
  	struct ibmvnic_rx_pool *rx_pool;
 +	u64 buff_size;
  	int rx_scrqs;
  	int i, j, rc;
 -	u64 *size_array;
  
+ 	if (!adapter->rx_pool)
+ 		return -1;
+ 
 -	size_array = (u64 *)((u8 *)(adapter->login_rsp_buf) +
 -		be32_to_cpu(adapter->login_rsp_buf->off_rxadd_buff_size));
 -
 -	rx_scrqs = be32_to_cpu(adapter->login_rsp_buf->num_rxadd_subcrqs);
 +	buff_size = adapter->cur_rx_buf_sz;
 +	rx_scrqs = adapter->num_active_rx_pools;
  	for (i = 0; i < rx_scrqs; i++) {
  		rx_pool = &adapter->rx_pool[i];
  
@@@ -637,7 -652,10 +640,10 @@@ static int reset_tx_pools(struct ibmvni
  	int tx_scrqs;
  	int i, rc;
  
+ 	if (!adapter->tx_pool)
+ 		return -1;
+ 
 -	tx_scrqs = be32_to_cpu(adapter->login_rsp_buf->num_txsubm_subcrqs);
 +	tx_scrqs = adapter->num_active_tx_pools;
  	for (i = 0; i < tx_scrqs; i++) {
  		rc = reset_one_tx_pool(adapter, &adapter->tso_pool[i]);
  		if (rc)