]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
net: dcb: fix small regression in __dcbnl_pg_setcfg()
authorJohn Fastabend <john.r.fastabend@intel.com>
Wed, 20 Jun 2012 19:56:21 +0000 (19:56 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 21 Jun 2012 22:06:00 +0000 (15:06 -0700)
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>
net/dcb/dcbnl.c

index 0a360072cfec463bb52c8912bbb545a67148201d..013da86575e848bbb3435bb8125b5d1d75854787 100644 (file)
@@ -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,