diff options
author | Andrew Lunn <andrew@lunn.ch> | 2016-04-21 12:57:27 +0200 |
---|---|---|
committer | Antonio Quartulli <a@unstable.cc> | 2016-05-10 18:26:44 +0800 |
commit | 2cd45a0671d9e37ab20e844fc4c84717a38b7f52 (patch) | |
tree | 942ed97ece08be93115eaebf09d98515ef45c608 /net/batman-adv/soft-interface.h | |
parent | 0d21cdaa9bbf5efae95cfb6346d26ff6e61f8896 (diff) | |
download | linux-2cd45a0671d9e37ab20e844fc4c84717a38b7f52.tar.bz2 |
batman-adv: Create batman soft interfaces within correct netns.
When creating a soft interface, create it in the same netns as the
hard interface. Replace all references to init_net with the correct
name space for the interface being manipulated.
Suggested-by: Daniel Ehlers <danielehlers@mindeye.net>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Acked-by: Antonio Quartulli <a@unstable.cc>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <a@unstable.cc>
Diffstat (limited to 'net/batman-adv/soft-interface.h')
-rw-r--r-- | net/batman-adv/soft-interface.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h index 5942da3d03d5..b0966342a986 100644 --- a/net/batman-adv/soft-interface.h +++ b/net/batman-adv/soft-interface.h @@ -23,13 +23,14 @@ #include <net/rtnetlink.h> struct net_device; +struct net; struct sk_buff; 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(const char *name); +struct net_device *batadv_softif_create(struct net *net, const char *name); void batadv_softif_destroy_sysfs(struct net_device *soft_iface); int batadv_softif_is_valid(const struct net_device *net_dev); extern struct rtnl_link_ops batadv_link_ops; |