From patchwork Tue Oct 20 19:36:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Feldman X-Patchwork-Id: 533131 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id EEAE914110E for ; Wed, 21 Oct 2015 06:34:03 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=FTywsupf; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752861AbbJTTeA (ORCPT ); Tue, 20 Oct 2015 15:34:00 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:33571 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751273AbbJTTd6 (ORCPT ); Tue, 20 Oct 2015 15:33:58 -0400 Received: by pabrc13 with SMTP id rc13so29890626pab.0 for ; Tue, 20 Oct 2015 12:33:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VEiGws+1OzqUpq1RoxDX01K6WAax4SGVBawE90dh6HY=; b=FTywsupf8b3joOTmwQt3LWjUnPOoZ7hHE94m3jVkbCmdqbYn85GxQsiilm+AmuBP5b gwrt9SpcCEqkj1KJfobUFF82TWNdhTFlaJSStbqmK95I5H2R8nQnE0df64If9eN14aTb j9GDwwM7QVvwPasDICm2tJeJaGAteNeANxu/ZDHy+Tp+7ge+VYae7uIsdt3SfM6yzCbP 61CdsXjt32VxyXH32rSSRbgEOmW5GneULIgq+5IcDGeXx/BJB/rQ+WRSx7NlgBhcea6Z q9XROd9ny5GkILTOi6Az5ZcSZePCIZymnyqta8B6pAjHoBrGyK3Z7KJI7wabZfdRkAZ5 q4Pw== X-Received: by 10.66.227.201 with SMTP id sc9mr5772909pac.62.1445369638359; Tue, 20 Oct 2015 12:33:58 -0700 (PDT) Received: from rocker1.rocker.net ([199.58.98.35]) by smtp.gmail.com with ESMTPSA id dn4sm5177347pbd.0.2015.10.20.12.33.57 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Oct 2015 12:33:57 -0700 (PDT) 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 Message-Id: <1445369799-2345-2-git-send-email-sfeldma@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1445369799-2345-1-git-send-email-sfeldma@gmail.com> References: <1445369799-2345-1-git-send-email-sfeldma@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Scott Feldman Fixes: 0bc05d585d ("switchdev: allow caller to explicitly request attr_set as deferred") Signed-off-by: Scott Feldman --- 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); }