mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-02-13 20:01:55 +00:00
34 lines
1 KiB
Diff
34 lines
1 KiB
Diff
From 769d236f61e884cc24897f23ede001744a77a469 Mon Sep 17 00:00:00 2001
|
|
From: Frank Wunderlich <frank-w@public-files.de>
|
|
Date: Sat, 16 Feb 2019 17:26:51 +0100
|
|
Subject: [PATCH 64/77] [dsa] fix oops in br_vlan_enabled
|
|
|
|
---
|
|
net/dsa/port.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/net/dsa/port.c b/net/dsa/port.c
|
|
index ed0595459df1..0891c6f554dc 100644
|
|
--- a/net/dsa/port.c
|
|
+++ b/net/dsa/port.c
|
|
@@ -255,7 +255,7 @@ int dsa_port_vlan_add(struct dsa_port *dp,
|
|
if (netif_is_bridge_master(vlan->obj.orig_dev))
|
|
return -EOPNOTSUPP;
|
|
|
|
- if (br_vlan_enabled(dp->bridge_dev))
|
|
+ if (!dp->bridge_dev || br_vlan_enabled(dp->bridge_dev))
|
|
return dsa_port_notify(dp, DSA_NOTIFIER_VLAN_ADD, &info);
|
|
|
|
return 0;
|
|
@@ -273,7 +273,7 @@ int dsa_port_vlan_del(struct dsa_port *dp,
|
|
if (netif_is_bridge_master(vlan->obj.orig_dev))
|
|
return -EOPNOTSUPP;
|
|
|
|
- if (br_vlan_enabled(dp->bridge_dev))
|
|
+ if (!dp->bridge_dev || br_vlan_enabled(dp->bridge_dev))
|
|
return dsa_port_notify(dp, DSA_NOTIFIER_VLAN_DEL, &info);
|
|
|
|
return 0;
|
|
--
|
|
2.19.1
|
|
|