From ce666a44a1a0a85c63cc608facc0bb18f8123d4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?YOSHIFUJI=20Hideaki=20/=20=E5=90=89=E8=97=A4=E8=8B=B1?= =?UTF-8?q?=E6=98=8E?= Date: Tue, 29 Jan 2013 12:48:23 +0000 Subject: [PATCH] --- yaml --- r: 351999 b: refs/heads/master c: 07c2fecc363c8f94a0bd2fdf9b7209ec6f5a0ab5 h: refs/heads/master i: 351997: 8082da7cebb9dc42033acdb9a2ebdc86cd32ec57 351995: bf25b36f48643eca87af7097eb7d0cd700799ea7 351991: 32c8afce41eeb71e2800dd53f592b722d4465b02 351983: 0832a97ee53bd79afa0f93ab06cb6e02816899d7 351967: 8f9d9d66b6069f60a0f3ea79317b070a53dfe24a 351935: 034ff25909f71ddc7696c9e3eb2261222e3b8a7b 351871: 585e11d4710644de338241357bbca37be084fcbc 351743: b06b4f0dccb748980b8323472394f4a899ec3825 v: v3 --- [refs] | 2 +- trunk/net/ipv6/mcast.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index cb0b87bfdb5e..44a7416e1e2c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b53c47dd4fdb3f062c07b1ba8a7f9f80237be182 +refs/heads/master: 07c2fecc363c8f94a0bd2fdf9b7209ec6f5a0ab5 diff --git a/trunk/net/ipv6/mcast.c b/trunk/net/ipv6/mcast.c index f25002aaf624..8460a1f54a76 100644 --- a/trunk/net/ipv6/mcast.c +++ b/trunk/net/ipv6/mcast.c @@ -376,8 +376,7 @@ int ip6_mc_source(int add, int omode, struct sock *sk, goto done; /* err = -EADDRNOTAVAIL */ rv = !0; for (i=0; isl_count; i++) { - rv = memcmp(&psl->sl_addr[i], source, - sizeof(struct in6_addr)); + rv = !ipv6_addr_equal(&psl->sl_addr[i], source); if (rv == 0) break; } @@ -427,7 +426,7 @@ int ip6_mc_source(int add, int omode, struct sock *sk, } rv = 1; /* > 0 for insert logic below if sl_count is 0 */ for (i=0; isl_count; i++) { - rv = memcmp(&psl->sl_addr[i], source, sizeof(struct in6_addr)); + rv = !ipv6_addr_equal(&psl->sl_addr[i], source); if (rv == 0) break; }