Message ID | 20220302163522.102842-1-sw@simonwunderlich.de |
---|---|
State | Not Applicable, archived |
Delegated to: | Simon Wunderlich |
Headers | show |
--- 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);