Commit f4e63525 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

net: bpf: rename ndo_xdp to ndo_bpf 



ndo_xdp is a control path callback for setting up XDP in the
driver.  We can reuse it for other forms of communication
between the eBPF stack and the drivers.  Rename the callback
and associated structures and definitions.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarSimon Horman <simon.horman@netronome.com>
Reviewed-by: default avatarQuentin Monnet <quentin.monnet@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 28e8c191

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+1 −1
Original line number Diff line number Diff line
@@ -7775,7 +7775,7 @@ static const struct net_device_ops bnxt_netdev_ops = { 
#endif

	.ndo_udp_tunnel_add	= bnxt_udp_tunnel_add,

	.ndo_udp_tunnel_del	= bnxt_udp_tunnel_del,

	.ndo_xdp		= bnxt_xdp,

	.ndo_bpf		= bnxt_xdp,

	.ndo_bridge_getlink	= bnxt_bridge_getlink,

	.ndo_bridge_setlink	= bnxt_bridge_setlink,

	.ndo_get_phys_port_name = bnxt_get_phys_port_name

drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static int bnxt_xdp_set(struct bnxt *bp, struct bpf_prog *prog) 
	return 0;

}



int bnxt_xdp(struct net_device *dev, struct netdev_xdp *xdp)

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

{

	struct bnxt *bp = netdev_priv(dev);

	int rc;

drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ void bnxt_tx_int_xdp(struct bnxt *bp, struct bnxt_napi *bnapi, int nr_pkts); 
bool bnxt_rx_xdp(struct bnxt *bp, struct bnxt_rx_ring_info *rxr, u16 cons,

		 struct page *page, u8 **data_ptr, unsigned int *len,

		 u8 *event);

int bnxt_xdp(struct net_device *dev, struct netdev_xdp *xdp);

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



#endif

drivers/net/ethernet/cavium/thunder/nicvf_main.c

+2 −2
Original line number Diff line number Diff line
@@ -1741,7 +1741,7 @@ static int nicvf_xdp_setup(struct nicvf *nic, struct bpf_prog *prog) 
	return 0;

}



static int nicvf_xdp(struct net_device *netdev, struct netdev_xdp *xdp)

static int nicvf_xdp(struct net_device *netdev, struct netdev_bpf *xdp)

{

	struct nicvf *nic = netdev_priv(netdev);
@@ -1774,7 +1774,7 @@ static const struct net_device_ops nicvf_netdev_ops = { 
	.ndo_tx_timeout         = nicvf_tx_timeout,

	.ndo_fix_features       = nicvf_fix_features,

	.ndo_set_features       = nicvf_set_features,

	.ndo_xdp		= nicvf_xdp,

	.ndo_bpf		= nicvf_xdp,

};



static int nicvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

drivers/net/ethernet/intel/i40e/i40e_main.c

+3 −3
Original line number Diff line number Diff line
@@ -11648,12 +11648,12 @@ static int i40e_xdp_setup(struct i40e_vsi *vsi, 
}



/**

 * i40e_xdp - implements ndo_xdp for i40e

 * i40e_xdp - implements ndo_bpf for i40e

 * @dev: netdevice

 * @xdp: XDP command

 **/

static int i40e_xdp(struct net_device *dev,

		    struct netdev_xdp *xdp)

		    struct netdev_bpf *xdp)

{

	struct i40e_netdev_priv *np = netdev_priv(dev);

	struct i40e_vsi *vsi = np->vsi;
@@ -11705,7 +11705,7 @@ static const struct net_device_ops i40e_netdev_ops = { 
	.ndo_features_check	= i40e_features_check,

	.ndo_bridge_getlink	= i40e_ndo_bridge_getlink,

	.ndo_bridge_setlink	= i40e_ndo_bridge_setlink,

	.ndo_xdp		= i40e_xdp,

	.ndo_bpf		= i40e_xdp,

};



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE