lkml.org 
[lkml]   [2013]   [Feb]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 47/81] macvlan: fix macvlan_get_size()
    Date
    3.5.7.6 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Eric Dumazet <edumazet@google.com>

    commit 01fe944f1024bd4e5c327ddbe8d657656b66af2f upstream.

    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: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
    ---
    drivers/net/macvlan.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
    index 66a9bfe..62ce7b8 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,
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2013-02-19 21:22    [W:4.995 / U:1.504 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site