diff for duplicates of <87d333q2v7.fsf_-_@xmission.com> diff --git a/a/1.txt b/N1/1.txt index a376344..d46e0ec 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -184,7 +184,7 @@ index 4ece451..a85ce4b 100644 goto out; @@ -87,7 +87,7 @@ int sctp_bind_addr_copy(struct sctp_bind_addr *dest, */ - if (list_empty(&dest->address_list) && (SCTP_SCOPE_GLOBAL = scope)) { + if (list_empty(&dest->address_list) && (SCTP_SCOPE_GLOBAL == scope)) { list_for_each_entry(addr, &src->address_list, list) { - error = sctp_copy_one_addr(dest, &addr->a, + error = sctp_copy_one_addr(net, dest, &addr->a, @@ -241,7 +241,7 @@ index 2165a7e..bbf1534 100644 list_for_each_entry_safe(addr, temp, - &sctp_local_addr_list, list) { + &net->sctp.local_addr_list, list) { - if (addr->a.sa.sa_family = AF_INET6 && + if (addr->a.sa.sa_family == AF_INET6 && ipv6_addr_equal(&addr->a.v6.sin6_addr, &ifa->addr)) { - sctp_addr_wq_mgmt(addr, SCTP_ADDR_DEL); @@ -337,9 +337,9 @@ index 1f89c4e..291e682 100644 goto free_next; in6 = (struct in6_addr *)&addrw->a.v6.sin6_addr; -- if (ipv6_chk_addr(&init_net, in6, NULL, 0) = 0 && -+ if (ipv6_chk_addr(net, in6, NULL, 0) = 0 && - addrw->state = SCTP_ADDR_NEW) { +- if (ipv6_chk_addr(&init_net, in6, NULL, 0) == 0 && ++ if (ipv6_chk_addr(net, in6, NULL, 0) == 0 && + addrw->state == SCTP_ADDR_NEW) { unsigned long timeo_val; @@ -656,12 +657,12 @@ void sctp_addr_wq_timeout_handler(unsigned long arg) @@ -397,7 +397,7 @@ index 1f89c4e..291e682 100644 + list_for_each_entry(addrw, &net->sctp.addr_waitq, list) { if (addrw->a.sa.sa_family != addr->a.sa.sa_family) continue; - if (addrw->a.sa.sa_family = AF_INET) { + if (addrw->a.sa.sa_family == AF_INET) { @@ -719,7 +721,7 @@ static struct sctp_sockaddr_entry *sctp_addr_wq_lookup(struct sctp_sockaddr_entr return NULL; } @@ -430,7 +430,7 @@ index 1f89c4e..291e682 100644 /* OK, we have to add the new address to the wait queue */ addrw = kmemdup(addr, sizeof(struct sctp_sockaddr_entry), GFP_ATOMIC); - if (addrw = NULL) { + if (addrw == NULL) { - spin_unlock_bh(&sctp_addr_wq_lock); + spin_unlock_bh(&net->sctp.addr_wq_lock); return; @@ -487,8 +487,8 @@ index 1f89c4e..291e682 100644 list_for_each_entry_safe(addr, temp, - &sctp_local_addr_list, list) { + &net->sctp.local_addr_list, list) { - if (addr->a.sa.sa_family = AF_INET && - addr->a.v4.sin_addr.s_addr = + if (addr->a.sa.sa_family == AF_INET && + addr->a.v4.sin_addr.s_addr == ifa->ifa_local) { - sctp_addr_wq_mgmt(addr, SCTP_ADDR_DEL); + sctp_addr_wq_mgmt(net, addr, SCTP_ADDR_DEL); diff --git a/a/content_digest b/N1/content_digest index bc217ed..2615ced 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\087zk67q31q.fsf_-_@xmission.com\0" "From\0ebiederm@xmission.com (Eric W. Biederman)\0" "Subject\0[PATCH net-next 4/9] sctp: Make the address lists per network namespace\0" - "Date\0Mon, 06 Aug 2012 18:42:04 +0000\0" + "Date\0Mon, 06 Aug 2012 11:42:04 -0700\0" "To\0David Miller <davem@davemloft.net>\0" "Cc\0Vlad Yasevich <vyasevich@gmail.com>" linux-sctp@vger.kernel.org @@ -202,7 +202,7 @@ " \t\t\tgoto out;\n" "@@ -87,7 +87,7 @@ int sctp_bind_addr_copy(struct sctp_bind_addr *dest,\n" " \t */\n" - " \tif (list_empty(&dest->address_list) && (SCTP_SCOPE_GLOBAL = scope)) {\n" + " \tif (list_empty(&dest->address_list) && (SCTP_SCOPE_GLOBAL == scope)) {\n" " \t\tlist_for_each_entry(addr, &src->address_list, list) {\n" "-\t\t\terror = sctp_copy_one_addr(dest, &addr->a,\n" "+\t\t\terror = sctp_copy_one_addr(net, dest, &addr->a,\n" @@ -259,7 +259,7 @@ " \t\tlist_for_each_entry_safe(addr, temp,\n" "-\t\t\t\t\t&sctp_local_addr_list, list) {\n" "+\t\t\t\t\t&net->sctp.local_addr_list, list) {\n" - " \t\t\tif (addr->a.sa.sa_family = AF_INET6 &&\n" + " \t\t\tif (addr->a.sa.sa_family == AF_INET6 &&\n" " \t\t\t\t\tipv6_addr_equal(&addr->a.v6.sin6_addr,\n" " \t\t\t\t\t\t&ifa->addr)) {\n" "-\t\t\t\tsctp_addr_wq_mgmt(addr, SCTP_ADDR_DEL);\n" @@ -355,9 +355,9 @@ " \t\t\t\tgoto free_next;\n" " \n" " \t\t\tin6 = (struct in6_addr *)&addrw->a.v6.sin6_addr;\n" - "-\t\t\tif (ipv6_chk_addr(&init_net, in6, NULL, 0) = 0 &&\n" - "+\t\t\tif (ipv6_chk_addr(net, in6, NULL, 0) = 0 &&\n" - " \t\t\t addrw->state = SCTP_ADDR_NEW) {\n" + "-\t\t\tif (ipv6_chk_addr(&init_net, in6, NULL, 0) == 0 &&\n" + "+\t\t\tif (ipv6_chk_addr(net, in6, NULL, 0) == 0 &&\n" + " \t\t\t addrw->state == SCTP_ADDR_NEW) {\n" " \t\t\t\tunsigned long timeo_val;\n" " \n" "@@ -656,12 +657,12 @@ void sctp_addr_wq_timeout_handler(unsigned long arg)\n" @@ -415,7 +415,7 @@ "+\tlist_for_each_entry(addrw, &net->sctp.addr_waitq, list) {\n" " \t\tif (addrw->a.sa.sa_family != addr->a.sa.sa_family)\n" " \t\t\tcontinue;\n" - " \t\tif (addrw->a.sa.sa_family = AF_INET) {\n" + " \t\tif (addrw->a.sa.sa_family == AF_INET) {\n" "@@ -719,7 +721,7 @@ static struct sctp_sockaddr_entry *sctp_addr_wq_lookup(struct sctp_sockaddr_entr\n" " \treturn NULL;\n" " }\n" @@ -448,7 +448,7 @@ " \n" " \t/* OK, we have to add the new address to the wait queue */\n" " \taddrw = kmemdup(addr, sizeof(struct sctp_sockaddr_entry), GFP_ATOMIC);\n" - " \tif (addrw = NULL) {\n" + " \tif (addrw == NULL) {\n" "-\t\tspin_unlock_bh(&sctp_addr_wq_lock);\n" "+\t\tspin_unlock_bh(&net->sctp.addr_wq_lock);\n" " \t\treturn;\n" @@ -505,8 +505,8 @@ " \t\tlist_for_each_entry_safe(addr, temp,\n" "-\t\t\t\t\t&sctp_local_addr_list, list) {\n" "+\t\t\t\t\t&net->sctp.local_addr_list, list) {\n" - " \t\t\tif (addr->a.sa.sa_family = AF_INET &&\n" - " \t\t\t\t\taddr->a.v4.sin_addr.s_addr =\n" + " \t\t\tif (addr->a.sa.sa_family == AF_INET &&\n" + " \t\t\t\t\taddr->a.v4.sin_addr.s_addr ==\n" " \t\t\t\t\tifa->ifa_local) {\n" "-\t\t\t\tsctp_addr_wq_mgmt(addr, SCTP_ADDR_DEL);\n" "+\t\t\t\tsctp_addr_wq_mgmt(net, addr, SCTP_ADDR_DEL);\n" @@ -662,4 +662,4 @@ "-- \n" 1.7.5.4 -309aeca109126297948dea32ffcc2216afd6b77a79bd7fd4403e7de2b8d8bc21 +51be8a6e9aee725afaae811524fb9e6e10dd199bd38161cc088d84af63c22559
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.