Commit 766338c7 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by Jakub Kicinski
Browse files

net: enetc: rename "xdp" and "dev" in enetc_setup_bpf() 



Follow the convention from this driver, which is to name "struct
net_device *" as "ndev", and the convention from other drivers, to name
"struct netdev_bpf *" as "bpf".

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 5093406c

drivers/net/ethernet/freescale/enetc/enetc.c

+8 −8
Original line number Diff line number Diff line
@@ -2586,10 +2586,10 @@ int enetc_setup_tc_mqprio(struct net_device *ndev, void *type_data) 
	return 0;

}



static int enetc_setup_xdp_prog(struct net_device *dev, struct bpf_prog *prog,

static int enetc_setup_xdp_prog(struct net_device *ndev, struct bpf_prog *prog,

				struct netlink_ext_ack *extack)

{

	struct enetc_ndev_priv *priv = netdev_priv(dev);

	struct enetc_ndev_priv *priv = netdev_priv(ndev);

	struct bpf_prog *old_prog;

	bool is_up;

	int i;
@@ -2597,9 +2597,9 @@ static int enetc_setup_xdp_prog(struct net_device *dev, struct bpf_prog *prog, 
	/* The buffer layout is changing, so we need to drain the old

	 * RX buffers and seed new ones.

	 */

	is_up = netif_running(dev);

	is_up = netif_running(ndev);

	if (is_up)

		dev_close(dev);

		dev_close(ndev);



	old_prog = xchg(&priv->xdp_prog, prog);

	if (old_prog)
@@ -2617,16 +2617,16 @@ static int enetc_setup_xdp_prog(struct net_device *dev, struct bpf_prog *prog, 
	}



	if (is_up)

		return dev_open(dev, extack);

		return dev_open(ndev, extack);



	return 0;

}



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

int enetc_setup_bpf(struct net_device *ndev, struct netdev_bpf *bpf)

{

	switch (xdp->command) {

	switch (bpf->command) {

	case XDP_SETUP_PROG:

		return enetc_setup_xdp_prog(dev, xdp->prog, xdp->extack);

		return enetc_setup_xdp_prog(ndev, bpf->prog, bpf->extack);

	default:

		return -EINVAL;

	}

drivers/net/ethernet/freescale/enetc/enetc.h

+1 −1
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ struct net_device_stats *enetc_get_stats(struct net_device *ndev); 
void enetc_set_features(struct net_device *ndev, netdev_features_t features);

int enetc_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd);

int enetc_setup_tc_mqprio(struct net_device *ndev, void *type_data);

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

int enetc_setup_bpf(struct net_device *ndev, struct netdev_bpf *bpf);

int enetc_xdp_xmit(struct net_device *ndev, int num_frames,

		   struct xdp_frame **frames, u32 flags);