Commit fd5ef520 authored by Przemek Kitszel's avatar Przemek Kitszel Committed by Tony Nguyen
Browse files

ixgbe: wrap netdev_priv() usage 



Wrap use of netdev_priv() in order to change the allocator of the device
private structure from alloc_etherdev_mq() to the devlink in next commit.

All but one netdev_priv() calls in the whole driver are replaced, the
remaining one is called on MACVLAN (so not ixgbe) device.

Signed-off-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Tested-by: default avatarBharath R <bharath.r@intel.com>
Signed-off-by: default avatarJedrzej Jagielski <jedrzej.jagielski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 8982fc03

drivers/net/ethernet/intel/ixgbe/ixgbe.h

+5 −0
Original line number Diff line number Diff line
@@ -830,6 +830,11 @@ struct ixgbe_adapter { 
	spinlock_t vfs_lock;

};



static inline struct ixgbe_adapter *ixgbe_from_netdev(struct net_device *netdev)

{

	return netdev_priv(netdev);

}



static inline int ixgbe_determine_xdp_q_idx(int cpu)

{

	if (static_key_enabled(&ixgbe_xdp_locking_key))

drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c

+28 −28
Original line number Diff line number Diff line
@@ -118,14 +118,14 @@ static int ixgbe_copy_dcb_cfg(struct ixgbe_adapter *adapter, int tc_max) 


static u8 ixgbe_dcbnl_get_state(struct net_device *netdev)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);



	return !!(adapter->flags & IXGBE_FLAG_DCB_ENABLED);

}



static u8 ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);



	/* Fail command if not in CEE mode */

	if (!(adapter->dcbx_cap & DCB_CAP_DCBX_VER_CEE))
@@ -142,7 +142,7 @@ static u8 ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state) 
static void ixgbe_dcbnl_get_perm_hw_addr(struct net_device *netdev,

					 u8 *perm_addr)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);

	int i, j;



	memset(perm_addr, 0xff, MAX_ADDR_LEN);
@@ -167,7 +167,7 @@ static void ixgbe_dcbnl_set_pg_tc_cfg_tx(struct net_device *netdev, int tc, 
					 u8 prio, u8 bwg_id, u8 bw_pct,

					 u8 up_map)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);



	if (prio != DCB_ATTR_VALUE_UNDEFINED)

		adapter->temp_dcb_cfg.tc_config[tc].path[0].prio_type = prio;
@@ -184,7 +184,7 @@ static void ixgbe_dcbnl_set_pg_tc_cfg_tx(struct net_device *netdev, int tc, 
static void ixgbe_dcbnl_set_pg_bwg_cfg_tx(struct net_device *netdev, int bwg_id,

					  u8 bw_pct)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);



	adapter->temp_dcb_cfg.bw_percentage[0][bwg_id] = bw_pct;

}
@@ -193,7 +193,7 @@ static void ixgbe_dcbnl_set_pg_tc_cfg_rx(struct net_device *netdev, int tc, 
					 u8 prio, u8 bwg_id, u8 bw_pct,

					 u8 up_map)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);



	if (prio != DCB_ATTR_VALUE_UNDEFINED)

		adapter->temp_dcb_cfg.tc_config[tc].path[1].prio_type = prio;
@@ -210,7 +210,7 @@ static void ixgbe_dcbnl_set_pg_tc_cfg_rx(struct net_device *netdev, int tc, 
static void ixgbe_dcbnl_set_pg_bwg_cfg_rx(struct net_device *netdev, int bwg_id,

					  u8 bw_pct)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);



	adapter->temp_dcb_cfg.bw_percentage[1][bwg_id] = bw_pct;

}
@@ -219,7 +219,7 @@ static void ixgbe_dcbnl_get_pg_tc_cfg_tx(struct net_device *netdev, int tc, 
					 u8 *prio, u8 *bwg_id, u8 *bw_pct,

					 u8 *up_map)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);



	*prio = adapter->dcb_cfg.tc_config[tc].path[0].prio_type;

	*bwg_id = adapter->dcb_cfg.tc_config[tc].path[0].bwg_id;
