Commit 81154bb8 authored by Breno Leitao's avatar Breno Leitao Committed by Jakub Kicinski

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: default avatarBreno Leitao <leitao@debian.org>
Acked-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Link: https://lore.kernel.org/r/20240305121524.2254533-3-leitao@debian.orgSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 13957a0b
...@@ -711,15 +711,6 @@ static int gtp_encap_recv(struct sock *sk, struct sk_buff *skb) ...@@ -711,15 +711,6 @@ static int gtp_encap_recv(struct sock *sk, struct sk_buff *skb)
return ret; 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) static void gtp_dev_uninit(struct net_device *dev)
{ {
struct gtp_dev *gtp = netdev_priv(dev); struct gtp_dev *gtp = netdev_priv(dev);
...@@ -937,7 +928,6 @@ static netdev_tx_t gtp_dev_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -937,7 +928,6 @@ static netdev_tx_t gtp_dev_xmit(struct sk_buff *skb, struct net_device *dev)
} }
static const struct net_device_ops gtp_netdev_ops = { static const struct net_device_ops gtp_netdev_ops = {
.ndo_init = gtp_dev_init,
.ndo_uninit = gtp_dev_uninit, .ndo_uninit = gtp_dev_uninit,
.ndo_start_xmit = gtp_dev_xmit, .ndo_start_xmit = gtp_dev_xmit,
}; };
...@@ -951,6 +941,7 @@ static void gtp_link_setup(struct net_device *dev) ...@@ -951,6 +941,7 @@ static void gtp_link_setup(struct net_device *dev)
unsigned int max_gtp_header_len = sizeof(struct iphdr) + unsigned int max_gtp_header_len = sizeof(struct iphdr) +
sizeof(struct udphdr) + sizeof(struct udphdr) +
sizeof(struct gtp0_header); sizeof(struct gtp0_header);
struct gtp_dev *gtp = netdev_priv(dev);
dev->netdev_ops = &gtp_netdev_ops; dev->netdev_ops = &gtp_netdev_ops;
dev->needs_free_netdev = true; dev->needs_free_netdev = true;
...@@ -970,6 +961,7 @@ static void gtp_link_setup(struct net_device *dev) ...@@ -970,6 +961,7 @@ static void gtp_link_setup(struct net_device *dev)
netif_keep_dst(dev); netif_keep_dst(dev);
dev->needed_headroom = LL_MAX_HEADER + max_gtp_header_len; dev->needed_headroom = LL_MAX_HEADER + max_gtp_header_len;
gtp->dev = dev;
} }
static int gtp_hashtable_new(struct gtp_dev *gtp, int hsize); static int gtp_hashtable_new(struct gtp_dev *gtp, int hsize);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment