From: Dan Carpenter <dan.carpenter@oracle•com>
To: Jay Vosburgh <fubar@us•ibm.com>
Cc: Veaceslav Falico <vfalico@redhat•com>,
Andy Gospodarek <andy@greyhouse•net>,
netdev@vger•kernel.org, kernel-janitors@vger•kernel.org,
Jiri Pirko <jiri@resnulli•us>
Subject: [patch -next] bonding: bond_get_size() returns wrong size
Date: Fri, 1 Nov 2013 13:18:44 +0300 [thread overview]
Message-ID: <20131101101844.GA29795@longonot.mountain> (raw)
There is an extra semi-colon so bond_get_size() doesn't return the
correct value.
Fixes: ec76aa49855f ('bonding: add Netlink support active_slave option')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle•com>
diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
index 7661261..40e7b1c 100644
--- a/drivers/net/bonding/bond_netlink.c
+++ b/drivers/net/bonding/bond_netlink.c
@@ -82,8 +82,8 @@ static int bond_newlink(struct net *src_net, struct net_device *bond_dev,
static size_t bond_get_size(const struct net_device *bond_dev)
{
- return nla_total_size(sizeof(u8)); /* IFLA_BOND_MODE */
- + nla_total_size(sizeof(u32)); /* IFLA_BOND_ACTIVE_SLAVE */
+ return nla_total_size(sizeof(u8)) + /* IFLA_BOND_MODE */
+ nla_total_size(sizeof(u32)); /* IFLA_BOND_ACTIVE_SLAVE */
}
static int bond_fill_info(struct sk_buff *skb,
next reply other threads:[~2013-11-01 10:18 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-01 10:18 Dan Carpenter [this message]
2013-11-01 10:41 ` [patch -next] bonding: bond_get_size() returns wrong size Veaceslav Falico
2013-11-01 10:52 ` Eric Dumazet
2013-11-01 11:35 ` Jiri Pirko
2013-11-01 12:25 ` Nikolay Aleksandrov
2013-11-01 12:30 ` walter harms
2013-11-02 6:09 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131101101844.GA29795@longonot.mountain \
--to=dan.carpenter@oracle$(echo .)com \
--cc=andy@greyhouse$(echo .)net \
--cc=fubar@us$(echo .)ibm.com \
--cc=jiri@resnulli$(echo .)us \
--cc=kernel-janitors@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=vfalico@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox