summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Fastabend <john.r.fastabend@intel.com>2012-06-20 21:56:21 +0200
committerDavid S. Miller <davem@davemloft.net>2012-06-22 00:06:00 +0200
commitbb1dfefdc62fa68107c4c9f1374cb856743a9434 (patch)
treec99e17b49d9f0a95720a1300d12dd0279f0cdbf2
parentixgbe: simplify padding and length checks (diff)
downloadlinux-bb1dfefdc62fa68107c4c9f1374cb856743a9434.tar.xz
linux-bb1dfefdc62fa68107c4c9f1374cb856743a9434.zip
net: dcb: fix small regression in __dcbnl_pg_setcfg()
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 <tgraf@suug.ch> 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 <john.r.fastabend@intel.com> Acked-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/dcb/dcbnl.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/dcb/dcbnl.c b/net/dcb/dcbnl.c
index 0a360072cfec..013da86575e8 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,