From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Fastabend Subject: [PATCH] net: dcb: fix small regression in __dcbnl_pg_setcfg() Date: Wed, 20 Jun 2012 22:56:21 -0700 Message-ID: <20120621055621.14148.42206.stgit@jf-dev1-dcblab> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, lucy.liu@intel.com, alexander.h.duyck@intel.com To: tgraf@suug.ch, davem@davemloft.net Return-path: Received: from mga02.intel.com ([134.134.136.20]:50184 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755399Ab2FUGLG (ORCPT ); Thu, 21 Jun 2012 02:11:06 -0400 Sender: netdev-owner@vger.kernel.org List-ID: A small regression was introduced in the reply command of dcbnl_pg_setcfg(). User space apps may be expecting the DCB_ATTR_PG_CFG attribute to be returned with the patch below TX or RX variants are returned. commit 7be994138b188387691322921c08e19bddf6d3c5 Author: Thomas Graf Date: Wed Jun 13 02:54:55 2012 +0000 dcbnl: Shorten all command handling functions This patch reverts this behavior and returns DCB_ATTR_PG_CFG Signed-off-by: John Fastabend --- net/dcb/dcbnl.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/net/dcb/dcbnl.c b/net/dcb/dcbnl.c index 0a36007..013da86 100644 --- a/net/dcb/dcbnl.c +++ b/net/dcb/dcbnl.c @@ -852,8 +852,7 @@ static int __dcbnl_pg_setcfg(struct net_device *netdev, struct nlmsghdr *nlh, } } - return nla_put_u8(skb, - (dir ? DCB_CMD_PGRX_SCFG : DCB_CMD_PGTX_SCFG), 0); + return nla_put_u8(skb, DCB_ATTR_PG_CFG, 0); } static int dcbnl_pgtx_setcfg(struct net_device *netdev, struct nlmsghdr *nlh,