mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
batman-adv: Drop implicit creation of batadv net_devices
The sysfs code in batman-adv was could create a new batadv interfaces on demand when a string (interface name) was written to the batman-adv/mesh_iface file. But the code no longer exists in the current batman-adv codebase. The helper code to implement this behavior must be considered as unused and can be dropped. Signed-off-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
This commit is contained in:
parent
791ad7f5c1
commit
bf6b260b8a
|
@ -725,17 +725,9 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,
|
|||
kref_get(&hard_iface->refcount);
|
||||
|
||||
soft_iface = dev_get_by_name(net, iface_name);
|
||||
|
||||
if (!soft_iface) {
|
||||
soft_iface = batadv_softif_create(net, iface_name);
|
||||
|
||||
if (!soft_iface) {
|
||||
ret = -ENOMEM;
|
||||
goto err;
|
||||
}
|
||||
|
||||
/* dev_get_by_name() increases the reference counter for us */
|
||||
dev_hold(soft_iface);
|
||||
ret = -EINVAL;
|
||||
goto err;
|
||||
}
|
||||
|
||||
if (!batadv_softif_is_valid(soft_iface)) {
|
||||
|
|
|
@ -26,7 +26,6 @@
|
|||
#include <linux/netdevice.h>
|
||||
#include <linux/netlink.h>
|
||||
#include <linux/percpu.h>
|
||||
#include <linux/printk.h>
|
||||
#include <linux/random.h>
|
||||
#include <linux/rculist.h>
|
||||
#include <linux/rcupdate.h>
|
||||
|
@ -37,6 +36,7 @@
|
|||
#include <linux/stddef.h>
|
||||
#include <linux/string.h>
|
||||
#include <linux/types.h>
|
||||
#include <net/net_namespace.h>
|
||||
#include <net/netlink.h>
|
||||
#include <uapi/linux/batadv_packet.h>
|
||||
#include <uapi/linux/batman_adv.h>
|
||||
|
@ -1086,38 +1086,6 @@ static int batadv_softif_newlink(struct net *src_net, struct net_device *dev,
|
|||
return register_netdevice(dev);
|
||||
}
|
||||
|
||||
/**
|
||||
* batadv_softif_create() - Create and register soft interface
|
||||
* @net: the applicable net namespace
|
||||
* @name: name of the new soft interface
|
||||
*
|
||||
* Return: newly allocated soft_interface, NULL on errors
|
||||
*/
|
||||
struct net_device *batadv_softif_create(struct net *net, const char *name)
|
||||
{
|
||||
struct net_device *soft_iface;
|
||||
int ret;
|
||||
|
||||
soft_iface = alloc_netdev(sizeof(struct batadv_priv), name,
|
||||
NET_NAME_UNKNOWN, batadv_softif_init_early);
|
||||
if (!soft_iface)
|
||||
return NULL;
|
||||
|
||||
dev_net_set(soft_iface, net);
|
||||
|
||||
soft_iface->rtnl_link_ops = &batadv_link_ops;
|
||||
|
||||
ret = register_netdevice(soft_iface);
|
||||
if (ret < 0) {
|
||||
pr_err("Unable to register the batman interface '%s': %i\n",
|
||||
name, ret);
|
||||
free_netdev(soft_iface);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return soft_iface;
|
||||
}
|
||||
|
||||
/**
|
||||
* batadv_softif_destroy_netlink() - deletion of batadv_soft_interface via
|
||||
* netlink
|
||||
|
|
|
@ -12,14 +12,12 @@
|
|||
#include <linux/netdevice.h>
|
||||
#include <linux/skbuff.h>
|
||||
#include <linux/types.h>
|
||||
#include <net/net_namespace.h>
|
||||
#include <net/rtnetlink.h>
|
||||
|
||||
int batadv_skb_head_push(struct sk_buff *skb, unsigned int len);
|
||||
void batadv_interface_rx(struct net_device *soft_iface,
|
||||
struct sk_buff *skb, int hdr_size,
|
||||
struct batadv_orig_node *orig_node);
|
||||
struct net_device *batadv_softif_create(struct net *net, const char *name);
|
||||
bool batadv_softif_is_valid(const struct net_device *net_dev);
|
||||
extern struct rtnl_link_ops batadv_link_ops;
|
||||
int batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid);
|
||||
|
|
Loading…
Reference in a new issue