@@ -230,7 +230,7 @@ static void ixgbe_dcbnl_get_pg_tc_cfg_tx(struct net_device *netdev, int tc, 
static void ixgbe_dcbnl_get_pg_bwg_cfg_tx(struct net_device *netdev, int bwg_id,

					  u8 *bw_pct)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);



	*bw_pct = adapter->dcb_cfg.bw_percentage[0][bwg_id];

}
@@ -239,7 +239,7 @@ static void ixgbe_dcbnl_get_pg_tc_cfg_rx(struct net_device *netdev, int tc, 
					 u8 *prio, u8 *bwg_id, u8 *bw_pct,

					 u8 *up_map)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);



	*prio = adapter->dcb_cfg.tc_config[tc].path[1].prio_type;

	*bwg_id = adapter->dcb_cfg.tc_config[tc].path[1].bwg_id;
@@ -250,7 +250,7 @@ static void ixgbe_dcbnl_get_pg_tc_cfg_rx(struct net_device *netdev, int tc, 
static void ixgbe_dcbnl_get_pg_bwg_cfg_rx(struct net_device *netdev, int bwg_id,

					  u8 *bw_pct)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);



	*bw_pct = adapter->dcb_cfg.bw_percentage[1][bwg_id];

}
@@ -258,7 +258,7 @@ static void ixgbe_dcbnl_get_pg_bwg_cfg_rx(struct net_device *netdev, int bwg_id, 
static void ixgbe_dcbnl_set_pfc_cfg(struct net_device *netdev, int priority,

				    u8 setting)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);



	adapter->temp_dcb_cfg.tc_config[priority].dcb_pfc = setting;

	if (adapter->temp_dcb_cfg.tc_config[priority].dcb_pfc !=
@@ -269,14 +269,14 @@ static void ixgbe_dcbnl_set_pfc_cfg(struct net_device *netdev, int priority, 
static void ixgbe_dcbnl_get_pfc_cfg(struct net_device *netdev, int priority,

				    u8 *setting)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);



	*setting = adapter->dcb_cfg.tc_config[priority].dcb_pfc;

}



static void ixgbe_dcbnl_devreset(struct net_device *dev)

{

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(dev);



	while (test_and_set_bit(__IXGBE_RESETTING, &adapter->state))

		usleep_range(1000, 2000);
@@ -295,7 +295,7 @@ static void ixgbe_dcbnl_devreset(struct net_device *dev) 


static u8 ixgbe_dcbnl_set_all(struct net_device *netdev)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);

	struct ixgbe_dcb_config *dcb_cfg = &adapter->dcb_cfg;

	struct ixgbe_hw *hw = &adapter->hw;

	int ret = DCB_NO_HW_CHG;
@@ -383,7 +383,7 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev) 


static u8 ixgbe_dcbnl_getcap(struct net_device *netdev, int capid, u8 *cap)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);



	switch (capid) {

	case DCB_CAP_ATTR_PG:
@@ -420,7 +420,7 @@ static u8 ixgbe_dcbnl_getcap(struct net_device *netdev, int capid, u8 *cap) 


static int ixgbe_dcbnl_getnumtcs(struct net_device *netdev, int tcid, u8 *num)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);



	if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {

		switch (tcid) {
@@ -447,14 +447,14 @@ static int ixgbe_dcbnl_setnumtcs(struct net_device *netdev, int tcid, u8 num) 


static u8 ixgbe_dcbnl_getpfcstate(struct net_device *netdev)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);



	return adapter->dcb_cfg.pfc_mode_enable;

}



static void ixgbe_dcbnl_setpfcstate(struct net_device *netdev, u8 state)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);



	adapter->temp_dcb_cfg.pfc_mode_enable = state;

}
@@ -471,7 +471,7 @@ static void ixgbe_dcbnl_setpfcstate(struct net_device *netdev, u8 state) 
 */

