diff for duplicates of <5212343B.3090409@gmail.com> diff --git a/a/1.txt b/N1/1.txt index faab921..1e758e5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -127,27 +127,27 @@ all. You are un-fixing it... > + const union inet_addr *addr2) > { > if (addr1->sa.sa_family != addr2->sa.sa_family) { -> if (addr1->sa.sa_family = AF_INET && -> addr2->sa.sa_family = AF_INET6 && +> if (addr1->sa.sa_family == AF_INET && +> addr2->sa.sa_family == AF_INET6 && > - ipv6_addr_v4mapped(&addr2->v6.sin6_addr)) { -> - if (addr2->v6.sin6_port = addr1->v4.sin_port && -> - addr2->v6.sin6_addr.s6_addr32[3] = +> - if (addr2->v6.sin6_port == addr1->v4.sin_port && +> - addr2->v6.sin6_addr.s6_addr32[3] == > - addr1->v4.sin_addr.s_addr) > + ipv6_addr_v4mapped(&addr2->sin6.sin6_addr)) { -> + if (addr2->sin6.sin6_port = addr1->sin.sin_port && -> + addr2->sin6.sin6_addr.s6_addr32[3] = +> + if (addr2->sin6.sin6_port == addr1->sin.sin_port && +> + addr2->sin6.sin6_addr.s6_addr32[3] == > + addr1->sin.sin_addr.s_addr) > return 1; > } -> if (addr2->sa.sa_family = AF_INET && -> addr1->sa.sa_family = AF_INET6 && +> if (addr2->sa.sa_family == AF_INET && +> addr1->sa.sa_family == AF_INET6 && > - ipv6_addr_v4mapped(&addr1->v6.sin6_addr)) { -> - if (addr1->v6.sin6_port = addr2->v4.sin_port && -> - addr1->v6.sin6_addr.s6_addr32[3] = +> - if (addr1->v6.sin6_port == addr2->v4.sin_port && +> - addr1->v6.sin6_addr.s6_addr32[3] == > - addr2->v4.sin_addr.s_addr) > + ipv6_addr_v4mapped(&addr1->sin6.sin6_addr)) { -> + if (addr1->sin6.sin6_port = addr2->sin.sin_port && -> + addr1->sin6.sin6_addr.s6_addr32[3] = +> + if (addr1->sin6.sin6_port == addr2->sin.sin_port && +> + addr1->sin6.sin6_addr.s6_addr32[3] == > + addr2->sin.sin_addr.s_addr) > return 1; > } diff --git a/a/content_digest b/N1/content_digest index 60bd8c3..c181969 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01376907278-26377-9-git-send-email-amwang@redhat.com\0" "From\0Vlad Yasevich <vyasevich@gmail.com>\0" "Subject\0Re: [Patch net-next v3 8/9] sctp: use generic union inet_addr\0" - "Date\0Mon, 19 Aug 2013 15:05:31 +0000\0" + "Date\0Mon, 19 Aug 2013 11:05:31 -0400\0" "To\0Cong Wang <amwang@redhat.com>\0" "Cc\0netdev@vger.kernel.org" David S. Miller <davem@davemloft.net> @@ -140,27 +140,27 @@ "> +\t\t\t const union inet_addr *addr2)\n" "> {\n" "> \tif (addr1->sa.sa_family != addr2->sa.sa_family) {\n" - "> \t\tif (addr1->sa.sa_family = AF_INET &&\n" - "> \t\t addr2->sa.sa_family = AF_INET6 &&\n" + "> \t\tif (addr1->sa.sa_family == AF_INET &&\n" + "> \t\t addr2->sa.sa_family == AF_INET6 &&\n" "> -\t\t ipv6_addr_v4mapped(&addr2->v6.sin6_addr)) {\n" - "> -\t\t\tif (addr2->v6.sin6_port = addr1->v4.sin_port &&\n" - "> -\t\t\t addr2->v6.sin6_addr.s6_addr32[3] =\n" + "> -\t\t\tif (addr2->v6.sin6_port == addr1->v4.sin_port &&\n" + "> -\t\t\t addr2->v6.sin6_addr.s6_addr32[3] ==\n" "> -\t\t\t addr1->v4.sin_addr.s_addr)\n" "> +\t\t ipv6_addr_v4mapped(&addr2->sin6.sin6_addr)) {\n" - "> +\t\t\tif (addr2->sin6.sin6_port = addr1->sin.sin_port &&\n" - "> +\t\t\t addr2->sin6.sin6_addr.s6_addr32[3] =\n" + "> +\t\t\tif (addr2->sin6.sin6_port == addr1->sin.sin_port &&\n" + "> +\t\t\t addr2->sin6.sin6_addr.s6_addr32[3] ==\n" "> +\t\t\t addr1->sin.sin_addr.s_addr)\n" "> \t\t\t\treturn 1;\n" "> \t\t}\n" - "> \t\tif (addr2->sa.sa_family = AF_INET &&\n" - "> \t\t addr1->sa.sa_family = AF_INET6 &&\n" + "> \t\tif (addr2->sa.sa_family == AF_INET &&\n" + "> \t\t addr1->sa.sa_family == AF_INET6 &&\n" "> -\t\t ipv6_addr_v4mapped(&addr1->v6.sin6_addr)) {\n" - "> -\t\t\tif (addr1->v6.sin6_port = addr2->v4.sin_port &&\n" - "> -\t\t\t addr1->v6.sin6_addr.s6_addr32[3] =\n" + "> -\t\t\tif (addr1->v6.sin6_port == addr2->v4.sin_port &&\n" + "> -\t\t\t addr1->v6.sin6_addr.s6_addr32[3] ==\n" "> -\t\t\t addr2->v4.sin_addr.s_addr)\n" "> +\t\t ipv6_addr_v4mapped(&addr1->sin6.sin6_addr)) {\n" - "> +\t\t\tif (addr1->sin6.sin6_port = addr2->sin.sin_port &&\n" - "> +\t\t\t addr1->sin6.sin6_addr.s6_addr32[3] =\n" + "> +\t\t\tif (addr1->sin6.sin6_port == addr2->sin.sin_port &&\n" + "> +\t\t\t addr1->sin6.sin6_addr.s6_addr32[3] ==\n" "> +\t\t\t addr2->sin.sin_addr.s_addr)\n" "> \t\t\t\treturn 1;\n" "> \t\t}\n" @@ -200,4 +200,4 @@ "\n" -vlad -21e2ecbdcea278a9cc1fb064b9787bc436a8d97eb2aba5cec440f0f4e2dfd68d +bb24b3db6ac6319fef43fd4fc3517873638151dd906686fffa24e13cd79bb8b0
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.