Commit 004688c4 authored by Piotr Raczynski's avatar Piotr Raczynski Committed by Tony Nguyen
Browse files

ice: export ice ndo_ops functions 



Make some of the netdevice_ops functions visible from outside for
another VSI type created netdev.

Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Reviewed-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Reviewed-by: default avatarWojciech Drewek <wojciech.drewek@intel.com>
Signed-off-by: default avatarPiotr Raczynski <piotr.raczynski@intel.com>
Signed-off-by: default avatarMichal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: default avatarRafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 597b8af5

drivers/net/ethernet/intel/ice/ice.h

+8 −0
Original line number Diff line number Diff line
@@ -1003,6 +1003,14 @@ void ice_unload(struct ice_pf *pf); 
void ice_adv_lnk_speed_maps_init(void);

int ice_init_dev(struct ice_pf *pf);

void ice_deinit_dev(struct ice_pf *pf);

int ice_change_mtu(struct net_device *netdev, int new_mtu);

void ice_tx_timeout(struct net_device *netdev, unsigned int txqueue);

int ice_xdp(struct net_device *dev, struct netdev_bpf *xdp);

void ice_set_netdev_features(struct net_device *netdev);

int ice_vlan_rx_add_vid(struct net_device *netdev, __be16 proto, u16 vid);

int ice_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto, u16 vid);

void ice_get_stats64(struct net_device *netdev,

		     struct rtnl_link_stats64 *stats);



/**

 * ice_set_rdma_cap - enable RDMA support

drivers/net/ethernet/intel/ice/ice_lib.c

+20 −0
Original line number Diff line number Diff line
@@ -2767,6 +2767,26 @@ void ice_vsi_clear_napi_queues(struct ice_vsi *vsi) 
		netif_queue_set_napi(netdev, q_idx, NETDEV_QUEUE_TYPE_RX, NULL);

}



/**

 * ice_napi_add - register NAPI handler for the VSI

 * @vsi: VSI for which NAPI handler is to be registered

 *

 * This function is only called in the driver's load path. Registering the NAPI

 * handler is done in ice_vsi_alloc_q_vector() for all other cases (i.e. resume,

 * reset/rebuild, etc.)

 */

void ice_napi_add(struct ice_vsi *vsi)

{

	int v_idx;



	if (!vsi->netdev)

		return;



	ice_for_each_q_vector(vsi, v_idx)

		netif_napi_add(vsi->netdev, &vsi->q_vectors[v_idx]->napi,

			       ice_napi_poll);

}



/**

 * ice_vsi_release - Delete a VSI and free its resources

 * @vsi: the VSI being removed

drivers/net/ethernet/intel/ice/ice_lib.h

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ struct ice_vsi * 
ice_vsi_setup(struct ice_pf *pf, struct ice_vsi_cfg_params *params);



void ice_vsi_set_napi_queues(struct ice_vsi *vsi);

void ice_napi_add(struct ice_vsi *vsi);



void ice_vsi_clear_napi_queues(struct ice_vsi *vsi);

drivers/net/ethernet/intel/ice/ice_main.c

+6 −29
Original line number Diff line number Diff line
@@ -3092,7 +3092,7 @@ static int ice_xdp_safe_mode(struct net_device __always_unused *dev, 
 * @dev: netdevice

 * @xdp: XDP command

 */

static int ice_xdp(struct net_device *dev, struct netdev_bpf *xdp)

int ice_xdp(struct net_device *dev, struct netdev_bpf *xdp)

{

	struct ice_netdev_priv *np = netdev_priv(dev);

	struct ice_vsi *vsi = np->vsi;
@@ -3558,26 +3558,6 @@ static int ice_req_irq_msix_misc(struct ice_pf *pf) 
	return 0;

}



/**

 * ice_napi_add - register NAPI handler for the VSI

 * @vsi: VSI for which NAPI handler is to be registered

 *

 * This function is only called in the driver's load path. Registering the NAPI

 * handler is done in ice_vsi_alloc_q_vector() for all other cases (i.e. resume,

 * reset/rebuild, etc.)

 */

static void ice_napi_add(struct ice_vsi *vsi)

{

	int v_idx;



	if (!vsi->netdev)

		return;



	ice_for_each_q_vector(vsi, v_idx)

		netif_napi_add(vsi->netdev, &vsi->q_vectors[v_idx]->napi,

			       ice_napi_poll);

}



/**

 * ice_set_ops - set netdev and ethtools ops for the given netdev

 * @vsi: the VSI associated with the new netdev
@@ -3611,7 +3591,7 @@ static void ice_set_ops(struct ice_vsi *vsi) 
 * ice_set_netdev_features - set features for the given netdev

 * @netdev: netdev instance

 */

static void ice_set_netdev_features(struct net_device *netdev)

void ice_set_netdev_features(struct net_device *netdev)

{

	struct ice_pf *pf = ice_netdev_to_pf(netdev);

	bool is_dvm_ena = ice_is_dvm_ena(&pf->hw);
@@ -3793,8 +3773,7 @@ ice_lb_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi) 
 *

 * net_device_ops implementation for adding VLAN IDs

 */

static int

ice_vlan_rx_add_vid(struct net_device *netdev, __be16 proto, u16 vid)

int ice_vlan_rx_add_vid(struct net_device *netdev, __be16 proto, u16 vid)

{

	struct ice_netdev_priv *np = netdev_priv(netdev);

	struct ice_vsi_vlan_ops *vlan_ops;
@@ -3856,8 +3835,7 @@ ice_vlan_rx_add_vid(struct net_device *netdev, __be16 proto, u16 vid) 
 *

 * net_device_ops implementation for removing VLAN IDs

 */

static int

ice_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto, u16 vid)

int ice_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto, u16 vid)

{

	struct ice_netdev_priv *np = netdev_priv(netdev);

	struct ice_vsi_vlan_ops *vlan_ops;
@@ -7127,7 +7105,6 @@ void ice_update_pf_stats(struct ice_pf *pf) 
 * @netdev: network interface device structure

 * @stats: main device statistics structure

 */

static

void ice_get_stats64(struct net_device *netdev, struct rtnl_link_stats64 *stats)

{

	struct ice_netdev_priv *np = netdev_priv(netdev);
@@ -7804,7 +7781,7 @@ static void ice_rebuild(struct ice_pf *pf, enum ice_reset_req reset_type) 
 *

 * Returns 0 on success, negative on failure

 */

static int ice_change_mtu(struct net_device *netdev, int new_mtu)

int ice_change_mtu(struct net_device *netdev, int new_mtu)

{

	struct ice_netdev_priv *np = netdev_priv(netdev);

	struct ice_vsi *vsi = np->vsi;
@@ -8228,7 +8205,7 @@ ice_bridge_setlink(struct net_device *dev, struct nlmsghdr *nlh, 
 * @netdev: network interface device structure

 * @txqueue: Tx queue

 */

static void ice_tx_timeout(struct net_device *netdev, unsigned int txqueue)

void ice_tx_timeout(struct net_device *netdev, unsigned int txqueue)

{

	struct ice_netdev_priv *np = netdev_priv(netdev);

	struct ice_tx_ring *tx_ring = NULL;