lkml.org 
[lkml]   [2013]   [Jul]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 46/75] bridge: fix switched interval for MLD Query types
    Date
    3.8.13.6 -stable review patch.  If anyone has any objections, please let me know.

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

    From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@web.de>

    [ Upstream commit 32de868cbc6bee010d2cee95b5071b25ecbec8c3 ]

    General Queries (the one with the Multicast Address field
    set to zero / '::') are supposed to have a Maximum Response Delay
    of [Query Response Interval], while for Multicast-Address-Specific
    Queries it is [Last Listener Query Interval] - not the other way
    round. (see RFC2710, section 7.3+7.8)

    Signed-off-by: Linus Lüssing <linus.luessing@web.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    net/bridge/br_multicast.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
    index 6d6f265..155bc05 100644
    --- a/net/bridge/br_multicast.c
    +++ b/net/bridge/br_multicast.c
    @@ -458,8 +458,9 @@ static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge *br,
    skb_set_transport_header(skb, skb->len);
    mldq = (struct mld_msg *) icmp6_hdr(skb);

    - interval = ipv6_addr_any(group) ? br->multicast_last_member_interval :
    - br->multicast_query_response_interval;
    + interval = ipv6_addr_any(group) ?
    + br->multicast_query_response_interval :
    + br->multicast_last_member_interval;

    mldq->mld_type = ICMPV6_MGM_QUERY;
    mldq->mld_code = 0;
    --
    1.8.1.2
    --
    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: 2013-07-30 21:41    [W:4.394 / U:0.908 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site