From: Taehee Yoo <ap420073@gmail.com>
Date: Tue, 2 Jul 2019 15:22:56 +0000 (+0900)
Subject: gtp: remove duplicate code in gtp_dellink()
X-Git-Tag: v5.3-rc1~140^2~22^2~7^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a635037ac1106202118a6cccc83c877caa6e1c9a;p=thirdparty%2Fkernel%2Flinux.git

gtp: remove duplicate code in gtp_dellink()

gtp_encap_disable() in gtp_dellink() is unnecessary because it will be
called by unregister_netdevice().
unregister_netdevice() internally calls gtp_dev_uninit() by ->ndo_uninit().
And gtp_dev_uninit() calls gtp_encap_disable().

Signed-off-by: Taehee Yoo <ap420073@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c
index 5101f8c3c99cb..92ef777a757fe 100644
--- a/drivers/net/gtp.c
+++ b/drivers/net/gtp.c
@@ -694,7 +694,6 @@ static void gtp_dellink(struct net_device *dev, struct list_head *head)
 {
 	struct gtp_dev *gtp = netdev_priv(dev);
 
-	gtp_encap_disable(gtp);
 	gtp_hashtable_free(gtp);
 	list_del_rcu(&gtp->list);
 	unregister_netdevice_queue(dev, head);