net/core/dev.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
Make interface with enabled protodown to retain NOCARRIER state during
transfer of operstate from its lower device.
Signed-off-by: Volodymyr Boyko <boyko.cxx@gmail.com>
---
Currently bringing up lower device enables carrier on upper devices
ignoring the protodown flag.
Steps to reproduce:
```
ip l a test0 up type dummy
ip l a test0.mv0 up link test0 type macvlan mode bridge
ip l s test0.mv0 protodown on
sleep 1
printf 'before flap:\n'
ip -o l show | grep test0
ip l set down test0 && ip l set up test0
printf 'after flap:\n'
ip -o l show | grep test0
ip l del test0
```
output without this change:
```
before flap:
28: test0.mv0@test0: <NO-CARRIER,BROADCAST,MULTICAST,UP>
state LOWERLAYERDOWN protodown on
after flap:
28: test0.mv0@test0: <BROADCAST,MULTICAST,UP,LOWER_UP>
state UP protodown on
```
output with this change:
```
before flap:
28: test0.mv0@test0: <NO-CARRIER,BROADCAST,MULTICAST,UP>
state DOWN protodown on
after flap:
28: test0.mv0@test0: <NO-CARRIER,BROADCAST,MULTICAST,UP>
state DOWN protodown on
```
---
net/core/dev.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/net/core/dev.c b/net/core/dev.c
index 1e740faf9e78..10b0ae0ca5a8 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -10198,10 +10198,12 @@ void netif_stacked_transfer_operstate(const struct net_device *rootdev,
else
netif_testing_off(dev);
- if (netif_carrier_ok(rootdev))
- netif_carrier_on(dev);
- else
- netif_carrier_off(dev);
+ if (!dev->proto_down) {
+ if (netif_carrier_ok(rootdev))
+ netif_carrier_on(dev);
+ else
+ netif_carrier_off(dev);
+ }
}
EXPORT_SYMBOL(netif_stacked_transfer_operstate);
--
2.39.5
On 9/27/24 09:33, Volodymyr Boyko wrote: > Make interface with enabled protodown to retain NOCARRIER state during > transfer of operstate from its lower device. > > Signed-off-by: Volodymyr Boyko <boyko.cxx@gmail.com> > --- > Currently bringing up lower device enables carrier on upper devices > ignoring the protodown flag. > > Steps to reproduce: > ``` > ip l a test0 up type dummy > ip l a test0.mv0 up link test0 type macvlan mode bridge > ip l s test0.mv0 protodown on > sleep 1 > printf 'before flap:\n' > ip -o l show | grep test0 > ip l set down test0 && ip l set up test0 > printf 'after flap:\n' > ip -o l show | grep test0 > ip l del test0 > ``` > > output without this change: > ``` > before flap: > 28: test0.mv0@test0: <NO-CARRIER,BROADCAST,MULTICAST,UP> > state LOWERLAYERDOWN protodown on > after flap: > 28: test0.mv0@test0: <BROADCAST,MULTICAST,UP,LOWER_UP> > state UP protodown on > ``` > > output with this change: > ``` > before flap: > 28: test0.mv0@test0: <NO-CARRIER,BROADCAST,MULTICAST,UP> > state DOWN protodown on > after flap: > 28: test0.mv0@test0: <NO-CARRIER,BROADCAST,MULTICAST,UP> > state DOWN protodown on > ``` I'm unsure we can accept this change of behavior: existing user-space application may rely on the existing one. I tend to stay on the safe side. Paolo
© 2016 - 2024 Red Hat, Inc.