sfc: Encapsulate access to netdev_priv()

Once we separate struct efx_nic memory from net_device memory the
existing usage will have to change.
Apart from the new function efx_netdev_priv() accesses have been
changed using:
  sed -i 's/netdev_priv/efx_netdev_priv/'

Signed-off-by: Jonathan Cooper <jonathan.s.cooper@amd.com>
Co-developed-by: Martin Habets <habetsm.xilinx@gmail.com>
Signed-off-by: Martin Habets <habetsm.xilinx@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c
index 186cb28c03bdb847313b755ee92e8eea0c33bcff..a99c3a6b912c8a98e9c7916c306847de38554787 100644 (file)
--- a/drivers/net/ethernet/sfc/ef10.c
+++ b/drivers/net/ethernet/sfc/ef10.c
@@ -3874,7 +3874,7 @@ static int efx_ef10_udp_tnl_set_port(struct net_device *dev,
                                     unsigned int table, unsigned int entry,
                                     struct udp_tunnel_info *ti)
 {
-       struct efx_nic *efx = netdev_priv(dev);
+       struct efx_nic *efx = efx_netdev_priv(dev);
        struct efx_ef10_nic_data *nic_data;
        int efx_tunnel_type, rc;
 
@@ -3934,7 +3934,7 @@ static int efx_ef10_udp_tnl_unset_port(struct net_device *dev,
                                       unsigned int table, unsigned int entry,
                                       struct udp_tunnel_info *ti)
 {
-       struct efx_nic *efx = netdev_priv(dev);
+       struct efx_nic *efx = efx_netdev_priv(dev);
        struct efx_ef10_nic_data *nic_data;
        int rc;
 

diff --git a/drivers/net/ethernet/sfc/ef100.c b/drivers/net/ethernet/sfc/ef100.c
index 3b8f02b59d3159ade497f19f0de4755ca86a5582..96b99966ce25e84cbc52dc4748bb9ca08852729a 100644 (file)
--- a/drivers/net/ethernet/sfc/ef100.c
+++ b/drivers/net/ethernet/sfc/ef100.c
@@ -464,7 +464,7 @@ static int ef100_pci_probe(struct pci_dev *pci_dev,
        net_dev = alloc_etherdev_mq(sizeof(*efx), EFX_MAX_CORE_TX_QUEUES);
        if (!net_dev)
                return -ENOMEM;
-       efx = netdev_priv(net_dev);
+       efx = efx_netdev_priv(net_dev);
        efx->type = (const struct efx_nic_type *)entry->driver_data;
 
        pci_set_drvdata(pci_dev, efx);

diff --git a/drivers/net/ethernet/sfc/ef100_ethtool.c b/drivers/net/ethernet/sfc/ef100_ethtool.c
index 5dba4125d95302f8a8414af57f838c442ff81693..702abbe59b7600551241becfe105f809d0f01df3 100644 (file)
--- a/drivers/net/ethernet/sfc/ef100_ethtool.c
+++ b/drivers/net/ethernet/sfc/ef100_ethtool.c
@@ -26,7 +26,7 @@ ef100_ethtool_get_ringparam(struct net_device *net_dev,
                            struct kernel_ethtool_ringparam *kernel_ring,
                            struct netlink_ext_ack *extack)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
 
        ring->rx_max_pending = EFX_EF100_MAX_DMAQ_SIZE;
        ring->tx_max_pending = EFX_EF100_MAX_DMAQ_SIZE;

diff --git a/drivers/net/ethernet/sfc/ef100_netdev.c b/drivers/net/ethernet/sfc/ef100_netdev.c
index 3bb9a79bad221273ad6412bd35954392e7eee096..e833eaaf61b6318b6c17678af247b23d79f58d34 100644 (file)
--- a/drivers/net/ethernet/sfc/ef100_netdev.c
+++ b/drivers/net/ethernet/sfc/ef100_netdev.c
@@ -79,7 +79,7 @@ static int ef100_remap_bar(struct efx_nic *efx, int max_vis)
  */
 static int ef100_net_stop(struct net_device *net_dev)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
 
        netif_dbg(efx, ifdown, efx->net_dev, "closing on CPU %d\n",
                  raw_smp_processor_id());
@@ -104,7 +104,7 @@ static int ef100_net_stop(struct net_device *net_dev)
 /* Context: process, rtnl_lock() held. */
 static int ef100_net_open(struct net_device *net_dev)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
        unsigned int allocated_vis;
        int rc;
 
@@ -193,7 +193,7 @@ fail:
 static netdev_tx_t ef100_hard_start_xmit(struct sk_buff *skb,
                                         struct net_device *net_dev)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
        struct efx_tx_queue *tx_queue;
        struct efx_channel *channel;
        int rc;
@@ -243,7 +243,7 @@ int ef100_netdev_event(struct notifier_block *this,
        struct efx_nic *efx = container_of(this, struct efx_nic, netdev_notifier);
        struct net_device *net_dev = netdev_notifier_info_to_dev(ptr);
 
-       if (netdev_priv(net_dev) == efx && event == NETDEV_CHANGENAME)
+       if (efx_netdev_priv(net_dev) == efx && event == NETDEV_CHANGENAME)
                ef100_update_name(efx);
 
        return NOTIFY_DONE;

diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index dead69025bf5e537b2756e3e35bed914d7ac4201..f874835e1764c94648e3779670b2c1d7ff40d48c 100644 (file)
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -492,7 +492,7 @@ void efx_get_irq_moderation(struct efx_nic *efx, unsigned int *tx_usecs,
  */
 static int efx_ioctl(struct net_device *net_dev, struct ifreq *ifr, int cmd)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
        struct mii_ioctl_data *data = if_mii(ifr);
 
        if (cmd == SIOCSHWTSTAMP)
@@ -517,7 +517,7 @@ static int efx_ioctl(struct net_device *net_dev, struct ifreq *ifr, int cmd)
 /* Context: process, rtnl_lock() held. */
 int efx_net_open(struct net_device *net_dev)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
        int rc;
 
        netif_dbg(efx, ifup, efx->net_dev, "opening device on CPU %d\n",
@@ -551,7 +551,7 @@ int efx_net_open(struct net_device *net_dev)
  */
 int efx_net_stop(struct net_device *net_dev)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
 
        netif_dbg(efx, ifdown, efx->net_dev, "closing on CPU %d\n",
                  raw_smp_processor_id());
@@ -564,7 +564,7 @@ int efx_net_stop(struct net_device *net_dev)
 
 static int efx_vlan_rx_add_vid(struct net_device *net_dev, __be16 proto, u16 vid)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
 
        if (efx->type->vlan_rx_add_vid)
                return efx->type->vlan_rx_add_vid(efx, proto, vid);
@@ -574,7 +574,7 @@ static int efx_vlan_rx_add_vid(struct net_device *net_dev, __be16 proto, u16 vid
 
 static int efx_vlan_rx_kill_vid(struct net_device *net_dev, __be16 proto, u16 vid)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
 
        if (efx->type->vlan_rx_kill_vid)
                return efx->type->vlan_rx_kill_vid(efx, proto, vid);
@@ -643,7 +643,7 @@ static int efx_xdp_setup_prog(struct efx_nic *efx, struct bpf_prog *prog)
 /* Context: process, rtnl_lock() held. */
 static int efx_xdp(struct net_device *dev, struct netdev_bpf *xdp)
 {
-       struct efx_nic *efx = netdev_priv(dev);
+       struct efx_nic *efx = efx_netdev_priv(dev);
 
        switch (xdp->command) {
        case XDP_SETUP_PROG:
@@ -656,7 +656,7 @@ static int efx_xdp(struct net_device *dev, struct netdev_bpf *xdp)
 static int efx_xdp_xmit(struct net_device *dev, int n, struct xdp_frame **xdpfs,
                        u32 flags)
 {
-       struct efx_nic *efx = netdev_priv(dev);
+       struct efx_nic *efx = efx_netdev_priv(dev);
 
        if (!netif_running(dev))
                return -EINVAL;
@@ -678,7 +678,7 @@ static int efx_netdev_event(struct notifier_block *this,
 
        if ((net_dev->netdev_ops == &efx_netdev_ops) &&
            event == NETDEV_CHANGENAME)
-               efx_update_name(netdev_priv(net_dev));
+               efx_update_name(efx_netdev_priv(net_dev));
 
        return NOTIFY_DONE;
 }
@@ -774,7 +774,7 @@ static void efx_unregister_netdev(struct efx_nic *efx)
        if (!efx->net_dev)
                return;
 
-       if (WARN_ON(netdev_priv(efx->net_dev) != efx))
+       if (WARN_ON(efx_netdev_priv(efx->net_dev) != efx))
                return;
 
        if (efx_dev_registered(efx)) {
@@ -1051,7 +1051,7 @@ static int efx_pci_probe(struct pci_dev *pci_dev,
                                     EFX_MAX_RX_QUEUES);
        if (!net_dev)
                return -ENOMEM;
-       efx = netdev_priv(net_dev);
+       efx = efx_netdev_priv(net_dev);
        efx->type = (const struct efx_nic_type *) entry->driver_data;
        efx->fixed_features |= NETIF_F_HIGHDMA;
 

diff --git a/drivers/net/ethernet/sfc/efx_common.c b/drivers/net/ethernet/sfc/efx_common.c
index de37d415a6f98bbca435e95e79f80f8024c8ffe5..b4a101d0d41df374b14e0cef5f5bd4c27945fa1d 100644 (file)
--- a/drivers/net/ethernet/sfc/efx_common.c
+++ b/drivers/net/ethernet/sfc/efx_common.c
@@ -167,7 +167,7 @@ static void efx_mac_work(struct work_struct *data)
 
 int efx_set_mac_address(struct net_device *net_dev, void *data)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
        struct sockaddr *addr = data;
        u8 *new_addr = addr->sa_data;
        u8 old_addr[6];
@@ -202,7 +202,7 @@ int efx_set_mac_address(struct net_device *net_dev, void *data)
 /* Context: netif_addr_lock held, BHs disabled. */
 void efx_set_rx_mode(struct net_device *net_dev)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
 
        if (efx->port_enabled)
                queue_work(efx->workqueue, &efx->mac_work);
@@ -211,7 +211,7 @@ void efx_set_rx_mode(struct net_device *net_dev)
 
 int efx_set_features(struct net_device *net_dev, netdev_features_t data)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
        int rc;
 
        /* If disabling RX n-tuple filtering, clear existing filters */
@@ -285,7 +285,7 @@ unsigned int efx_xdp_max_mtu(struct efx_nic *efx)
 /* Context: process, rtnl_lock() held. */
 int efx_change_mtu(struct net_device *net_dev, int new_mtu)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
        int rc;
 
        rc = efx_check_disabled(efx);
@@ -600,7 +600,7 @@ void efx_stop_all(struct efx_nic *efx)
 /* Context: process, dev_base_lock or RTNL held, non-blocking. */
 void efx_net_stats(struct net_device *net_dev, struct rtnl_link_stats64 *stats)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
 
        spin_lock_bh(&efx->stats_lock);
        efx_nic_update_stats_atomic(efx, NULL, stats);
@@ -723,7 +723,7 @@ void efx_reset_down(struct efx_nic *efx, enum reset_type method)
 /* Context: netif_tx_lock held, BHs disabled. */
 void efx_watchdog(struct net_device *net_dev, unsigned int txqueue)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
 
        netif_err(efx, tx_err, efx->net_dev,
                  "TX stuck with port_enabled=%d: resetting channels\n",
@@ -1356,7 +1356,7 @@ static bool efx_can_encap_offloads(struct efx_nic *efx, struct sk_buff *skb)
 netdev_features_t efx_features_check(struct sk_buff *skb, struct net_device *dev,
                                     netdev_features_t features)
 {
-       struct efx_nic *efx = netdev_priv(dev);
+       struct efx_nic *efx = efx_netdev_priv(dev);
 
        if (skb->encapsulation) {
                if (features & NETIF_F_GSO_MASK)
@@ -1377,7 +1377,7 @@ netdev_features_t efx_features_check(struct sk_buff *skb, struct net_device *dev
 int efx_get_phys_port_id(struct net_device *net_dev,
                         struct netdev_phys_item_id *ppid)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
 
        if (efx->type->get_phys_port_id)
                return efx->type->get_phys_port_id(efx, ppid);
@@ -1387,7 +1387,7 @@ int efx_get_phys_port_id(struct net_device *net_dev,
 
 int efx_get_phys_port_name(struct net_device *net_dev, char *name, size_t len)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
 
        if (snprintf(name, len, "p%u", efx->port_num) >= len)
                return -EINVAL;

diff --git a/drivers/net/ethernet/sfc/ethtool.c b/drivers/net/ethernet/sfc/ethtool.c
index 48506373721ae8d9380535deddf82481d46e80b0..364323599f7b8229aa82530f8eb30c3d960e361e 100644 (file)
--- a/drivers/net/ethernet/sfc/ethtool.c
+++ b/drivers/net/ethernet/sfc/ethtool.c
@@ -33,7 +33,7 @@
 static int efx_ethtool_phys_id(struct net_device *net_dev,
                               enum ethtool_phys_id_state state)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
        enum efx_led_mode mode = EFX_LED_DEFAULT;
 
        switch (state) {
@@ -55,13 +55,13 @@ static int efx_ethtool_phys_id(struct net_device *net_dev,
 
 static int efx_ethtool_get_regs_len(struct net_device *net_dev)
 {
-       return efx_nic_get_regs_len(netdev_priv(net_dev));
+       return efx_nic_get_regs_len(efx_netdev_priv(net_dev));
 }
 
 static void efx_ethtool_get_regs(struct net_device *net_dev,
                                 struct ethtool_regs *regs, void *buf)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
 
        regs->version = efx->type->revision;
        efx_nic_get_regs(efx, buf);
@@ -101,7 +101,7 @@ static int efx_ethtool_get_coalesce(struct net_device *net_dev,
                                    struct kernel_ethtool_coalesce *kernel_coal,
                                    struct netlink_ext_ack *extack)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
        unsigned int tx_usecs, rx_usecs;
        bool rx_adaptive;
 
@@ -121,7 +121,7 @@ static int efx_ethtool_set_coalesce(struct net_device *net_dev,
                                    struct kernel_ethtool_coalesce *kernel_coal,
                                    struct netlink_ext_ack *extack)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
        struct efx_channel *channel;
        unsigned int tx_usecs, rx_usecs;
        bool adaptive, rx_may_override_tx;
@@ -163,7 +163,7 @@ efx_ethtool_get_ringparam(struct net_device *net_dev,
                          struct kernel_ethtool_ringparam *kernel_ring,
                          struct netlink_ext_ack *extack)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
 
        ring->rx_max_pending = EFX_MAX_DMAQ_SIZE;
        ring->tx_max_pending = EFX_TXQ_MAX_ENT(efx);
@@ -177,7 +177,7 @@ efx_ethtool_set_ringparam(struct net_device *net_dev,
                          struct kernel_ethtool_ringparam *kernel_ring,
                          struct netlink_ext_ack *extack)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
        u32 txq_entries;
 
        if (ring->rx_mini_pending || ring->rx_jumbo_pending ||
@@ -204,7 +204,7 @@ efx_ethtool_set_ringparam(struct net_device *net_dev,
 static void efx_ethtool_get_wol(struct net_device *net_dev,
                                struct ethtool_wolinfo *wol)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
        return efx->type->get_wol(efx, wol);
 }
 
@@ -212,14 +212,14 @@ static void efx_ethtool_get_wol(struct net_device *net_dev,
 static int efx_ethtool_set_wol(struct net_device *net_dev,
                               struct ethtool_wolinfo *wol)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
        return efx->type->set_wol(efx, wol->wolopts);
 }
 
 static void efx_ethtool_get_fec_stats(struct net_device *net_dev,
                                      struct ethtool_fec_stats *fec_stats)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
 
        if (efx->type->get_fec_stats)
                efx->type->get_fec_stats(efx, fec_stats);
@@ -228,7 +228,7 @@ static void efx_ethtool_get_fec_stats(struct net_device *net_dev,
 static int efx_ethtool_get_ts_info(struct net_device *net_dev,
                                   struct ethtool_ts_info *ts_info)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
 
        /* Software capabilities */
        ts_info->so_timestamping = (SOF_TIMESTAMPING_RX_SOFTWARE |

diff --git a/drivers/net/ethernet/sfc/ethtool_common.c b/drivers/net/ethernet/sfc/ethtool_common.c
index 3846b76b89720d07b706bbf2626866a141bb822d..58ad9d6658059be3768f46f7e2ee49a35af32c3b 100644 (file)
--- a/drivers/net/ethernet/sfc/ethtool_common.c
+++ b/drivers/net/ethernet/sfc/ethtool_common.c
@@ -103,7 +103,7 @@ static const struct efx_sw_stat_desc efx_sw_stat_desc[] = {
 void efx_ethtool_get_drvinfo(struct net_device *net_dev,
                             struct ethtool_drvinfo *info)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
 
        strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
        efx_mcdi_print_fwver(efx, info->fw_version,
@@ -113,14 +113,14 @@ void efx_ethtool_get_drvinfo(struct net_device *net_dev,
 
 u32 efx_ethtool_get_msglevel(struct net_device *net_dev)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
 
        return efx->msg_enable;
 }
 
 void efx_ethtool_set_msglevel(struct net_device *net_dev, u32 msg_enable)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
 
        efx->msg_enable = msg_enable;
 }
@@ -128,7 +128,7 @@ void efx_ethtool_set_msglevel(struct net_device *net_dev, u32 msg_enable)
 void efx_ethtool_self_test(struct net_device *net_dev,
                           struct ethtool_test *test, u64 *data)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
        struct efx_self_tests *efx_tests;
        bool already_up;
        int rc = -ENOMEM;
@@ -176,7 +176,7 @@ fail:
 void efx_ethtool_get_pauseparam(struct net_device *net_dev,
                                struct ethtool_pauseparam *pause)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
 
        pause->rx_pause = !!(efx->wanted_fc & EFX_FC_RX);
        pause->tx_pause = !!(efx->wanted_fc & EFX_FC_TX);
@@ -186,7 +186,7 @@ void efx_ethtool_get_pauseparam(struct net_device *net_dev,
 int efx_ethtool_set_pauseparam(struct net_device *net_dev,
                               struct ethtool_pauseparam *pause)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
        u8 wanted_fc, old_fc;
        u32 old_adv;
        int rc = 0;
@@ -441,7 +441,7 @@ static size_t efx_describe_per_queue_stats(struct efx_nic *efx, u8 *strings)
 
 int efx_ethtool_get_sset_count(struct net_device *net_dev, int string_set)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
 
        switch (string_set) {
        case ETH_SS_STATS:
@@ -459,7 +459,7 @@ int efx_ethtool_get_sset_count(struct net_device *net_dev, int string_set)
 void efx_ethtool_get_strings(struct net_device *net_dev,
                             u32 string_set, u8 *strings)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
        int i;
 
        switch (string_set) {
@@ -487,7 +487,7 @@ void efx_ethtool_get_stats(struct net_device *net_dev,
                           struct ethtool_stats *stats,
                           u64 *data)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
        const struct efx_sw_stat_desc *stat;
        struct efx_channel *channel;
        struct efx_tx_queue *tx_queue;
@@ -561,7 +561,7 @@ void efx_ethtool_get_stats(struct net_device *net_dev,
 int efx_ethtool_get_link_ksettings(struct net_device *net_dev,
                                   struct ethtool_link_ksettings *cmd)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
        struct efx_link_state *link_state = &efx->link_state;
 
        mutex_lock(&efx->mac_lock);
@@ -584,7 +584,7 @@ int efx_ethtool_get_link_ksettings(struct net_device *net_dev,
 int efx_ethtool_set_link_ksettings(struct net_device *net_dev,
                                   const struct ethtool_link_ksettings *cmd)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
        int rc;
 
        /* GMAC does not support 1000Mbps HD */
@@ -604,7 +604,7 @@ int efx_ethtool_set_link_ksettings(struct net_device *net_dev,
 int efx_ethtool_get_fecparam(struct net_device *net_dev,
                             struct ethtool_fecparam *fecparam)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
        int rc;
 
        mutex_lock(&efx->mac_lock);
@@ -617,7 +617,7 @@ int efx_ethtool_get_fecparam(struct net_device *net_dev,
 int efx_ethtool_set_fecparam(struct net_device *net_dev,
                             struct ethtool_fecparam *fecparam)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
        int rc;
 
        mutex_lock(&efx->mac_lock);
@@ -809,7 +809,7 @@ static int efx_ethtool_get_class_rule(struct efx_nic *efx,
 int efx_ethtool_get_rxnfc(struct net_device *net_dev,
                          struct ethtool_rxnfc *info, u32 *rule_locs)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
        u32 rss_context = 0;
        s32 rc = 0;
 
@@ -1127,7 +1127,7 @@ static int efx_ethtool_set_class_rule(struct efx_nic *efx,
 int efx_ethtool_set_rxnfc(struct net_device *net_dev,
                          struct ethtool_rxnfc *info)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
 
        if (efx_filter_get_rx_id_limit(efx) == 0)
                return -EOPNOTSUPP;
@@ -1148,7 +1148,7 @@ int efx_ethtool_set_rxnfc(struct net_device *net_dev,
 
 u32 efx_ethtool_get_rxfh_indir_size(struct net_device *net_dev)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
 
        if (efx->n_rx_channels == 1)
                return 0;
@@ -1157,7 +1157,7 @@ u32 efx_ethtool_get_rxfh_indir_size(struct net_device *net_dev)
 
 u32 efx_ethtool_get_rxfh_key_size(struct net_device *net_dev)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
 
        return efx->type->rx_hash_key_size;
 }
@@ -1165,7 +1165,7 @@ u32 efx_ethtool_get_rxfh_key_size(struct net_device *net_dev)
 int efx_ethtool_get_rxfh(struct net_device *net_dev, u32 *indir, u8 *key,
                         u8 *hfunc)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
        int rc;
 
        rc = efx->type->rx_pull_rss_config(efx);
@@ -1186,7 +1186,7 @@ int efx_ethtool_get_rxfh(struct net_device *net_dev, u32 *indir, u8 *key,
 int efx_ethtool_set_rxfh(struct net_device *net_dev, const u32 *indir,
                         const u8 *key, const u8 hfunc)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
 
        /* Hash function is Toeplitz, cannot be changed */
        if (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != ETH_RSS_HASH_TOP)
@@ -1205,7 +1205,7 @@ int efx_ethtool_set_rxfh(struct net_device *net_dev, const u32 *indir,
 int efx_ethtool_get_rxfh_context(struct net_device *net_dev, u32 *indir,
                                 u8 *key, u8 *hfunc, u32 rss_context)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
        struct efx_rss_context *ctx;
        int rc = 0;
 
@@ -1238,7 +1238,7 @@ int efx_ethtool_set_rxfh_context(struct net_device *net_dev,
                                 const u8 hfunc, u32 *rss_context,
                                 bool delete)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
        struct efx_rss_context *ctx;
        bool allocated = false;
        int rc;
@@ -1300,7 +1300,7 @@ out_unlock:
 
 int efx_ethtool_reset(struct net_device *net_dev, u32 *flags)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
        int rc;
 
        rc = efx->type->map_reset_flags(flags);
@@ -1314,7 +1314,7 @@ int efx_ethtool_get_module_eeprom(struct net_device *net_dev,
                                  struct ethtool_eeprom *ee,
                                  u8 *data)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
        int ret;
 
        mutex_lock(&efx->mac_lock);
@@ -1327,7 +1327,7 @@ int efx_ethtool_get_module_eeprom(struct net_device *net_dev,
 int efx_ethtool_get_module_info(struct net_device *net_dev,
                                struct ethtool_modinfo *modinfo)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
        int ret;
 
        mutex_lock(&efx->mac_lock);

diff --git a/drivers/net/ethernet/sfc/mcdi_port.c b/drivers/net/ethernet/sfc/mcdi_port.c
index 94c6a345c0b1453fdff18c50604e25609ca8a4f7..ad4694fa3ddae6b02d9f3a4d8d77f8f42f0e5d01 100644 (file)
--- a/drivers/net/ethernet/sfc/mcdi_port.c
+++ b/drivers/net/ethernet/sfc/mcdi_port.c
@@ -20,7 +20,7 @@
 static int efx_mcdi_mdio_read(struct net_device *net_dev,
                              int prtad, int devad, u16 addr)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
        MCDI_DECLARE_BUF(inbuf, MC_CMD_MDIO_READ_IN_LEN);
        MCDI_DECLARE_BUF(outbuf, MC_CMD_MDIO_READ_OUT_LEN);
        size_t outlen;
@@ -46,7 +46,7 @@ static int efx_mcdi_mdio_read(struct net_device *net_dev,
 static int efx_mcdi_mdio_write(struct net_device *net_dev,
                               int prtad, int devad, u16 addr, u16 value)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
        MCDI_DECLARE_BUF(inbuf, MC_CMD_MDIO_WRITE_IN_LEN);
        MCDI_DECLARE_BUF(outbuf, MC_CMD_MDIO_WRITE_OUT_LEN);
        size_t outlen;

diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h
index 546552d5d86f88e667f1e6e2391250c5d08b56d9..df93ffd7092a397871ea83f8d1f0c926480a0d6e 100644 (file)
--- a/drivers/net/ethernet/sfc/net_driver.h
+++ b/drivers/net/ethernet/sfc/net_driver.h
@@ -1166,6 +1166,11 @@ struct efx_nic {
        atomic_t n_rx_noskb_drops;
 };
 
+static inline struct efx_nic *efx_netdev_priv(struct net_device *dev)
+{
+       return netdev_priv(dev);
+}
+
 static inline int efx_dev_registered(struct efx_nic *efx)
 {
        return efx->net_dev->reg_state == NETREG_REGISTERED;

diff --git a/drivers/net/ethernet/sfc/rx_common.c b/drivers/net/ethernet/sfc/rx_common.c
index fa8b9aacca112169f20ef409d83b60602da28a3e..bd21d6ac778a9d1ca462487004d52efc033cfb4c 100644 (file)
--- a/drivers/net/ethernet/sfc/rx_common.c
+++ b/drivers/net/ethernet/sfc/rx_common.c
@@ -857,7 +857,7 @@ static void efx_filter_rfs_work(struct work_struct *data)
 {
        struct efx_async_filter_insertion *req = container_of(data, struct efx_async_filter_insertion,
                                                              work);
-       struct efx_nic *efx = netdev_priv(req->net_dev);
+       struct efx_nic *efx = efx_netdev_priv(req->net_dev);
        struct efx_channel *channel = efx_get_channel(efx, req->rxq_index);
        int slot_idx = req - efx->rps_slot;
        struct efx_arfs_rule *rule;
@@ -942,7 +942,7 @@ static void efx_filter_rfs_work(struct work_struct *data)
 int efx_filter_rfs(struct net_device *net_dev, const struct sk_buff *skb,
                   u16 rxq_index, u32 flow_id)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
        struct efx_async_filter_insertion *req;
        struct efx_arfs_rule *rule;
        struct flow_keys fk;

diff --git a/drivers/net/ethernet/sfc/sriov.c b/drivers/net/ethernet/sfc/sriov.c
index 3f241e6c881ae126cd8b8bacc052d97e334750e2..fc9f0189f285b8a532d1d525c6fa8c150665b772 100644 (file)
--- a/drivers/net/ethernet/sfc/sriov.c
+++ b/drivers/net/ethernet/sfc/sriov.c
@@ -10,7 +10,7 @@
 
 int efx_sriov_set_vf_mac(struct net_device *net_dev, int vf_i, u8 *mac)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
 
        if (efx->type->sriov_set_vf_mac)
                return efx->type->sriov_set_vf_mac(efx, vf_i, mac);
@@ -21,7 +21,7 @@ int efx_sriov_set_vf_mac(struct net_device *net_dev, int vf_i, u8 *mac)
 int efx_sriov_set_vf_vlan(struct net_device *net_dev, int vf_i, u16 vlan,
                          u8 qos, __be16 vlan_proto)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
 
        if (efx->type->sriov_set_vf_vlan) {
                if ((vlan & ~VLAN_VID_MASK) ||
@@ -40,7 +40,7 @@ int efx_sriov_set_vf_vlan(struct net_device *net_dev, int vf_i, u16 vlan,
 int efx_sriov_set_vf_spoofchk(struct net_device *net_dev, int vf_i,
                              bool spoofchk)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
 
        if (efx->type->sriov_set_vf_spoofchk)
                return efx->type->sriov_set_vf_spoofchk(efx, vf_i, spoofchk);
@@ -51,7 +51,7 @@ int efx_sriov_set_vf_spoofchk(struct net_device *net_dev, int vf_i,
 int efx_sriov_get_vf_config(struct net_device *net_dev, int vf_i,
                            struct ifla_vf_info *ivi)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
 
        if (efx->type->sriov_get_vf_config)
                return efx->type->sriov_get_vf_config(efx, vf_i, ivi);
@@ -62,7 +62,7 @@ int efx_sriov_get_vf_config(struct net_device *net_dev, int vf_i,
 int efx_sriov_set_vf_link_state(struct net_device *net_dev, int vf_i,
                                int link_state)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
 
        if (efx->type->sriov_set_vf_link_state)
                return efx->type->sriov_set_vf_link_state(efx, vf_i,

diff --git a/drivers/net/ethernet/sfc/tx.c b/drivers/net/ethernet/sfc/tx.c
index 138bca611341507413cb816d94fe51a269098ac5..79cc0bb763216290a14edd6ebad72e1d349790a4 100644 (file)
--- a/drivers/net/ethernet/sfc/tx.c
+++ b/drivers/net/ethernet/sfc/tx.c
@@ -512,7 +512,7 @@ unlock:
 netdev_tx_t efx_hard_start_xmit(struct sk_buff *skb,
                                struct net_device *net_dev)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
        struct efx_tx_queue *tx_queue;
        unsigned index, type;
 
@@ -609,7 +609,7 @@ void efx_init_tx_queue_core_txq(struct efx_tx_queue *tx_queue)
 int efx_setup_tc(struct net_device *net_dev, enum tc_setup_type type,
                 void *type_data)
 {
-       struct efx_nic *efx = netdev_priv(net_dev);
+       struct efx_nic *efx = efx_netdev_priv(net_dev);
        struct tc_mqprio_qopt *mqprio = type_data;
        unsigned tc, num_tc;