Home Home > GIT Browse > SLE15
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Tesarik <ptesarik@suse.cz>2019-06-24 09:36:42 +0200
committerPetr Tesarik <ptesarik@suse.cz>2019-06-24 09:37:05 +0200
commitdf28106c2c9c727c7c13faec38a714e4fcde3c67 (patch)
tree969dbef0f111acc699ca37e9635117f781db67d0
parent4401d3bae18e8ded20a9ba47870d36baa8ff29ec (diff)
s390/qeth: fix VLAN attribute in bridge_hostnotify udev event
(bsc#1051510).
-rw-r--r--patches.fixes/s390-qeth-fix-vlan-attribute-in-bridge_hostnotify-udev-event46
-rw-r--r--series.conf1
2 files changed, 47 insertions, 0 deletions
diff --git a/patches.fixes/s390-qeth-fix-vlan-attribute-in-bridge_hostnotify-udev-event b/patches.fixes/s390-qeth-fix-vlan-attribute-in-bridge_hostnotify-udev-event
new file mode 100644
index 0000000000..0d2c825761
--- /dev/null
+++ b/patches.fixes/s390-qeth-fix-vlan-attribute-in-bridge_hostnotify-udev-event
@@ -0,0 +1,46 @@
+From: Alexandra Winter <wintera@linux.ibm.com>
+Date: Wed, 5 Jun 2019 13:48:50 +0200
+Subject: s390/qeth: fix VLAN attribute in bridge_hostnotify udev event
+Git-commit: 335726195e460cb6b3f795b695bfd31f0ea70ef0
+Patch-mainline: v5.2-rc1
+References: bsc#1051510
+
+Enabling sysfs attribute bridge_hostnotify triggers a series of udev events
+for the MAC addresses of all currently connected peers. In case no VLAN is
+set for a peer, the device reports the corresponding MAC addresses with
+VLAN ID 4096. This currently results in attribute VLAN=4096 for all
+non-VLAN interfaces in the initial series of events after host-notify is
+enabled.
+
+Instead, no VLAN attribute should be reported in the udev event for
+non-VLAN interfaces.
+
+Only the initial events face this issue. For dynamic changes that are
+reported later, the device uses a validity flag.
+
+This also changes the code so that it now sets the VLAN attribute for
+MAC addresses with VID 0. On Linux, no qeth interface will ever be
+registered with VID 0: Linux kernel registers VID 0 on all network
+interfaces initially, but qeth will drop .ndo_vlan_rx_add_vid for VID 0.
+Peers with other OSs could register MACs with VID 0.
+
+Fixes: 9f48b9db9a22 ("qeth: bridgeport support - address notifications")
+Signed-off-by: Alexandra Winter <wintera@linux.ibm.com>
+Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Acked-by: Petr Tesarik <ptesarik@suse.com>
+---
+ drivers/s390/net/qeth_l2_main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/s390/net/qeth_l2_main.c
++++ b/drivers/s390/net/qeth_l2_main.c
+@@ -2053,7 +2053,7 @@ static void qeth_bridgeport_an_set_cb(vo
+
+ l2entry = (struct qdio_brinfo_entry_l2 *)entry;
+ code = IPA_ADDR_CHANGE_CODE_MACADDR;
+- if (l2entry->addr_lnid.lnid)
++ if (l2entry->addr_lnid.lnid < VLAN_N_VID)
+ code |= IPA_ADDR_CHANGE_CODE_VLANID;
+ qeth_bridge_emit_host_event(card, anev_reg_unreg, code,
+ (struct net_if_token *)&l2entry->nit,
diff --git a/series.conf b/series.conf
index 3b3cc710e7..acfffa595b 100644
--- a/series.conf
+++ b/series.conf
@@ -22569,6 +22569,7 @@
patches.fixes/efi-x86-Add-missing-error-handling-to-old_memmap-1-1.patch
patches.arch/x86-cpu-amd-don-t-force-the-cpb-cap-when-running-under-a-hypervisor.patch
patches.fixes/fuse-fallocate-fix-return-with-locked-inode.patch
+ patches.fixes/s390-qeth-fix-vlan-attribute-in-bridge_hostnotify-udev-event
patches.drivers/hwmon-core-add-thermal-sensors-only-if-dev-of_node-i.patch
patches.drivers/hwmon-pmbus-core-Treat-parameters-as-paged-if-on-mul.patch
patches.drm/0002-drm-i915-gvt-refine-ggtt-range-validation.patch