{"id":806373,"url":"http://patchwork.ozlabs.org/api/1.0/patches/806373/?format=json","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.0/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},"msgid":"<20170828061843.24349-2-sam@mendozajonas.com>","date":"2017-08-28T06:18:41","name":"[net-next,v3,1/3] net/ncsi: Fix several packet definitions","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"e024956889065b6cc76671d8814b29e5ac10c778","submitter":{"id":68013,"url":"http://patchwork.ozlabs.org/api/1.0/people/68013/?format=json","name":"Sam Mendoza-Jonas","email":"sam@mendozajonas.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.0/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170828061843.24349-2-sam@mendozajonas.com/mbox/","series":[{"id":78,"url":"http://patchwork.ozlabs.org/api/1.0/series/78/?format=json","date":"2017-08-28T06:18:41","name":"NCSI VLAN Filtering Support","version":3,"mbox":"http://patchwork.ozlabs.org/series/78/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/806373/checks/","tags":{},"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=mendozajonas.com header.i=@mendozajonas.com\n\theader.b=\"DbNIJZSU\"; dkim=pass (2048-bit key;\n\tunprotected) header.d=messagingengine.com\n\theader.i=@messagingengine.com header.b=\"f0EoIR9z\"; \n\tdkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xghRv13CDz9sNq\n\tfor ;\n\tMon, 28 Aug 2017 16:19:07 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751225AbdH1GTD (ORCPT );\n\tMon, 28 Aug 2017 02:19:03 -0400","from out2-smtp.messagingengine.com ([66.111.4.26]:50271 \"EHLO\n\tout2-smtp.messagingengine.com\" rhost-flags-OK-OK-OK-OK)\n\tby vger.kernel.org with ESMTP id S1750720AbdH1GTA (ORCPT\n\t); Mon, 28 Aug 2017 02:19:00 -0400","from compute2.internal (compute2.nyi.internal [10.202.2.42])\n\tby mailout.nyi.internal (Postfix) with ESMTP id CCF4120D7A;\n\tMon, 28 Aug 2017 02:18:59 -0400 (EDT)","from frontend1 ([10.202.2.160])\n\tby compute2.internal (MEProxy); Mon, 28 Aug 2017 02:18:59 -0400","from v4.ozlabs.ibm.com (unknown [122.99.82.10])\n\tby mail.messagingengine.com (Postfix) with ESMTPA id 0AFDF7E271;\n\tMon, 28 Aug 2017 02:18:56 -0400 (EDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/relaxed; d=\n\tmendozajonas.com; h=cc:date:from:in-reply-to:message-id\n\t:references:subject:to:x-me-sender:x-me-sender:x-sasl-enc\n\t:x-sasl-enc; s=fm1; bh=hD3fJANsQ6JKbuDu8M2wjyaLPLMzwDRi8SOeZxzuM\n\t20=; b=DbNIJZSUNRm/R6Ov1D7s2CZ20weLYPJ5tNJ7QbgMK739/hZOfo/fteUbL\n\tH3LH7322FE/wxgsUoZqwr5Q9s/Oi2EjuHdtOtI0Gj9fx+IxvA6j783gP0Yy3IrIw\n\trFewz2lwElKkBiQN9+fg9FctS7HVxgiRXTJjN3ELY7T6OH6gF55Jjv/Nw0TSyyLM\n\tjHKJyr6tuBJXdADazZ9Lsi++CsjI2RxHkmxllKgb9aDwBGS9wm9drjHNsusZbK8M\n\t9PXTBzPXgpN4BKwVLVVDrpB3Dohs55X7vQOB6OubezcmVOoAqKmJT8/uwEG3Rff5\n\tiuVvYsuBlQq0Zd6m5E9p6T3EvRseg==","v=1; a=rsa-sha256; c=relaxed/relaxed; d=\n\tmessagingengine.com; h=cc:date:from:in-reply-to:message-id\n\t:references:subject:to:x-me-sender:x-me-sender:x-sasl-enc\n\t:x-sasl-enc; s=fm1; bh=hD3fJANsQ6JKbuDu8M2wjyaLPLMzwDRi8SOeZxzuM\n\t20=; b=f0EoIR9zypmEFUkKGvSy6wfQLMmVGeOxaGGbvK3U66VLLS/6fSsOGE554\n\tkKmP+LZXigBg2+hkeWIJkmVqzbqLl7Ncv3lzTWJVbuWJJ9mPnqhLwuakJo/+6cnr\n\t5xuU76OkbAQ9ZXZalcWFAXnOviaXivHUo5W4FfzWsCjtbNQ68El/4e7ucZ8n6r/k\n\tsmXYa8oV2aTU8S/s1NH6q8Uhh3FLKC6UB4HJvfkfaDLNzDk9GxgN+/W++zBz5kHw\n\tNjjPsfaIgU+17E3KeHIEoCyb4m8xgVSKtXq5fWYW9jRnNgMDF/YWk5Wp4TWzOlpz\n\tgbGSZY6rrpe6JUl/5nA1GMz2KEiug=="],"X-ME-Sender":"","X-Sasl-enc":"XclAxYspnVAYFcMwUAB80FSV0flgAX1UDGN4y+O9jSBp 1503901139","From":"Samuel Mendoza-Jonas ","To":"\"David S . Miller\" , netdev@vger.kernel.org,\n\tlinux-kernel@vger.kernel.org, OpenBMC Maillist ","Cc":"Samuel Mendoza-Jonas ,\n\tJoel Stanley ,\n\tBenjamin Herrenschmidt ,\n\tGavin Shan , ratagupt@in.ibm.com","Subject":"[PATCH net-next v3 1/3] net/ncsi: Fix several packet definitions","Date":"Mon, 28 Aug 2017 16:18:41 +1000","Message-Id":"<20170828061843.24349-2-sam@mendozajonas.com>","X-Mailer":"git-send-email 2.14.0","In-Reply-To":"<20170828061843.24349-1-sam@mendozajonas.com>","References":"<20170828061843.24349-1-sam@mendozajonas.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Signed-off-by: Samuel Mendoza-Jonas \n---\nv2: Rebased on latest net-next\n\n net/ncsi/ncsi-cmd.c | 10 +++++-----\n net/ncsi/ncsi-pkt.h | 2 +-\n net/ncsi/ncsi-rsp.c | 3 ++-\n 3 files changed, 8 insertions(+), 7 deletions(-)","diff":"diff --git a/net/ncsi/ncsi-cmd.c b/net/ncsi/ncsi-cmd.c\nindex 5e03ed190e18..7567ca63aae2 100644\n--- a/net/ncsi/ncsi-cmd.c\n+++ b/net/ncsi/ncsi-cmd.c\n@@ -139,9 +139,9 @@ static int ncsi_cmd_handler_svf(struct sk_buff *skb,\n \tstruct ncsi_cmd_svf_pkt *cmd;\n \n \tcmd = skb_put_zero(skb, sizeof(*cmd));\n-\tcmd->vlan = htons(nca->words[0]);\n-\tcmd->index = nca->bytes[2];\n-\tcmd->enable = nca->bytes[3];\n+\tcmd->vlan = htons(nca->words[1]);\n+\tcmd->index = nca->bytes[6];\n+\tcmd->enable = nca->bytes[7];\n \tncsi_cmd_build_header(&cmd->cmd.common, nca);\n \n \treturn 0;\n@@ -153,7 +153,7 @@ static int ncsi_cmd_handler_ev(struct sk_buff *skb,\n \tstruct ncsi_cmd_ev_pkt *cmd;\n \n \tcmd = skb_put_zero(skb, sizeof(*cmd));\n-\tcmd->mode = nca->bytes[0];\n+\tcmd->mode = nca->bytes[3];\n \tncsi_cmd_build_header(&cmd->cmd.common, nca);\n \n \treturn 0;\n@@ -228,7 +228,7 @@ static struct ncsi_cmd_handler {\n \t{ NCSI_PKT_CMD_AE, 8, ncsi_cmd_handler_ae },\n \t{ NCSI_PKT_CMD_SL, 8, ncsi_cmd_handler_sl },\n \t{ NCSI_PKT_CMD_GLS, 0, ncsi_cmd_handler_default },\n-\t{ NCSI_PKT_CMD_SVF, 4, ncsi_cmd_handler_svf },\n+\t{ NCSI_PKT_CMD_SVF, 8, ncsi_cmd_handler_svf },\n \t{ NCSI_PKT_CMD_EV, 4, ncsi_cmd_handler_ev },\n \t{ NCSI_PKT_CMD_DV, 0, ncsi_cmd_handler_default },\n \t{ NCSI_PKT_CMD_SMA, 8, ncsi_cmd_handler_sma },\ndiff --git a/net/ncsi/ncsi-pkt.h b/net/ncsi/ncsi-pkt.h\nindex 3ea49ed0a935..91b4b66438df 100644\n--- a/net/ncsi/ncsi-pkt.h\n+++ b/net/ncsi/ncsi-pkt.h\n@@ -104,7 +104,7 @@ struct ncsi_cmd_svf_pkt {\n \tunsigned char index; /* VLAN table index */\n \tunsigned char enable; /* Enable or disable */\n \t__be32 checksum; /* Checksum */\n-\tunsigned char pad[14];\n+\tunsigned char pad[18];\n };\n \n /* Enable VLAN */\ndiff --git a/net/ncsi/ncsi-rsp.c b/net/ncsi/ncsi-rsp.c\nindex 087db775b3dc..c1a191d790e2 100644\n--- a/net/ncsi/ncsi-rsp.c\n+++ b/net/ncsi/ncsi-rsp.c\n@@ -354,7 +354,8 @@ static int ncsi_rsp_handler_svf(struct ncsi_request *nr)\n \n \t/* Add or remove the VLAN filter */\n \tif (!(cmd->enable & 0x1)) {\n-\t\tret = ncsi_remove_filter(nc, NCSI_FILTER_VLAN, cmd->index);\n+\t\t/* HW indexes from 1 */\n+\t\tret = ncsi_remove_filter(nc, NCSI_FILTER_VLAN, cmd->index - 1);\n \t} else {\n \t\tvlan = ntohs(cmd->vlan);\n \t\tret = ncsi_add_filter(nc, NCSI_FILTER_VLAN, &vlan);\n","prefixes":["net-next","v3","1/3"]}