static int ixgbe_dcbnl_getapp(struct net_device *netdev, u8 idtype, u16 id)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);

	struct dcb_app app = {

				.selector = idtype,

				.protocol = id,
@@ -486,7 +486,7 @@ static int ixgbe_dcbnl_getapp(struct net_device *netdev, u8 idtype, u16 id) 
static int ixgbe_dcbnl_ieee_getets(struct net_device *dev,

				   struct ieee_ets *ets)

{

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(dev);

	struct ieee_ets *my_ets = adapter->ixgbe_ieee_ets;



	ets->ets_cap = adapter->dcb_cfg.num_tcs.pg_tcs;
@@ -506,7 +506,7 @@ static int ixgbe_dcbnl_ieee_getets(struct net_device *dev, 
static int ixgbe_dcbnl_ieee_setets(struct net_device *dev,

				   struct ieee_ets *ets)

{

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(dev);

	int max_frame = dev->mtu + ETH_HLEN + ETH_FCS_LEN;

	int i, err;

	__u8 max_tc = 0;
@@ -559,7 +559,7 @@ static int ixgbe_dcbnl_ieee_setets(struct net_device *dev, 
static int ixgbe_dcbnl_ieee_getpfc(struct net_device *dev,

				   struct ieee_pfc *pfc)

{

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(dev);

	struct ieee_pfc *my_pfc = adapter->ixgbe_ieee_pfc;

	int i;
@@ -584,7 +584,7 @@ static int ixgbe_dcbnl_ieee_getpfc(struct net_device *dev, 
static int ixgbe_dcbnl_ieee_setpfc(struct net_device *dev,

				   struct ieee_pfc *pfc)

{

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(dev);

	struct ixgbe_hw *hw = &adapter->hw;

	u8 *prio_tc;

	int err;
@@ -616,7 +616,7 @@ static int ixgbe_dcbnl_ieee_setpfc(struct net_device *dev, 
static int ixgbe_dcbnl_ieee_setapp(struct net_device *dev,

				   struct dcb_app *app)

{

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(dev);

	int err;



	if (!(adapter->dcbx_cap & DCB_CAP_DCBX_VER_IEEE))
@@ -661,7 +661,7 @@ static int ixgbe_dcbnl_ieee_setapp(struct net_device *dev, 
static int ixgbe_dcbnl_ieee_delapp(struct net_device *dev,

				   struct dcb_app *app)

{

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(dev);

	int err;



	if (!(adapter->dcbx_cap & DCB_CAP_DCBX_VER_IEEE))
@@ -705,13 +705,13 @@ static int ixgbe_dcbnl_ieee_delapp(struct net_device *dev, 


static u8 ixgbe_dcbnl_getdcbx(struct net_device *dev)

{

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(dev);

	return adapter->dcbx_cap;

}



static u8 ixgbe_dcbnl_setdcbx(struct net_device *dev, u8 mode)

{

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(dev);

	struct ieee_ets ets = {0};

	struct ieee_pfc pfc = {0};

	int err = 0;

drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c

+37 −37
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ static void ixgbe_set_advertising_10gtypes(struct ixgbe_hw *hw, 
static int ixgbe_get_link_ksettings(struct net_device *netdev,

				    struct ethtool_link_ksettings *cmd)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);

	struct ixgbe_hw *hw = &adapter->hw;

	ixgbe_link_speed supported_link;

	bool autoneg = false;
@@ -458,7 +458,7 @@ static int ixgbe_get_link_ksettings(struct net_device *netdev, 
static int ixgbe_set_link_ksettings(struct net_device *netdev,

				    const struct ethtool_link_ksettings *cmd)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);

	struct ixgbe_hw *hw = &adapter->hw;

	u32 advertised, old;

	int err = 0;
@@ -535,7 +535,7 @@ static int ixgbe_set_link_ksettings(struct net_device *netdev, 
static void ixgbe_get_pause_stats(struct net_device *netdev,

				  struct ethtool_pause_stats *stats)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);

	struct ixgbe_hw_stats *hwstats = &adapter->stats;



	stats->tx_pause_frames = hwstats->lxontxc + hwstats->lxofftxc;
@@ -545,7 +545,7 @@ static void ixgbe_get_pause_stats(struct net_device *netdev, 
static void ixgbe_get_pauseparam(struct net_device *netdev,

				 struct ethtool_pauseparam *pause)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);

	struct ixgbe_hw *hw = &adapter->hw;



	if (ixgbe_device_supports_autoneg_fc(hw) &&
@@ -567,7 +567,7 @@ static void ixgbe_get_pauseparam(struct net_device *netdev, 
static int ixgbe_set_pauseparam(struct net_device *netdev,

				struct ethtool_pauseparam *pause)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);

	struct ixgbe_hw *hw = &adapter->hw;

	struct ixgbe_fc_info fc = hw->fc;
@@ -606,13 +606,13 @@ static int ixgbe_set_pauseparam(struct net_device *netdev, 


static u32 ixgbe_get_msglevel(struct net_device *netdev)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);

	return adapter->msg_enable;

}



static void ixgbe_set_msglevel(struct net_device *netdev, u32 data)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);

	adapter->msg_enable = data;

}
@@ -627,7 +627,7 @@ static int ixgbe_get_regs_len(struct net_device *netdev) 
static void ixgbe_get_regs(struct net_device *netdev,

			   struct ethtool_regs *regs, void *p)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);

	struct ixgbe_hw *hw = &adapter->hw;

	u32 *regs_buff = p;

	u8 i;
@@ -994,14 +994,14 @@ static void ixgbe_get_regs(struct net_device *netdev, 


static int ixgbe_get_eeprom_len(struct net_device *netdev)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);

	return adapter->hw.eeprom.word_size * 2;

}



static int ixgbe_get_eeprom(struct net_device *netdev,

			    struct ethtool_eeprom *eeprom, u8 *bytes)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);

	struct ixgbe_hw *hw = &adapter->hw;

	u16 *eeprom_buff;

	int first_word, last_word, eeprom_len;
@@ -1037,7 +1037,7 @@ static int ixgbe_get_eeprom(struct net_device *netdev, 
static int ixgbe_set_eeprom(struct net_device *netdev,

			    struct ethtool_eeprom *eeprom, u8 *bytes)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);

	struct ixgbe_hw *hw = &adapter->hw;

	u16 *eeprom_buff;

	void *ptr;
@@ -1107,7 +1107,7 @@ static int ixgbe_set_eeprom(struct net_device *netdev, 
static void ixgbe_get_drvinfo(struct net_device *netdev,

			      struct ethtool_drvinfo *drvinfo)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);



	strscpy(drvinfo->driver, ixgbe_driver_name, sizeof(drvinfo->driver));
@@ -1161,7 +1161,7 @@ static void ixgbe_get_ringparam(struct net_device *netdev, 
				struct kernel_ethtool_ringparam *kernel_ring,

				struct netlink_ext_ack *extack)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);

	struct ixgbe_ring *tx_ring = adapter->tx_ring[0];

	struct ixgbe_ring *rx_ring = adapter->rx_ring[0];
@@ -1176,7 +1176,7 @@ static int ixgbe_set_ringparam(struct net_device *netdev, 
			       struct kernel_ethtool_ringparam *kernel_ring,

			       struct netlink_ext_ack *extack)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);

	struct ixgbe_ring *temp_ring;

	int i, j, err = 0;

	u32 new_rx_count, new_tx_count;
@@ -1336,7 +1336,7 @@ static int ixgbe_get_sset_count(struct net_device *netdev, int sset) 
static void ixgbe_get_ethtool_stats(struct net_device *netdev,

				    struct ethtool_stats *stats, u64 *data)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);

	struct rtnl_link_stats64 temp;

	const struct rtnl_link_stats64 *net_stats;

	unsigned int start;
@@ -1710,7 +1710,7 @@ static int ixgbe_eeprom_test(struct ixgbe_adapter *adapter, u64 *data) 
static irqreturn_t ixgbe_test_intr(int irq, void *data)

{

	struct net_device *netdev = (struct net_device *) data;

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);



	adapter->test_icr |= IXGBE_READ_REG(&adapter->hw, IXGBE_EICR);
@@ -2183,7 +2183,7 @@ static int ixgbe_loopback_test(struct ixgbe_adapter *adapter, u64 *data) 
static void ixgbe_diag_test(struct net_device *netdev,

			    struct ethtool_test *eth_test, u64 *data)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);

	bool if_running = netif_running(netdev);



	if (ixgbe_removed(adapter->hw.hw_addr)) {
@@ -2306,7 +2306,7 @@ static int ixgbe_wol_exclusion(struct ixgbe_adapter *adapter, 
static void ixgbe_get_wol(struct net_device *netdev,

			  struct ethtool_wolinfo *wol)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);



	wol->supported = WAKE_UCAST | WAKE_MCAST |

			 WAKE_BCAST | WAKE_MAGIC;
@@ -2328,7 +2328,7 @@ static void ixgbe_get_wol(struct net_device *netdev, 


static int ixgbe_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);



	if (wol->wolopts & (WAKE_PHY | WAKE_ARP | WAKE_MAGICSECURE |

			    WAKE_FILTER))
@@ -2355,7 +2355,7 @@ static int ixgbe_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) 


static int ixgbe_nway_reset(struct net_device *netdev)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);



	if (netif_running(netdev))

		ixgbe_reinit_locked(adapter);
@@ -2366,7 +2366,7 @@ static int ixgbe_nway_reset(struct net_device *netdev) 
static int ixgbe_set_phys_id(struct net_device *netdev,

			     enum ethtool_phys_id_state state)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);

	struct ixgbe_hw *hw = &adapter->hw;



	if (!hw->mac.ops.led_on || !hw->mac.ops.led_off)
@@ -2399,7 +2399,7 @@ static int ixgbe_get_coalesce(struct net_device *netdev, 
			      struct kernel_ethtool_coalesce *kernel_coal,

			      struct netlink_ext_ack *extack)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);



	/* only valid if in constant ITR mode */

	if (adapter->rx_itr_setting <= 1)
@@ -2455,7 +2455,7 @@ static int ixgbe_set_coalesce(struct net_device *netdev, 
			      struct kernel_ethtool_coalesce *kernel_coal,

			      struct netlink_ext_ack *extack)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);

	struct ixgbe_q_vector *q_vector;

	int i;

	u16 tx_itr_param, rx_itr_param, tx_itr_prev;
@@ -2681,7 +2681,7 @@ static int ixgbe_rss_indir_tbl_max(struct ixgbe_adapter *adapter) 
static int ixgbe_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,

			   u32 *rule_locs)

