diff options
| author | Vladimir Oltean <vladimir.oltean@nxp.com> | 2023-01-18 00:02:32 +0100 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-01-19 05:52:26 +0100 |
| commit | 766338c79b1045866870b795882c4d42c64c9c53 (patch) | |
| tree | bc29d6550c0259ebe794e1ba78191a36cf4436be | |
| parent | net: enetc: implement ring reconfiguration procedure for PTP RX timestamping (diff) | |
| download | linux-766338c79b1045866870b795882c4d42c64c9c53.tar.xz linux-766338c79b1045866870b795882c4d42c64c9c53.zip | |
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: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | drivers/net/ethernet/freescale/enetc/enetc.c | 16 | ||||
| -rw-r--r-- | drivers/net/ethernet/freescale/enetc/enetc.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c index dc54fe7b4e86..ce3319f55573 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc.c +++ b/drivers/net/ethernet/freescale/enetc/enetc.c @@ -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; } diff --git a/drivers/net/ethernet/freescale/enetc/enetc.h b/drivers/net/ethernet/freescale/enetc/enetc.h index fd161a60a797..6a87aa972e1e 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc.h +++ b/drivers/net/ethernet/freescale/enetc/enetc.h @@ -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); |