macvlan: fix macvlan_get_size()

edumazet · davem330 · commit 01fe944f1024 · 2013-01-17T16:40:35.000-05:00
commit df8ef8f (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>
diff --git 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,

Original file line number	Diff line number	Diff line change
`@@ -822,7 +822,10 @@ static int macvlan_changelink(struct net_device *dev,`
`822`	`822`
`823`	`823`	`static size_t macvlan_get_size(const struct net_device *dev)`
`824`	`824`	`{`
`825`		`- return nla_total_size(4);`
	`825`	`+ return (0`
	`826`	`+ + nla_total_size(4) /* IFLA_MACVLAN_MODE */`
	`827`	`+ + nla_total_size(2) /* IFLA_MACVLAN_FLAGS */`
	`828`	`+ );`
`826`	`829`	`}`
`827`	`830`
`828`	`831`	`static int macvlan_fill_info(struct sk_buff *skb,`