lkml.org 
[lkml]   [2014]   [Apr]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] bridge: simplify a br_multicast_query_received() function call
    Date
    The call from the IPv6 part can be simplified as the beginning of the
    calling function ensures that we end up here when having a proper IPv6
    source address only.

    Introduced by 6565b9eeef194afbb3beec80d6dd2447f4091f8c
    ("bridge: multicast: add sanity check for query source addresses")

    Reported-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
    Signed-off-by: Linus Lüssing <linus.luessing@web.de>
    ---
    net/bridge/br_multicast.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
    index 7b757b5..d2c3aae 100644
    --- a/net/bridge/br_multicast.c
    +++ b/net/bridge/br_multicast.c
    @@ -1282,8 +1282,7 @@ static int br_ip6_multicast_query(struct net_bridge *br,
    goto out;
    }

    - br_multicast_query_received(br, port, &br->ip6_querier,
    - !ipv6_addr_any(&ip6h->saddr),
    + br_multicast_query_received(br, port, &br->ip6_querier, 1,
    is_general_query, max_delay);

    if (!group)
    --
    1.7.10.4
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2014-04-21 21:21    [W:6.982 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site