From: Sven Eckelmann <sven@narfation.org>
To: b.a.t.m.a.n@lists.open-mesh.org
Cc: Antonio Quartulli <a@unstable.cc>
Subject: Re: [B.A.T.M.A.N.] [PATCH 2/4] batman-adv: Create batman soft interfaces within correct netns.
Date: Sun, 31 Jan 2016 14:26:33 +0100 [thread overview]
Message-ID: <6163814.nEZyCaGlCL@sven-edge> (raw)
In-Reply-To: <1453312110-32683-3-git-send-email-andrew@lunn.ch>
[-- Attachment #1: Type: text/plain, Size: 2720 bytes --]
On Wednesday 20 January 2016 18:48:28 Andrew Lunn wrote:
> 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>
> ---
> net/batman-adv/hard-interface.c | 9 +++++----
> net/batman-adv/hard-interface.h | 2 +-
> net/batman-adv/soft-interface.c | 7 +++++--
> net/batman-adv/soft-interface.h | 2 +-
> net/batman-adv/sysfs.c | 3 ++-
> net/batman-adv/translation-table.c | 3 ++-
> 6 files changed, 16 insertions(+), 10 deletions(-)
This patch doesn't apply (via git-am/git-apply; and only unclean with GNU
patch). Can you please rebase it.
[...]
> diff --git a/net/batman-adv/hard-interface.h
> b/net/batman-adv/hard-interface.h index 5a31420..4ed737f 100644
> --- a/net/batman-adv/hard-interface.h
> +++ b/net/batman-adv/hard-interface.h
New forward declaration missing:
struct net;
> @@ -55,7 +55,7 @@ bool batadv_is_wifi_iface(int ifindex);
> struct batadv_hard_iface*
> batadv_hardif_get_by_netdev(const struct net_device *net_dev);
> int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,
> - const char *iface_name);
> + struct net *net, const char *iface_name);
> void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface,
> enum batadv_hard_if_cleanup autodel);
> void batadv_hardif_remove_interfaces(void);
[...]
> diff --git a/net/batman-adv/soft-interface.h
> b/net/batman-adv/soft-interface.h index 8e82176..d616cd5 100644
> --- a/net/batman-adv/soft-interface.h
> +++ b/net/batman-adv/soft-interface.h
New forward declaration missing:
struct net;
> @@ -29,7 +29,7 @@ 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, struct batadv_hard_iface *recv_if,
> 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;
[...]
> diff --git a/net/batman-adv/translation-table.c
> b/net/batman-adv/translation-table.c index 76f19ba..0dbda83 100644
> --- a/net/batman-adv/translation-table.c
> +++ b/net/batman-adv/translation-table.c
init_net is not used anymore and thus following include should be removed:
#include <net/net_namespace.h>
Kind regards,
Sven
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2016-01-31 13:26 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-20 17:48 [B.A.T.M.A.N.] [PATCH 0/4] batman-adv: Add network name space support Andrew Lunn
2016-01-20 17:48 ` [B.A.T.M.A.N.] [PATCH 1/4] batman-adv: NETIF_F_NETNS_LOCAL feature to prevent netns moves Andrew Lunn
2016-01-23 2:06 ` Antonio Quartulli
2016-01-23 17:20 ` Andrew Lunn
2016-01-24 6:19 ` Antonio Quartulli
2016-01-24 10:42 ` Antonio Quartulli
2016-01-24 16:46 ` Andrew Lunn
2016-01-24 11:01 ` Antonio Quartulli
2016-01-20 17:48 ` [B.A.T.M.A.N.] [PATCH 2/4] batman-adv: Create batman soft interfaces within correct netns Andrew Lunn
2016-01-25 3:28 ` Antonio Quartulli
2016-01-25 13:12 ` Andrew Lunn
2016-01-26 5:43 ` Antonio Quartulli
2016-01-26 5:55 ` Antonio Quartulli
2016-01-31 13:26 ` Sven Eckelmann [this message]
2016-01-20 17:48 ` [B.A.T.M.A.N.] [PATCH 3/4] batman-adv: Handle parent interfaces in a different netns Andrew Lunn
2016-01-26 12:53 ` Antonio Quartulli
2016-01-26 13:25 ` Sven Eckelmann
2016-01-27 10:13 ` Sven Eckelmann
2016-01-27 10:44 ` Antonio Quartulli
2016-02-01 2:57 ` Antonio Quartulli
2016-02-02 2:11 ` Andrew Lunn
2016-01-31 13:26 ` Sven Eckelmann
2016-01-20 17:48 ` [B.A.T.M.A.N.] [PATCH 4/4] batman-adv: debugfs: Add netns support Andrew Lunn
2016-01-28 1:28 ` Antonio Quartulli
2016-01-28 1:40 ` Andrew Lunn
2016-01-28 2:29 ` Antonio Quartulli
2016-01-31 13:26 ` Sven Eckelmann
2016-01-28 2:59 ` [B.A.T.M.A.N.] [PATCH 0/4] batman-adv: Add network name space support Antonio Quartulli
2016-01-28 3:50 ` Andrew Lunn
2016-01-31 13:26 ` Sven Eckelmann
2016-02-12 15:57 ` Sven Eckelmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6163814.nEZyCaGlCL@sven-edge \
--to=sven@narfation.org \
--cc=a@unstable.cc \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox