From: Heiner Kallweit <hkallweit1@gmail.com>
To: Jakub Kicinski <kuba@kernel.org>,
David Miller <davem@davemloft.net>,
Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>,
Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>,
Andrew Lunn <andrew@lunn.ch>,
Vivien Didelot <vivien.didelot@gmail.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Vladimir Oltean <olteanv@gmail.com>,
Russell King <linux@armlinux.org.uk>,
Pablo Neira Ayuso <pablo@netfilter.org>,
Harald Welte <laforge@gnumonks.org>,
"Jason A. Donenfeld" <Jason@zx2c4.com>,
Herbert Xu <herbert@gondor.apana.org.au>
Cc: "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
osmocom-net-gprs@lists.osmocom.org, wireguard@lists.zx2c4.com,
Steffen Klassert <steffen.klassert@secunet.com>
Subject: [PATCH net-next v3 10/10] net: remove ip_tunnel_get_stats64
Date: Sat, 7 Nov 2020 21:55:11 +0100 [thread overview]
Message-ID: <1d5992f4-6d88-1bef-9756-06d48fc10a31@gmail.com> (raw)
In-Reply-To: <99273e2f-c218-cd19-916e-9161d8ad8c56@gmail.com>
After having migrated all users remove ip_tunnel_get_stats64().
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
include/net/ip_tunnels.h | 2 --
net/ipv4/ip_tunnel_core.c | 9 ---------
2 files changed, 11 deletions(-)
diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h
index 02ccd3254..1b7905eb7 100644
--- a/include/net/ip_tunnels.h
+++ b/include/net/ip_tunnels.h
@@ -274,8 +274,6 @@ int ip_tunnel_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
int __ip_tunnel_change_mtu(struct net_device *dev, int new_mtu, bool strict);
int ip_tunnel_change_mtu(struct net_device *dev, int new_mtu);
-void ip_tunnel_get_stats64(struct net_device *dev,
- struct rtnl_link_stats64 *tot);
struct ip_tunnel *ip_tunnel_lookup(struct ip_tunnel_net *itn,
int link, __be16 flags,
__be32 remote, __be32 local,
diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c
index 25f1caf5a..923a9fa2e 100644
--- a/net/ipv4/ip_tunnel_core.c
+++ b/net/ipv4/ip_tunnel_core.c
@@ -429,15 +429,6 @@ int skb_tunnel_check_pmtu(struct sk_buff *skb, struct dst_entry *encap_dst,
}
EXPORT_SYMBOL(skb_tunnel_check_pmtu);
-/* Often modified stats are per cpu, other are shared (netdev->stats) */
-void ip_tunnel_get_stats64(struct net_device *dev,
- struct rtnl_link_stats64 *tot)
-{
- netdev_stats_to_stats64(tot, &dev->stats);
- dev_fetch_sw_netstats(tot, dev->tstats);
-}
-EXPORT_SYMBOL_GPL(ip_tunnel_get_stats64);
-
static const struct nla_policy ip_tun_policy[LWTUNNEL_IP_MAX + 1] = {
[LWTUNNEL_IP_UNSPEC] = { .strict_start_type = LWTUNNEL_IP_OPTS },
[LWTUNNEL_IP_ID] = { .type = NLA_U64 },
--
2.29.2
next prev parent reply other threads:[~2020-11-09 23:18 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-07 20:48 [PATCH net-next v3 00/10] net: add and use dev_get_tstats64 Heiner Kallweit
2020-11-07 20:49 ` [PATCH net-next v3 01/10] net: core: add dev_get_tstats64 as a ndo_get_stats64 implementation Heiner Kallweit
2020-11-07 20:49 ` [PATCH net-next v3 02/10] net: dsa: use net core stats64 handling Heiner Kallweit
2020-11-07 20:50 ` [PATCH net-next v3 03/10] tun: switch to net core provided statistics counters Heiner Kallweit
2020-11-07 20:51 ` [PATCH net-next v3 04/10] ip6_tunnel: use ip_tunnel_get_stats64 as ndo_get_stats64 callback Heiner Kallweit
2020-11-07 20:52 ` [PATCH net-next v3 05/10] net: switch to dev_get_tstats64 Heiner Kallweit
2020-11-07 20:52 ` [PATCH net-next v3 06/10] gtp: " Heiner Kallweit
2020-11-07 20:53 ` [PATCH net-next v3 07/10] wireguard: " Heiner Kallweit
2020-11-07 20:53 ` [PATCH net-next v3 08/10] vti: " Heiner Kallweit
2020-11-07 20:54 ` [PATCH net-next v3 09/10] ipv4/ipv6: " Heiner Kallweit
2020-11-07 20:55 ` Heiner Kallweit [this message]
2020-11-10 3:58 ` [PATCH net-next v3 00/10] net: add and use dev_get_tstats64 Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1d5992f4-6d88-1bef-9756-06d48fc10a31@gmail.com \
--to=hkallweit1@gmail.com \
--cc=Jason@zx2c4.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=herbert@gondor.apana.org.au \
--cc=kuba@kernel.org \
--cc=kuznet@ms2.inr.ac.ru \
--cc=laforge@gnumonks.org \
--cc=linux@armlinux.org.uk \
--cc=netdev@vger.kernel.org \
--cc=olteanv@gmail.com \
--cc=osmocom-net-gprs@lists.osmocom.org \
--cc=pablo@netfilter.org \
--cc=steffen.klassert@secunet.com \
--cc=vivien.didelot@gmail.com \
--cc=wireguard@lists.zx2c4.com \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).