From 614b7a1f28f401332736235a7d2d17ceda16945c Mon Sep 17 00:00:00 2001 From: Guillaume Nault Date: Fri, 10 Dec 2021 20:56:36 +0100 Subject: [PATCH 1/2] bareudp: Remove bareudp_dev_create() There's no user for this function. Signed-off-by: Guillaume Nault Signed-off-by: David S. Miller --- drivers/net/bareudp.c | 34 ---------------------------------- include/net/bareudp.h | 4 ---- 2 files changed, 38 deletions(-) diff --git a/drivers/net/bareudp.c b/drivers/net/bareudp.c index edffc3489a12..fb71a0753385 100644 --- a/drivers/net/bareudp.c +++ b/drivers/net/bareudp.c @@ -721,40 +721,6 @@ static struct rtnl_link_ops bareudp_link_ops __read_mostly = { .fill_info = bareudp_fill_info, }; -struct net_device *bareudp_dev_create(struct net *net, const char *name, - u8 name_assign_type, - struct bareudp_conf *conf) -{ - struct nlattr *tb[IFLA_MAX + 1]; - struct net_device *dev; - int err; - - memset(tb, 0, sizeof(tb)); - dev = rtnl_create_link(net, name, name_assign_type, - &bareudp_link_ops, tb, NULL); - if (IS_ERR(dev)) - return dev; - - err = bareudp_configure(net, dev, conf); - if (err) { - free_netdev(dev); - return ERR_PTR(err); - } - err = dev_set_mtu(dev, IP_MAX_MTU - BAREUDP_BASE_HLEN); - if (err) - goto err; - - err = rtnl_configure_link(dev, NULL); - if (err < 0) - goto err; - - return dev; -err: - bareudp_dellink(dev, NULL); - return ERR_PTR(err); -} -EXPORT_SYMBOL_GPL(bareudp_dev_create); - static __net_init int bareudp_init_net(struct net *net) { struct bareudp_net *bn = net_generic(net, bareudp_net_id); diff --git a/include/net/bareudp.h b/include/net/bareudp.h index dc65a0d71d9b..8f07a91e0f25 100644 --- a/include/net/bareudp.h +++ b/include/net/bareudp.h @@ -14,10 +14,6 @@ struct bareudp_conf { bool multi_proto_mode; }; -struct net_device *bareudp_dev_create(struct net *net, const char *name, - u8 name_assign_type, - struct bareudp_conf *info); - static inline bool netif_is_bareudp(const struct net_device *dev) { return dev->rtnl_link_ops && From dcdd77ee55a70b6ddfcfbe8e6bbf6d002994644c Mon Sep 17 00:00:00 2001 From: Guillaume Nault Date: Fri, 10 Dec 2021 20:56:39 +0100 Subject: [PATCH 2/2] bareudp: Move definition of struct bareudp_conf to bareudp.c This structure is used only in bareudp.c. While there, adjust include files: we need netdevice.h, not skbuff.h. Signed-off-by: Guillaume Nault Signed-off-by: David S. Miller --- drivers/net/bareudp.c | 7 +++++++ include/net/bareudp.h | 9 +-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/bareudp.c b/drivers/net/bareudp.c index fb71a0753385..f80330361399 100644 --- a/drivers/net/bareudp.c +++ b/drivers/net/bareudp.c @@ -38,6 +38,13 @@ struct bareudp_net { struct list_head bareudp_list; }; +struct bareudp_conf { + __be16 ethertype; + __be16 port; + u16 sport_min; + bool multi_proto_mode; +}; + /* Pseudo network device */ struct bareudp_dev { struct net *net; /* netns for packet i/o */ diff --git a/include/net/bareudp.h b/include/net/bareudp.h index 8f07a91e0f25..17610c8d6361 100644 --- a/include/net/bareudp.h +++ b/include/net/bareudp.h @@ -3,17 +3,10 @@ #ifndef __NET_BAREUDP_H #define __NET_BAREUDP_H +#include #include -#include #include -struct bareudp_conf { - __be16 ethertype; - __be16 port; - u16 sport_min; - bool multi_proto_mode; -}; - static inline bool netif_is_bareudp(const struct net_device *dev) { return dev->rtnl_link_ops &&