From: sfeldma@gmail.com
To: netdev@vger.kernel.org
Cc: jiri@resnulli.us, siva.mannem.lnx@gmail.com,
vivien.didelot@savoirfairelinux.com
Subject: [PATCH net-next 2/3] switchdev: fix: pass correct obj size when deferring obj add
Date: Tue, 20 Oct 2015 12:36:38 -0700 [thread overview]
Message-ID: <1445369799-2345-2-git-send-email-sfeldma@gmail.com> (raw)
In-Reply-To: <1445369799-2345-1-git-send-email-sfeldma@gmail.com>
From: Scott Feldman <sfeldma@gmail.com>
Fixes: 0bc05d585d ("switchdev: allow caller to explicitly request attr_set as deferred")
Signed-off-by: Scott Feldman <sfeldma@gmail.com>
---
net/switchdev/switchdev.c | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index 56d8479..be8ced1 100644
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -489,7 +489,24 @@ static void switchdev_port_obj_del_deferred(struct net_device *dev,
static int switchdev_port_obj_del_defer(struct net_device *dev,
const struct switchdev_obj *obj)
{
- return switchdev_deferred_enqueue(dev, obj, sizeof(*obj),
+ size_t size = 0;
+
+ switch (obj->id) {
+ case SWITCHDEV_OBJ_ID_PORT_VLAN:
+ size = sizeof(struct switchdev_obj_port_vlan);
+ break;
+ case SWITCHDEV_OBJ_ID_IPV4_FIB:
+ size = sizeof(struct switchdev_obj_ipv4_fib);
+ break;
+ case SWITCHDEV_OBJ_ID_PORT_FDB:
+ size = sizeof(struct switchdev_obj_port_fdb);
+ break;
+ default:
+ WARN_ON(!size);
+ return -EINVAL;
+ }
+
+ return switchdev_deferred_enqueue(dev, obj, size,
switchdev_port_obj_del_deferred);
}
--
1.7.10.4
next prev parent reply other threads:[~2015-10-20 19:33 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-20 19:36 [PATCH net-next 1/3] switchdev: fix: erasing too much of vlan obj when handling multiple vlan specs sfeldma
2015-10-20 19:36 ` sfeldma [this message]
2015-10-21 7:40 ` [PATCH net-next 2/3] switchdev: fix: pass correct obj size when deferring obj add Jiri Pirko
2015-10-20 19:36 ` [PATCH net-next 3/3] switchdev: split switchdev_attr into individual structs sfeldma
2015-10-21 7:49 ` Jiri Pirko
2015-10-21 7:46 ` [PATCH net-next 1/3] switchdev: fix: erasing too much of vlan obj when handling multiple vlan specs Jiri Pirko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1445369799-2345-2-git-send-email-sfeldma@gmail.com \
--to=sfeldma@gmail.com \
--cc=jiri@resnulli.us \
--cc=netdev@vger.kernel.org \
--cc=siva.mannem.lnx@gmail.com \
--cc=vivien.didelot@savoirfairelinux.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).