netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH net-next v3 1/3] switchdev: fix: erasing too much of vlan obj when handling multiple vlan specs
@ 2015-10-23  3:25 sfeldma
  2015-10-23  3:25 ` [PATCH net-next v3 2/3] switchdev: fix: pass correct obj size when deferring obj add sfeldma
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: sfeldma @ 2015-10-23  3:25 UTC (permalink / raw)
  To: netdev; +Cc: jiri, vivien.didelot

From: Scott Feldman <sfeldma@gmail.com>

When adding vlans with multiple IFLA_BRIDGE_VLAN_INFO attrs set in AFSPEC,
we would wipe the vlan obj struct after the first IFLA_BRIDGE_VLAN_INFO.
Fix this by only clearing what's necessary on each IFLA_BRIDGE_VLAN_INFO
iteration.

Fixes: 9e8f4a54 ("switchdev: push object ID back to object structure")
Signed-off-by: Scott Feldman <sfeldma@gmail.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
---
v2->v3: no change
v1->v2: add Jiri's Acked-by

 net/switchdev/switchdev.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index 73e3895..56d8479 100644
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -863,7 +863,7 @@ static int switchdev_port_br_afspec(struct net_device *dev,
 			err = f(dev, &vlan.obj);
 			if (err)
 				return err;
-			memset(&vlan, 0, sizeof(vlan));
+			vlan.vid_begin = 0;
 		} else {
 			if (vlan.vid_begin)
 				return -EINVAL;
@@ -872,7 +872,7 @@ static int switchdev_port_br_afspec(struct net_device *dev,
 			err = f(dev, &vlan.obj);
 			if (err)
 				return err;
-			memset(&vlan, 0, sizeof(vlan));
+			vlan.vid_begin = 0;
 		}
 	}
 
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2015-10-23 13:37 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-23  3:25 [PATCH net-next v3 1/3] switchdev: fix: erasing too much of vlan obj when handling multiple vlan specs sfeldma
2015-10-23  3:25 ` [PATCH net-next v3 2/3] switchdev: fix: pass correct obj size when deferring obj add sfeldma
2015-10-23 13:32   ` David Miller
2015-10-23  3:25 ` [PATCH net-next v3 3/3] switchdev: split switchdev_attr into individual structs sfeldma
2015-10-23 13:32   ` David Miller
2015-10-23 13:53     ` David Miller
2015-10-23 13:32 ` [PATCH net-next v3 1/3] switchdev: fix: erasing too much of vlan obj when handling multiple vlan specs David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).