{

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(dev);

	int ret = -EOPNOTSUPP;



	switch (cmd->cmd) {
@@ -3069,7 +3069,7 @@ static int ixgbe_set_rss_hash_opt(struct ixgbe_adapter *adapter, 


static int ixgbe_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd)

{

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(dev);

	int ret = -EOPNOTSUPP;



	switch (cmd->cmd) {
@@ -3096,7 +3096,7 @@ static u32 ixgbe_get_rxfh_key_size(struct net_device *netdev) 


static u32 ixgbe_rss_indir_size(struct net_device *netdev)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);



	return ixgbe_rss_indir_tbl_entries(adapter);

}
@@ -3116,7 +3116,7 @@ static void ixgbe_get_reta(struct ixgbe_adapter *adapter, u32 *indir) 
static int ixgbe_get_rxfh(struct net_device *netdev,

			  struct ethtool_rxfh_param *rxfh)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);



	rxfh->hfunc = ETH_RSS_HASH_TOP;
@@ -3134,7 +3134,7 @@ static int ixgbe_set_rxfh(struct net_device *netdev, 
			  struct ethtool_rxfh_param *rxfh,

			  struct netlink_ext_ack *extack)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);

	int i;

	u32 reta_entries = ixgbe_rss_indir_tbl_entries(adapter);
