From: Simon Wunderlich <sw@simonwunderlich.de> To: davem@davemloft.net, kuba@kernel.org Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org, Simon Wunderlich <sw@simonwunderlich.de> Subject: [PATCH 0/3] pull request for net: batman-adv 2022-03-02 Date: Wed, 2 Mar 2022 17:30:46 +0100 [thread overview] Message-ID: <20220302163049.101957-1-sw@simonwunderlich.de> (raw) Hi David, hi Jakub, here are some bugfixes for batman-adv which we would like to have integrated into net. Please pull or let me know of any problem! There might be a small merge conflict between the net and net-next pull requests which I both send today, specifically those two commits: * (batadv/net) 690bb6fb64f5 ("batman-adv: Request iflink once in batadv-on-batadv check") * (batadv/net-next) 6ee3c393eeb7 ("batman-adv: Demote batadv-on-batadv skip error message") They should be resolved like this: --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -167,13 +167,7 @@ return false; /* recurse over the parent device */ -<<<<<<< - parent_dev = __dev_get_by_index((struct net *)parent_net, - dev_get_iflink(net_dev)); -======= parent_dev = __dev_get_by_index((struct net *)parent_net, iflink); - /* if we got a NULL parent_dev there is something broken.. */ ->>>>>>> if (!parent_dev) { pr_warn("Cannot find parent device. Skipping batadv-on-batadv check for %s\n", net_dev->name); Thank you, Simon The following changes since commit e783362eb54cd99b2cac8b3a9aeac942e6f6ac07: Linux 5.17-rc1 (2022-01-23 10:12:53 +0200) are available in the Git repository at: git://git.open-mesh.org/linux-merge.git tags/batadv-net-pullrequest-20220302 for you to fetch changes up to 6c1f41afc1dbe59d9d3c8bb0d80b749c119aa334: batman-adv: Don't expect inter-netns unique iflink indices (2022-03-02 09:24:55 +0100) ---------------------------------------------------------------- Here are some batman-adv bugfixes: - Remove redundant iflink requests, by Sven Eckelmann (2 patches) - Don't expect inter-netns unique iflink indices, by Sven Eckelmann ---------------------------------------------------------------- Sven Eckelmann (3): batman-adv: Request iflink once in batadv-on-batadv check batman-adv: Request iflink once in batadv_get_real_netdevice batman-adv: Don't expect inter-netns unique iflink indices net/batman-adv/hard-interface.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-)
WARNING: multiple messages have this Message-ID (diff)
From: Simon Wunderlich <sw@simonwunderlich.de> To: davem@davemloft.net, kuba@kernel.org Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org Subject: [PATCH 0/3] pull request for net: batman-adv 2022-03-02 Date: Wed, 2 Mar 2022 17:30:46 +0100 [thread overview] Message-ID: <20220302163049.101957-1-sw@simonwunderlich.de> (raw) Hi David, hi Jakub, here are some bugfixes for batman-adv which we would like to have integrated into net. Please pull or let me know of any problem! There might be a small merge conflict between the net and net-next pull requests which I both send today, specifically those two commits: * (batadv/net) 690bb6fb64f5 ("batman-adv: Request iflink once in batadv-on-batadv check") * (batadv/net-next) 6ee3c393eeb7 ("batman-adv: Demote batadv-on-batadv skip error message") They should be resolved like this: --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -167,13 +167,7 @@ return false; /* recurse over the parent device */ -<<<<<<< - parent_dev = __dev_get_by_index((struct net *)parent_net, - dev_get_iflink(net_dev)); -======= parent_dev = __dev_get_by_index((struct net *)parent_net, iflink); - /* if we got a NULL parent_dev there is something broken.. */ ->>>>>>> if (!parent_dev) { pr_warn("Cannot find parent device. Skipping batadv-on-batadv check for %s\n", net_dev->name); Thank you, Simon The following changes since commit e783362eb54cd99b2cac8b3a9aeac942e6f6ac07: Linux 5.17-rc1 (2022-01-23 10:12:53 +0200) are available in the Git repository at: git://git.open-mesh.org/linux-merge.git tags/batadv-net-pullrequest-20220302 for you to fetch changes up to 6c1f41afc1dbe59d9d3c8bb0d80b749c119aa334: batman-adv: Don't expect inter-netns unique iflink indices (2022-03-02 09:24:55 +0100) ---------------------------------------------------------------- Here are some batman-adv bugfixes: - Remove redundant iflink requests, by Sven Eckelmann (2 patches) - Don't expect inter-netns unique iflink indices, by Sven Eckelmann ---------------------------------------------------------------- Sven Eckelmann (3): batman-adv: Request iflink once in batadv-on-batadv check batman-adv: Request iflink once in batadv_get_real_netdevice batman-adv: Don't expect inter-netns unique iflink indices net/batman-adv/hard-interface.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-)
next reply other threads:[~2022-03-02 16:40 UTC|newest] Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-03-02 16:30 Simon Wunderlich [this message] 2022-03-02 16:30 ` [PATCH 0/3] pull request for net: batman-adv 2022-03-02 Simon Wunderlich 2022-03-02 16:30 ` [PATCH 1/3] batman-adv: Request iflink once in batadv-on-batadv check Simon Wunderlich 2022-03-03 6:00 ` patchwork-bot+netdevbpf 2022-03-02 16:30 ` [PATCH 2/3] batman-adv: Request iflink once in batadv_get_real_netdevice Simon Wunderlich 2022-03-02 16:30 ` [PATCH 3/3] batman-adv: Don't expect inter-netns unique iflink indices Simon Wunderlich
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=20220302163049.101957-1-sw@simonwunderlich.de \ --to=sw@simonwunderlich.de \ --cc=b.a.t.m.a.n@lists.open-mesh.org \ --cc=davem@davemloft.net \ --cc=kuba@kernel.org \ --cc=netdev@vger.kernel.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.