summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAnish Bhatt <anish@chelsio.com>2014-07-16 22:32:39 -0700
committerDavid S. Miller <davem@davemloft.net>2014-07-17 16:02:29 -0700
commitc2659479f7865fb538493089bce3dd3d2abf90b0 (patch)
treebe1dbef19fbeb971a8a6445536d80f1a163fe465 /net
parent9cc63db5e1f2f1c387f1a4c9983cf1364fe4ef95 (diff)
downloadlinux-stable-c2659479f7865fb538493089bce3dd3d2abf90b0.tar.gz
linux-stable-c2659479f7865fb538493089bce3dd3d2abf90b0.tar.bz2
linux-stable-c2659479f7865fb538493089bce3dd3d2abf90b0.zip
Update setapp/getapp prototypes in dcbnl_rtnl_ops to return int instead of u8
v2: fixed issue with checking return of dcbnl_rtnl_ops->getapp() Signed-off-by: Anish Bhatt <anish@chelsio.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/dcb/dcbnl.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/net/dcb/dcbnl.c b/net/dcb/dcbnl.c
index f8b98d89c285..c34af7a1d2d4 100644
--- a/net/dcb/dcbnl.c
+++ b/net/dcb/dcbnl.c
@@ -471,7 +471,11 @@ static int dcbnl_getapp(struct net_device *netdev, struct nlmsghdr *nlh,
id = nla_get_u16(app_tb[DCB_APP_ATTR_ID]);
if (netdev->dcbnl_ops->getapp) {
- up = netdev->dcbnl_ops->getapp(netdev, idtype, id);
+ ret = netdev->dcbnl_ops->getapp(netdev, idtype, id);
+ if (ret < 0)
+ return ret;
+ else
+ up = ret;
} else {
struct dcb_app app = {
.selector = idtype,
@@ -538,6 +542,8 @@ static int dcbnl_setapp(struct net_device *netdev, struct nlmsghdr *nlh,
if (netdev->dcbnl_ops->setapp) {
ret = netdev->dcbnl_ops->setapp(netdev, idtype, id, up);
+ if (ret < 0)
+ return ret;
} else {
struct dcb_app app;
app.selector = idtype;