summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2013-01-17 13:30:49 -0800
committerDavid S. Miller <davem@davemloft.net>2013-01-17 16:40:35 -0500
commit01fe944f1024bd4e5c327ddbe8d657656b66af2f (patch)
tree650bdace0284fc3460477b83f8d7ec69b58033b5
parentc3745ead19ad148c57f606a0dbaee1d21214f3f7 (diff)
downloadtalos-op-linux-01fe944f1024bd4e5c327ddbe8d657656b66af2f.tar.gz
talos-op-linux-01fe944f1024bd4e5c327ddbe8d657656b66af2f.zip
macvlan: fix macvlan_get_size()
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>
-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 68a43fe602e7..d3fb97d97cbc 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,
OpenPOWER on IntegriCloud