From patchwork Thu Nov 2 08:31:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 833257 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="q3B1zji+"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ySJJG0xxhz9t2f for ; Thu, 2 Nov 2017 19:33:18 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755428AbdKBIcZ (ORCPT ); Thu, 2 Nov 2017 04:32:25 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:53247 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755390AbdKBIcX (ORCPT ); Thu, 2 Nov 2017 04:32:23 -0400 Received: by mail-pf0-f193.google.com with SMTP id e64so4043487pfk.9 for ; Thu, 02 Nov 2017 01:32:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UibJLMPKXWK3n9yF4JEKV8QuK3HJw4PrBjEQLe1ePeY=; b=q3B1zji+kiQQ08ZG5AvkRSRKji9Rn2iWV8qPi044dPO6hNmPUa14nDH/exdA6Jfp6S Ig0TtH76t8CcC24nNkfLBjJ7M/UZh/on/v50dOiDbKtS4CfgI5f7Nq32PidOUTliT78G FbKzlE8EisXp4Xj9DnGLjSSi1OwDDLtrkWckYduURv2Y0ktsc370dVYitR58Ym7E8JEm UBM6UM8oL2Ut0Cd+UST4miMXWST0iMcPC3fiZOmb9uqordZ6Dh3CWwsRa/y7u7hkrdxK FFKm1oR6k93jKEJY5IHXvQEk2FKR2J5IJk7XOxBwd9S3R5rXjGIEd8H4R50L9j80xJ2h H9MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=UibJLMPKXWK3n9yF4JEKV8QuK3HJw4PrBjEQLe1ePeY=; b=f0DirOBaksmCWR7GrQHqfNuJpc2FH2h/i0quzxSG2jj65WIlKW2QrywgR0xQqtZO3x ErdXWUqbHzKMa/xKJBYBVBHjQzFsNKBQeDM78NtrpITV+htmgSbNHGa4WctR0j5G2Rux zNGYj+MbwX6uRWmISXbF/aFDm5xwAKq5YjUx41xJtEo54WLCoNw3myICULiSo+Ulfe9q 5oMQOwvTQltv79ZKg/8w/MVsOg3a9Aocb7ZaGF/WgIly3Wwqjh1du9fYk1iBfOzZPFgO N65kJYAaNZuXBoeAfLT7Vw1Lj+tH4bJaybKNPH/tePac92kX0Ha6V/ZVAk42gK0w2IMP bAPQ== X-Gm-Message-State: AMCzsaWwuyRi83DXtzMi11BqgMzwi4OUR9b69jbbYoSct1vtHH86NJvN ufPTQDYRCY6BwCB8LzFcsRckpXGE X-Google-Smtp-Source: ABhQp+Qh+QEluZbQ+AC2aOTzCA4ZlwSpSh5SzTTghs1ZgWpOhmHG/QYN8g/e3gt5WeZVWTm4QEyntA== X-Received: by 10.98.87.74 with SMTP id l71mr2955601pfb.204.1509611542448; Thu, 02 Nov 2017 01:32:22 -0700 (PDT) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id z13sm5390484pgc.29.2017.11.02.01.32.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 02 Nov 2017 01:32:21 -0700 (PDT) From: Jakub Kicinski To: netdev@vger.kernel.org Cc: oss-drivers@netronome.com, John Hurley , Jakub Kicinski Subject: [PATCH net-next 1/8] nfp: flower: app should use struct nfp_repr Date: Thu, 2 Nov 2017 01:31:29 -0700 Message-Id: <20171102083136.2096-2-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171102083136.2096-1-jakub.kicinski@netronome.com> References: <20171102083136.2096-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: John Hurley Ensure priv netdev data in flower app is cast to nfp_repr and not nfp_net as in other apps. Fixes: 363fc53b8b58 ("nfp: flower: Convert ndo_setup_tc offloads to block callbacks") Signed-off-by: John Hurley Signed-off-by: Jakub Kicinski --- drivers/net/ethernet/netronome/nfp/flower/offload.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/flower/offload.c b/drivers/net/ethernet/netronome/nfp/flower/offload.c index 7c6cab176293..95c2b9284857 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/offload.c +++ b/drivers/net/ethernet/netronome/nfp/flower/offload.c @@ -468,14 +468,14 @@ nfp_flower_repr_offload(struct nfp_app *app, struct net_device *netdev, static int nfp_flower_setup_tc_block_cb(enum tc_setup_type type, void *type_data, void *cb_priv) { - struct nfp_net *nn = cb_priv; + struct nfp_repr *repr = cb_priv; - if (!tc_can_offload(nn->dp.netdev)) + if (!tc_can_offload(repr->netdev)) return -EOPNOTSUPP; switch (type) { case TC_SETUP_CLSFLOWER: - return nfp_flower_repr_offload(nn->app, nn->port->netdev, + return nfp_flower_repr_offload(repr->app, repr->netdev, type_data); default: return -EOPNOTSUPP; @@ -485,7 +485,7 @@ static int nfp_flower_setup_tc_block_cb(enum tc_setup_type type, static int nfp_flower_setup_tc_block(struct net_device *netdev, struct tc_block_offload *f) { - struct nfp_net *nn = netdev_priv(netdev); + struct nfp_repr *repr = netdev_priv(netdev); if (f->binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS) return -EOPNOTSUPP; @@ -494,11 +494,11 @@ static int nfp_flower_setup_tc_block(struct net_device *netdev, case TC_BLOCK_BIND: return tcf_block_cb_register(f->block, nfp_flower_setup_tc_block_cb, - nn, nn); + repr, repr); case TC_BLOCK_UNBIND: tcf_block_cb_unregister(f->block, nfp_flower_setup_tc_block_cb, - nn); + repr); return 0; default: return -EOPNOTSUPP;