{"id":833257,"url":"http://patchwork.ozlabs.org/api/1.2/patches/833257/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171102083136.2096-2-jakub.kicinski@netronome.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20171102083136.2096-2-jakub.kicinski@netronome.com>","list_archive_url":null,"date":"2017-11-02T08:31:29","name":"[net-next,1/8] nfp: flower: app should use struct nfp_repr","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"f9efa49b0bd58fc61b4527048078c33c299f446e","submitter":{"id":67484,"url":"http://patchwork.ozlabs.org/api/1.2/people/67484/?format=json","name":"Jakub Kicinski","email":"jakub.kicinski@netronome.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20171102083136.2096-2-jakub.kicinski@netronome.com/mbox/","series":[{"id":11454,"url":"http://patchwork.ozlabs.org/api/1.2/series/11454/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=11454","date":"2017-11-02T08:31:28","name":"nfp: TC block fixes, app fallback and dev_alloc()","version":1,"mbox":"http://patchwork.ozlabs.org/series/11454/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/833257/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/833257/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=netronome-com.20150623.gappssmtp.com\n\theader.i=@netronome-com.20150623.gappssmtp.com\n\theader.b=\"q3B1zji+\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3ySJJG0xxhz9t2f\n\tfor ;\n\tThu, 2 Nov 2017 19:33:18 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1755428AbdKBIcZ (ORCPT );\n\tThu, 2 Nov 2017 04:32:25 -0400","from mail-pf0-f193.google.com ([209.85.192.193]:53247 \"EHLO\n\tmail-pf0-f193.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1755390AbdKBIcX (ORCPT\n\t); Thu, 2 Nov 2017 04:32:23 -0400","by mail-pf0-f193.google.com with SMTP id e64so4043487pfk.9\n\tfor ; Thu, 02 Nov 2017 01:32:22 -0700 (PDT)","from jkicinski-Precision-T1700.netronome.com ([75.53.12.129])\n\tby smtp.gmail.com with ESMTPSA id\n\tz13sm5390484pgc.29.2017.11.02.01.32.21\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tThu, 02 Nov 2017 01:32:21 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=netronome-com.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=UibJLMPKXWK3n9yF4JEKV8QuK3HJw4PrBjEQLe1ePeY=;\n\tb=q3B1zji+kiQQ08ZG5AvkRSRKji9Rn2iWV8qPi044dPO6hNmPUa14nDH/exdA6Jfp6S\n\tIg0TtH76t8CcC24nNkfLBjJ7M/UZh/on/v50dOiDbKtS4CfgI5f7Nq32PidOUTliT78G\n\tFbKzlE8EisXp4Xj9DnGLjSSi1OwDDLtrkWckYduURv2Y0ktsc370dVYitR58Ym7E8JEm\n\tUBM6UM8oL2Ut0Cd+UST4miMXWST0iMcPC3fiZOmb9uqordZ6Dh3CWwsRa/y7u7hkrdxK\n\tFFKm1oR6k93jKEJY5IHXvQEk2FKR2J5IJk7XOxBwd9S3R5rXjGIEd8H4R50L9j80xJ2h\n\tH9MQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=UibJLMPKXWK3n9yF4JEKV8QuK3HJw4PrBjEQLe1ePeY=;\n\tb=f0DirOBaksmCWR7GrQHqfNuJpc2FH2h/i0quzxSG2jj65WIlKW2QrywgR0xQqtZO3x\n\tErdXWUqbHzKMa/xKJBYBVBHjQzFsNKBQeDM78NtrpITV+htmgSbNHGa4WctR0j5G2Rux\n\tzNGYj+MbwX6uRWmISXbF/aFDm5xwAKq5YjUx41xJtEo54WLCoNw3myICULiSo+Ulfe9q\n\t5oMQOwvTQltv79ZKg/8w/MVsOg3a9Aocb7ZaGF/WgIly3Wwqjh1du9fYk1iBfOzZPFgO\n\tN65kJYAaNZuXBoeAfLT7Vw1Lj+tH4bJaybKNPH/tePac92kX0Ha6V/ZVAk42gK0w2IMP\n\tbAPQ==","X-Gm-Message-State":"AMCzsaWwuyRi83DXtzMi11BqgMzwi4OUR9b69jbbYoSct1vtHH86NJvN\n\tufPTQDYRCY6BwCB8LzFcsRckpXGE","X-Google-Smtp-Source":"ABhQp+Qh+QEluZbQ+AC2aOTzCA4ZlwSpSh5SzTTghs1ZgWpOhmHG/QYN8g/e3gt5WeZVWTm4QEyntA==","X-Received":"by 10.98.87.74 with SMTP id l71mr2955601pfb.204.1509611542448;\n\tThu, 02 Nov 2017 01:32:22 -0700 (PDT)","From":"Jakub Kicinski ","To":"netdev@vger.kernel.org","Cc":"oss-drivers@netronome.com, John Hurley ,\n\tJakub 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"},"content":"From: John Hurley \n\nEnsure priv netdev data in flower app is cast to nfp_repr and not nfp_net\nas in other apps.\n\nFixes: 363fc53b8b58 (\"nfp: flower: Convert ndo_setup_tc offloads to block callbacks\")\nSigned-off-by: John Hurley \nSigned-off-by: Jakub Kicinski \n---\n drivers/net/ethernet/netronome/nfp/flower/offload.c | 12 ++++++------\n 1 file changed, 6 insertions(+), 6 deletions(-)","diff":"diff --git a/drivers/net/ethernet/netronome/nfp/flower/offload.c b/drivers/net/ethernet/netronome/nfp/flower/offload.c\nindex 7c6cab176293..95c2b9284857 100644\n--- a/drivers/net/ethernet/netronome/nfp/flower/offload.c\n+++ b/drivers/net/ethernet/netronome/nfp/flower/offload.c\n@@ -468,14 +468,14 @@ nfp_flower_repr_offload(struct nfp_app *app, struct net_device *netdev,\n static int nfp_flower_setup_tc_block_cb(enum tc_setup_type type,\n \t\t\t\t\tvoid *type_data, void *cb_priv)\n {\n-\tstruct nfp_net *nn = cb_priv;\n+\tstruct nfp_repr *repr = cb_priv;\n \n-\tif (!tc_can_offload(nn->dp.netdev))\n+\tif (!tc_can_offload(repr->netdev))\n \t\treturn -EOPNOTSUPP;\n \n \tswitch (type) {\n \tcase TC_SETUP_CLSFLOWER:\n-\t\treturn nfp_flower_repr_offload(nn->app, nn->port->netdev,\n+\t\treturn nfp_flower_repr_offload(repr->app, repr->netdev,\n \t\t\t\t\t type_data);\n \tdefault:\n \t\treturn -EOPNOTSUPP;\n@@ -485,7 +485,7 @@ static int nfp_flower_setup_tc_block_cb(enum tc_setup_type type,\n static int nfp_flower_setup_tc_block(struct net_device *netdev,\n \t\t\t\t struct tc_block_offload *f)\n {\n-\tstruct nfp_net *nn = netdev_priv(netdev);\n+\tstruct nfp_repr *repr = netdev_priv(netdev);\n \n \tif (f->binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS)\n \t\treturn -EOPNOTSUPP;\n@@ -494,11 +494,11 @@ static int nfp_flower_setup_tc_block(struct net_device *netdev,\n \tcase TC_BLOCK_BIND:\n \t\treturn tcf_block_cb_register(f->block,\n \t\t\t\t\t nfp_flower_setup_tc_block_cb,\n-\t\t\t\t\t nn, nn);\n+\t\t\t\t\t repr, repr);\n \tcase TC_BLOCK_UNBIND:\n \t\ttcf_block_cb_unregister(f->block,\n \t\t\t\t\tnfp_flower_setup_tc_block_cb,\n-\t\t\t\t\tnn);\n+\t\t\t\t\trepr);\n \t\treturn 0;\n \tdefault:\n \t\treturn -EOPNOTSUPP;\n","prefixes":["net-next","1/8"]}