[0/3] pull request for net: batman-adv 2022-03-02
Pull-request
git://git.open-mesh.org/linux-merge.git tags/batadv-net-pullrequest-20220302
Commit Message
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:
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(-)
@@ -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);