From: David S. Miller <davem@davemloft.net>
Date: Tue, 25 Sep 2018 17:35:29 +0000 (-0700)
Subject: Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v4.20-rc1~27^2~265
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=a06ee256e5d6f03fffbd088de9bf84035658cc5a;p=linux.git

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

Version bump conflict in batman-adv, take what's in net-next.

iavf conflict, adjustment of netdev_ops in net-next conflicting
with poll controller method removal in net.

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

a06ee256e5d6f03fffbd088de9bf84035658cc5a
diff --cc drivers/net/ethernet/intel/iavf/iavf_main.c
index 8c71c698a2ef,fef6d892ed4c..9f2b7b7adf6b
--- a/drivers/net/ethernet/intel/iavf/iavf_main.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_main.c
@@@ -390,34 -393,11 +390,11 @@@ static void iavf_map_rings_to_vectors(s
  			vidx = 0;
  	}
  
 -	adapter->aq_required |= I40EVF_FLAG_AQ_MAP_VECTORS;
 +	adapter->aq_required |= IAVF_FLAG_AQ_MAP_VECTORS;
  }
  
- #ifdef CONFIG_NET_POLL_CONTROLLER
- /**
-  * iavf_netpoll - A Polling 'interrupt' handler
-  * @netdev: network interface device structure
-  *
-  * This is used by netconsole to send skbs without having to re-enable
-  * interrupts.  It's not called while the normal interrupt routine is executing.
-  **/
- static void iavf_netpoll(struct net_device *netdev)
- {
- 	struct iavf_adapter *adapter = netdev_priv(netdev);
- 	int q_vectors = adapter->num_msix_vectors - NONQ_VECS;
- 	int i;
- 
- 	/* if interface is down do nothing */
- 	if (test_bit(__IAVF_VSI_DOWN, adapter->vsi.state))
- 		return;
- 
- 	for (i = 0; i < q_vectors; i++)
- 		iavf_msix_clean_rings(0, &adapter->q_vectors[i]);
- }
- 
- #endif
  /**
 - * i40evf_irq_affinity_notify - Callback for affinity changes
 + * iavf_irq_affinity_notify - Callback for affinity changes
   * @notify: context as to what irq was changed
   * @mask: the new affinity mask
   *
@@@ -3213,24 -3192,21 +3190,21 @@@ static netdev_features_t iavf_fix_featu
  	return features;
  }
  
 -static const struct net_device_ops i40evf_netdev_ops = {
 -	.ndo_open		= i40evf_open,
 -	.ndo_stop		= i40evf_close,
 -	.ndo_start_xmit		= i40evf_xmit_frame,
 -	.ndo_set_rx_mode	= i40evf_set_rx_mode,
 +static const struct net_device_ops iavf_netdev_ops = {
 +	.ndo_open		= iavf_open,
 +	.ndo_stop		= iavf_close,
 +	.ndo_start_xmit		= iavf_xmit_frame,
 +	.ndo_set_rx_mode	= iavf_set_rx_mode,
  	.ndo_validate_addr	= eth_validate_addr,
 -	.ndo_set_mac_address	= i40evf_set_mac,
 -	.ndo_change_mtu		= i40evf_change_mtu,
 -	.ndo_tx_timeout		= i40evf_tx_timeout,
 -	.ndo_vlan_rx_add_vid	= i40evf_vlan_rx_add_vid,
 -	.ndo_vlan_rx_kill_vid	= i40evf_vlan_rx_kill_vid,
 -	.ndo_features_check	= i40evf_features_check,
 -	.ndo_fix_features	= i40evf_fix_features,
 -	.ndo_set_features	= i40evf_set_features,
 -	.ndo_setup_tc		= i40evf_setup_tc,
 +	.ndo_set_mac_address	= iavf_set_mac,
 +	.ndo_change_mtu		= iavf_change_mtu,
 +	.ndo_tx_timeout		= iavf_tx_timeout,
 +	.ndo_vlan_rx_add_vid	= iavf_vlan_rx_add_vid,
 +	.ndo_vlan_rx_kill_vid	= iavf_vlan_rx_kill_vid,
 +	.ndo_features_check	= iavf_features_check,
 +	.ndo_fix_features	= iavf_fix_features,
 +	.ndo_set_features	= iavf_set_features,
- #ifdef CONFIG_NET_POLL_CONTROLLER
- 	.ndo_poll_controller	= iavf_netpoll,
- #endif
 +	.ndo_setup_tc		= iavf_setup_tc,
  };
  
  /**