From: John Fastabend Date: Tue, 21 Jun 2011 07:34:31 +0000 (+0000) Subject: dcb: Add DCBX capabilities bitmask to the get_ieee response X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~619 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=42caefe97422b7431af295127ed2668bfcb503a2;p=users%2Fjedix%2Flinux-maple.git dcb: Add DCBX capabilities bitmask to the get_ieee response Adding the capabilities bitmask to the get_ieee response allows user space to determine the current DCBX mode. Either CEE or IEEE this is useful with devices that support switching between modes where knowing the current state is relevant. Derived from work by Mark Rustad Signed-off-by: John Fastabend Signed-off-by: David S. Miller (cherry picked from commit c7797baf9f3900996ca800ab6298f95957bb4606) Signed-off-by: Joe Jin --- diff --git a/net/dcb/dcbnl.c b/net/dcb/dcbnl.c index 3609eacaf4ce..d6a145c00234 100644 --- a/net/dcb/dcbnl.c +++ b/net/dcb/dcbnl.c @@ -1288,6 +1288,7 @@ static int dcbnl_ieee_get(struct net_device *netdev, struct nlattr **tb, struct nlattr *ieee, *app; struct dcb_app_type *itr; const struct dcbnl_rtnl_ops *ops = netdev->dcbnl_ops; + int dcbx; int err; if (!ops) @@ -1338,6 +1339,12 @@ static int dcbnl_ieee_get(struct net_device *netdev, struct nlattr **tb, } } } + + if (netdev->dcbnl_ops->getdcbx) + dcbx = netdev->dcbnl_ops->getdcbx(netdev); + else + dcbx = -EOPNOTSUPP; + spin_unlock(&dcb_lock); nla_nest_end(skb, app); @@ -1366,6 +1373,11 @@ static int dcbnl_ieee_get(struct net_device *netdev, struct nlattr **tb, } nla_nest_end(skb, ieee); + if (dcbx >= 0) { + err = nla_put_u8(skb, DCB_ATTR_DCBX, dcbx); + if (err) + goto nla_put_failure; + } nlmsg_end(skb, nlh); return rtnl_unicast(skb, &init_net, pid);