]> www.infradead.org Git - users/hch/configfs.git/commitdiff
wifi: mac80211: Remove generic .ndo_get_stats64
authorBreno Leitao <leitao@debian.org>
Fri, 7 Jun 2024 10:20:44 +0000 (03:20 -0700)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 12 Jun 2024 11:04:24 +0000 (13:04 +0200)
Commit 3e2f544dd8a33 ("net: get stats64 if device if driver is
configured") moved the callback to dev_get_tstats64() to net core, so,
unless the driver is doing some custom stats collection, it does not
need to set .ndo_get_stats64.

Since this driver is now relying in NETDEV_PCPU_STAT_TSTATS, then, it
doesn't need to set the dev_get_tstats64() generic .ndo_get_stats64
function pointer.

In this driver specifically, .ndo_get_stats64 basically points to
dev_fetch_sw_netstats(). Now it will point to dev_get_tstats64(), which
calls netdev_stats_to_stats64() and dev_fetch_sw_netstats().
netdev_stats_to_stats64() seems irrelevant for this driver.

Signed-off-by: Breno Leitao <leitao@debian.org>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://msgid.link/20240607102045.235071-2-leitao@debian.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/iface.c

index ac4d4df652980a43153f0ec3a6670e9bb62fc073..6b7580c61e0c3abad6b2d1d324dbfaaac0ddf2fb 100644 (file)
@@ -815,12 +815,6 @@ static void ieee80211_uninit(struct net_device *dev)
        ieee80211_teardown_sdata(IEEE80211_DEV_TO_SUB_IF(dev));
 }
 
-static void
-ieee80211_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
-{
-       dev_fetch_sw_netstats(stats, dev->tstats);
-}
-
 static int ieee80211_netdev_setup_tc(struct net_device *dev,
                                     enum tc_setup_type type, void *type_data)
 {
@@ -837,7 +831,6 @@ static const struct net_device_ops ieee80211_dataif_ops = {
        .ndo_start_xmit         = ieee80211_subif_start_xmit,
        .ndo_set_rx_mode        = ieee80211_set_multicast_list,
        .ndo_set_mac_address    = ieee80211_change_mac,
-       .ndo_get_stats64        = ieee80211_get_stats64,
        .ndo_setup_tc           = ieee80211_netdev_setup_tc,
 };
 
@@ -877,7 +870,6 @@ static const struct net_device_ops ieee80211_monitorif_ops = {
        .ndo_set_rx_mode        = ieee80211_set_multicast_list,
        .ndo_set_mac_address    = ieee80211_change_mac,
        .ndo_select_queue       = ieee80211_monitor_select_queue,
-       .ndo_get_stats64        = ieee80211_get_stats64,
 };
 
 static int ieee80211_netdev_fill_forward_path(struct net_device_path_ctx *ctx,
@@ -945,7 +937,6 @@ static const struct net_device_ops ieee80211_dataif_8023_ops = {
        .ndo_start_xmit         = ieee80211_subif_start_xmit_8023,
        .ndo_set_rx_mode        = ieee80211_set_multicast_list,
        .ndo_set_mac_address    = ieee80211_change_mac,
-       .ndo_get_stats64        = ieee80211_get_stats64,
        .ndo_fill_forward_path  = ieee80211_netdev_fill_forward_path,
        .ndo_setup_tc           = ieee80211_netdev_setup_tc,
 };