aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2013-01-17 13:30:49 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-02-14 10:48:07 -0800
commit6a56fc1543efd880e4b26cb44e230328c2e97c66 (patch)
treeb096d35e2a86ae4ae22a8c4466454f69443ebec9
parentc716ba51a90f43e58aeda9cc7afb937977592ffc (diff)
macvlan: fix macvlan_get_size()
[ Upstream commit 01fe944f1024bd4e5c327ddbe8d657656b66af2f ] commit df8ef8f3aaa (macvlan: add FDB bridge ops and macvlan flags) forgot to update macvlan_get_size() after the addition of IFLA_MACVLAN_FLAGS Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: John Fastabend <john.r.fastabend@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/macvlan.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 68a43fe602e..d3fb97d97cb 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -822,7 +822,10 @@ static int macvlan_changelink(struct net_device *dev,
static size_t macvlan_get_size(const struct net_device *dev)
{
- return nla_total_size(4);
+ return (0
+ + nla_total_size(4) /* IFLA_MACVLAN_MODE */
+ + nla_total_size(2) /* IFLA_MACVLAN_FLAGS */
+ );
}
static int macvlan_fill_info(struct sk_buff *skb,