net: gtp: Move net_device assigned in setup

Assign netdev to gtp->dev at setup time, so, we can get rid of
gtp_dev_init() completely.

Signed-off-by: Breno Leitao <leitao@debian.org>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Link: https://lore.kernel.org/r/20240305121524.2254533-3-leitao@debian.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c
index a279f0cd1b4d1c6ef2e77142ac14417ac1f475a4..ba4704c2c640b860c55655607f8dd5cc044cfa3e 100644 (file)
--- a/drivers/net/gtp.c
+++ b/drivers/net/gtp.c
@@ -711,15 +711,6 @@ static int gtp_encap_recv(struct sock *sk, struct sk_buff *skb)
        return ret;
 }
 
-static int gtp_dev_init(struct net_device *dev)
-{
-       struct gtp_dev *gtp = netdev_priv(dev);
-
-       gtp->dev = dev;
-
-       return 0;
-}
-
 static void gtp_dev_uninit(struct net_device *dev)
 {
        struct gtp_dev *gtp = netdev_priv(dev);
@@ -937,7 +928,6 @@ tx_err:
 }
 
 static const struct net_device_ops gtp_netdev_ops = {
-       .ndo_init               = gtp_dev_init,
        .ndo_uninit             = gtp_dev_uninit,
        .ndo_start_xmit         = gtp_dev_xmit,
 };
@@ -951,6 +941,7 @@ static void gtp_link_setup(struct net_device *dev)
        unsigned int max_gtp_header_len = sizeof(struct iphdr) +
                                          sizeof(struct udphdr) +
                                          sizeof(struct gtp0_header);
+       struct gtp_dev *gtp = netdev_priv(dev);
 
        dev->netdev_ops         = &gtp_netdev_ops;
        dev->needs_free_netdev  = true;
@@ -970,6 +961,7 @@ static void gtp_link_setup(struct net_device *dev)
        netif_keep_dst(dev);
 
        dev->needed_headroom    = LL_MAX_HEADER + max_gtp_header_len;
+       gtp->dev = dev;
 }
 
 static int gtp_hashtable_new(struct gtp_dev *gtp, int hsize);