[Devel] [PATCH RH8] Revert "venet: add venet_free_stat callback"
Vasily Averin
vvs at virtuozzo.com
Tue Jun 1 10:54:28 MSK 2021
This reverts (vz6?) commit 4275964f99a30bfaad72a1e8c97a800655f45769.
We don't have closed source modules long ago,
so don't need venet_free_stat() callback.
Fixes: vz8: 0a8795c36f83 ("drivers/net/ve: venet network device introduced")
https://jira.sw.ru/browse/PSBM-69078
Signed-off-by: Konstantin Khorenko <khorenko at virtuozzo.com>
(cherry picked from vz7 commit 46f1803c0be6df662b4449e5df6c330e80f3bac9)
Signed-off-by: Vasily Averin <vvs at virtuozzo.com>
---
drivers/net/venetdev.c | 6 ------
include/linux/venet.h | 2 --
2 files changed, 8 deletions(-)
diff --git a/drivers/net/venetdev.c b/drivers/net/venetdev.c
index 2849f84545bf..4c5e3cb180e7 100644
--- a/drivers/net/venetdev.c
+++ b/drivers/net/venetdev.c
@@ -420,16 +420,10 @@ static int venet_close(struct net_device *master)
return 0;
}
-void (*venet_free_stat)(struct ve_struct *) = NULL;
-EXPORT_SYMBOL(venet_free_stat);
-
static void venet_destructor(struct net_device *dev)
{
struct venet_stats *stats = (struct venet_stats *)dev->ml_priv;
- if (venet_free_stat)
- venet_free_stat(dev_net(dev)->owner_ve);
-
free_percpu(stats->real_stats);
kfree(stats);
}
diff --git a/include/linux/venet.h b/include/linux/venet.h
index fe8197c920ed..651ce8f815ff 100644
--- a/include/linux/venet.h
+++ b/include/linux/venet.h
@@ -89,8 +89,6 @@ struct ext_entry_struct *venet_ext_lookup(struct ve_struct *ve,
extern struct hlist_head ip_entry_hash_table[];
extern spinlock_t veip_lock;
-extern void (*venet_free_stat)(struct ve_struct *);
-
#define NIPQUAD(addr) \
((unsigned char *)&addr)[0], \
((unsigned char *)&addr)[1], \
--
2.25.1
More information about the Devel
mailing list