@@ -3176,7 +3176,7 @@ static int ixgbe_set_rxfh(struct net_device *netdev, 
static int ixgbe_get_ts_info(struct net_device *dev,

			     struct kernel_ethtool_ts_info *info)

{

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(dev);



	/* we always support timestamping disabled */

	info->rx_filters = BIT(HWTSTAMP_FILTER_NONE);
@@ -3252,7 +3252,7 @@ static unsigned int ixgbe_max_channels(struct ixgbe_adapter *adapter) 
static void ixgbe_get_channels(struct net_device *dev,

			       struct ethtool_channels *ch)

{

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(dev);



	/* report maximum channels */

	ch->max_combined = ixgbe_max_channels(adapter);
@@ -3289,7 +3289,7 @@ static void ixgbe_get_channels(struct net_device *dev, 
static int ixgbe_set_channels(struct net_device *dev,

			      struct ethtool_channels *ch)

{

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(dev);

	unsigned int count = ch->combined_count;

	u8 max_rss_indices = ixgbe_max_rss_indices(adapter);
@@ -3327,7 +3327,7 @@ static int ixgbe_set_channels(struct net_device *dev, 
static int ixgbe_get_module_info(struct net_device *dev,

				       struct ethtool_modinfo *modinfo)

{

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(dev);

	struct ixgbe_hw *hw = &adapter->hw;

	u8 sff8472_rev, addr_mode;

	bool page_swap = false;
@@ -3373,7 +3373,7 @@ static int ixgbe_get_module_eeprom(struct net_device *dev, 
					 struct ethtool_eeprom *ee,

					 u8 *data)

{

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(dev);

	struct ixgbe_hw *hw = &adapter->hw;

	int status = -EFAULT;

	u8 databyte = 0xFF;
@@ -3469,7 +3469,7 @@ ixgbe_get_eee_fw(struct ixgbe_adapter *adapter, struct ethtool_keee *edata) 


static int ixgbe_get_eee(struct net_device *netdev, struct ethtool_keee *edata)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);

	struct ixgbe_hw *hw = &adapter->hw;



	if (!(adapter->flags2 & IXGBE_FLAG2_EEE_CAPABLE))
@@ -3483,7 +3483,7 @@ static int ixgbe_get_eee(struct net_device *netdev, struct ethtool_keee *edata) 


static int ixgbe_set_eee(struct net_device *netdev, struct ethtool_keee *edata)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);

	struct ixgbe_hw *hw = &adapter->hw;

	struct ethtool_keee eee_data;

	int ret_val;
@@ -3538,7 +3538,7 @@ static int ixgbe_set_eee(struct net_device *netdev, struct ethtool_keee *edata) 


static u32 ixgbe_get_priv_flags(struct net_device *netdev)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);

	u32 priv_flags = 0;



	if (adapter->flags2 & IXGBE_FLAG2_RX_LEGACY)
@@ -3555,7 +3555,7 @@ static u32 ixgbe_get_priv_flags(struct net_device *netdev) 


static int ixgbe_set_priv_flags(struct net_device *netdev, u32 priv_flags)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);

	unsigned int flags2 = adapter->flags2;

	unsigned int i;

drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c

+6 −6
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ int ixgbe_fcoe_ddp_put(struct net_device *netdev, u16 xid) 
	if (xid >= netdev->fcoe_ddp_xid)

		return 0;



	adapter = netdev_priv(netdev);

	adapter = ixgbe_from_netdev(netdev);

	fcoe = &adapter->fcoe;

	ddp = &fcoe->ddp[xid];

	if (!ddp->udl)
@@ -153,7 +153,7 @@ static int ixgbe_fcoe_ddp_setup(struct net_device *netdev, u16 xid, 
	if (!netdev || !sgl)

		return 0;



	adapter = netdev_priv(netdev);

	adapter = ixgbe_from_netdev(netdev);

	if (xid >= netdev->fcoe_ddp_xid) {

		e_warn(drv, "xid=0x%x out-of-range\n", xid);

		return 0;
@@ -834,7 +834,7 @@ static void ixgbe_fcoe_ddp_disable(struct ixgbe_adapter *adapter) 
 */

int ixgbe_fcoe_enable(struct net_device *netdev)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);

	struct ixgbe_fcoe *fcoe = &adapter->fcoe;



	atomic_inc(&fcoe->refcnt);
@@ -881,7 +881,7 @@ int ixgbe_fcoe_enable(struct net_device *netdev) 
 */

int ixgbe_fcoe_disable(struct net_device *netdev)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);



	if (!atomic_dec_and_test(&adapter->fcoe.refcnt))

		return -EINVAL;
@@ -927,7 +927,7 @@ int ixgbe_fcoe_disable(struct net_device *netdev) 
int ixgbe_fcoe_get_wwn(struct net_device *netdev, u64 *wwn, int type)

{

	u16 prefix = 0xffff;

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);

	struct ixgbe_mac_info *mac = &adapter->hw.mac;



	switch (type) {
@@ -967,7 +967,7 @@ int ixgbe_fcoe_get_wwn(struct net_device *netdev, u64 *wwn, int type) 
int ixgbe_fcoe_get_hbainfo(struct net_device *netdev,

			   struct netdev_fcoe_hbainfo *info)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);

	struct ixgbe_hw *hw = &adapter->hw;

	u64 dsn;

drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c

+5 −5
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ static int ixgbe_ipsec_parse_proto_keys(struct xfrm_state *xs, 
static int ixgbe_ipsec_check_mgmt_ip(struct xfrm_state *xs)

{

	struct net_device *dev = xs->xso.real_dev;

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(dev);

	struct ixgbe_hw *hw = &adapter->hw;

	u32 mfval, manc, reg;

	int num_filters = 4;
@@ -563,7 +563,7 @@ static int ixgbe_ipsec_add_sa(struct xfrm_state *xs, 
			      struct netlink_ext_ack *extack)

{

	struct net_device *dev = xs->xso.real_dev;

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(dev);

	struct ixgbe_ipsec *ipsec = adapter->ipsec;

	struct ixgbe_hw *hw = &adapter->hw;

	int checked, match, first;
@@ -757,7 +757,7 @@ static int ixgbe_ipsec_add_sa(struct xfrm_state *xs, 
static void ixgbe_ipsec_del_sa(struct xfrm_state *xs)

{

	struct net_device *dev = xs->xso.real_dev;

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(dev);

	struct ixgbe_ipsec *ipsec = adapter->ipsec;

	struct ixgbe_hw *hw = &adapter->hw;

	u32 zerobuf[4] = {0, 0, 0, 0};
@@ -1052,7 +1052,7 @@ int ixgbe_ipsec_tx(struct ixgbe_ring *tx_ring, 
		   struct ixgbe_tx_buffer *first,

		   struct ixgbe_ipsec_tx_data *itd)

{

	struct ixgbe_adapter *adapter = netdev_priv(tx_ring->netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(tx_ring->netdev);

	struct ixgbe_ipsec *ipsec = adapter->ipsec;

	struct xfrm_state *xs;

	struct sec_path *sp;
@@ -1142,7 +1142,7 @@ void ixgbe_ipsec_rx(struct ixgbe_ring *rx_ring, 
		    union ixgbe_adv_rx_desc *rx_desc,

		    struct sk_buff *skb)

{

	struct ixgbe_adapter *adapter = netdev_priv(rx_ring->netdev);

	struct ixgbe_adapter *adapter = ixgbe_from_netdev(rx_ring->netdev);

	__le16 pkt_info = rx_desc->wb.lower.lo_dword.hs_rss.pkt_info;

	__le16 ipsec_pkt_types = cpu_to_le16(IXGBE_RXDADV_PKTTYPE_IPSEC_AH |

					     IXGBE_RXDADV_PKTTYPE_IPSEC_ESP);