diff for duplicates of <4DB6400B.7070307@cn.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index 17a0fba..3ff65c0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -135,8 +135,8 @@ index 5adf585..cc9ea37 100644 - if (!laddr->valid) + if (!laddr->valid || (laddr->state != SCTP_ADDR_SRC)) continue; -- if ((laddr->state = SCTP_ADDR_SRC) && -- (laddr->a.sa.sa_family = AF_INET6) && +- if ((laddr->state == SCTP_ADDR_SRC) && +- (laddr->a.sa.sa_family == AF_INET6) && - (scope <= sctp_scope(&laddr->a))) { - bmatchlen = sctp_v6_addr_match_len(daddr, - &laddr->a); @@ -146,7 +146,7 @@ index 5adf585..cc9ea37 100644 - } + + /* Do not compare against v4 addrs */ -+ if ((laddr->a.sa.sa_family = AF_INET6) && ++ if ((laddr->a.sa.sa_family == AF_INET6) && + (sctp_v6_cmp_addr(&dst_saddr, &laddr->a))) { + rcu_read_unlock(); + goto out; @@ -170,8 +170,8 @@ index 5adf585..cc9ea37 100644 + list_for_each_entry_rcu(laddr, &bp->address_list, list) { + if (!laddr->valid) + continue; -+ if ((laddr->state = SCTP_ADDR_SRC) && -+ (laddr->a.sa.sa_family = AF_INET6) && ++ if ((laddr->state == SCTP_ADDR_SRC) && ++ (laddr->a.sa.sa_family == AF_INET6) && + (scope <= sctp_scope(&laddr->a))) { + bmatchlen = sctp_v6_addr_match_len(daddr, &laddr->a); + if (!baddr || (matchlen < bmatchlen)) { @@ -243,8 +243,8 @@ index 5adf585..cc9ea37 100644 - list_for_each_entry_rcu(laddr, &bp->address_list, list) { - if (!laddr->valid) - continue; -- if ((laddr->state = SCTP_ADDR_SRC) && -- (laddr->a.sa.sa_family = AF_INET6) && +- if ((laddr->state == SCTP_ADDR_SRC) && +- (laddr->a.sa.sa_family == AF_INET6) && - (scope <= sctp_scope(&laddr->a))) { - bmatchlen = sctp_v6_addr_match_len(daddr, &laddr->a); - if (!baddr || (matchlen < bmatchlen)) { @@ -359,8 +359,8 @@ index d5bf91d..7be5df6 100644 @@ -533,9 +535,9 @@ static struct dst_entry *sctp_v4_get_dst(struct sctp_association *asoc, continue; - if ((laddr->state = SCTP_ADDR_SRC) && - (AF_INET = laddr->a.sa.sa_family)) { + if ((laddr->state == SCTP_ADDR_SRC) && + (AF_INET == laddr->a.sa.sa_family)) { - fl4.saddr = laddr->a.v4.sin_addr.s_addr; - fl4.fl4_sport = laddr->a.v4.sin_port; - rt = ip_route_output_key(&init_net, &fl4); @@ -399,7 +399,8 @@ index f694ee1..33d9ee6 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -2287,7 +2287,7 @@ static int sctp_apply_peer_addr_params(struct sctp_paddrparams *params, - trans->param_flags (trans->param_flags & ~SPP_PMTUD) | pmtud_change; + trans->param_flags = + (trans->param_flags & ~SPP_PMTUD) | pmtud_change; if (update) { - sctp_transport_pmtu(trans); + sctp_transport_pmtu(trans, sctp_opt2sk(sp)); diff --git a/a/content_digest b/N1/content_digest index 5de4857..133f63f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\04DB63F85.2090609@cn.fujitsu.com\0" "From\0Wei Yongjun <yjwei@cn.fujitsu.com>\0" - "Subject\0[PATCH net-next-2.6 2/7] sctp: cache the ipv6 source after route\0" - "Date\0Tue, 26 Apr 2011 03:46:19 +0000\0" + "Subject\0[PATCH net-next-2.6 2/7] sctp: cache the ipv6 source after route lookup\0" + "Date\0Tue, 26 Apr 2011 11:46:19 +0800\0" "To\0David Miller <davem@davemloft.net>\0" "Cc\0netdev@vger.kernel.org <netdev@vger.kernel.org>" " lksctp <linux-sctp@vger.kernel.org>\0" @@ -144,8 +144,8 @@ "-\t\t\tif (!laddr->valid)\n" "+\t\t\tif (!laddr->valid || (laddr->state != SCTP_ADDR_SRC))\n" " \t\t\t\tcontinue;\n" - "-\t\t\tif ((laddr->state = SCTP_ADDR_SRC) &&\n" - "-\t\t\t (laddr->a.sa.sa_family = AF_INET6) &&\n" + "-\t\t\tif ((laddr->state == SCTP_ADDR_SRC) &&\n" + "-\t\t\t (laddr->a.sa.sa_family == AF_INET6) &&\n" "-\t\t\t (scope <= sctp_scope(&laddr->a))) {\n" "-\t\t\t\tbmatchlen = sctp_v6_addr_match_len(daddr,\n" "-\t\t\t\t\t\t\t\t &laddr->a);\n" @@ -155,7 +155,7 @@ "-\t\t\t\t}\n" "+\n" "+\t\t\t/* Do not compare against v4 addrs */\n" - "+\t\t\tif ((laddr->a.sa.sa_family = AF_INET6) &&\n" + "+\t\t\tif ((laddr->a.sa.sa_family == AF_INET6) &&\n" "+\t\t\t (sctp_v6_cmp_addr(&dst_saddr, &laddr->a))) {\n" "+\t\t\t\trcu_read_unlock();\n" "+\t\t\t\tgoto out;\n" @@ -179,8 +179,8 @@ "+\tlist_for_each_entry_rcu(laddr, &bp->address_list, list) {\n" "+\t\tif (!laddr->valid)\n" "+\t\t\tcontinue;\n" - "+\t\tif ((laddr->state = SCTP_ADDR_SRC) &&\n" - "+\t\t (laddr->a.sa.sa_family = AF_INET6) &&\n" + "+\t\tif ((laddr->state == SCTP_ADDR_SRC) &&\n" + "+\t\t (laddr->a.sa.sa_family == AF_INET6) &&\n" "+\t\t (scope <= sctp_scope(&laddr->a))) {\n" "+\t\t\tbmatchlen = sctp_v6_addr_match_len(daddr, &laddr->a);\n" "+\t\t\tif (!baddr || (matchlen < bmatchlen)) {\n" @@ -252,8 +252,8 @@ "-\tlist_for_each_entry_rcu(laddr, &bp->address_list, list) {\n" "-\t\tif (!laddr->valid)\n" "-\t\t\tcontinue;\n" - "-\t\tif ((laddr->state = SCTP_ADDR_SRC) &&\n" - "-\t\t (laddr->a.sa.sa_family = AF_INET6) &&\n" + "-\t\tif ((laddr->state == SCTP_ADDR_SRC) &&\n" + "-\t\t (laddr->a.sa.sa_family == AF_INET6) &&\n" "-\t\t (scope <= sctp_scope(&laddr->a))) {\n" "-\t\t\tbmatchlen = sctp_v6_addr_match_len(daddr, &laddr->a);\n" "-\t\t\tif (!baddr || (matchlen < bmatchlen)) {\n" @@ -368,8 +368,8 @@ " \n" "@@ -533,9 +535,9 @@ static struct dst_entry *sctp_v4_get_dst(struct sctp_association *asoc,\n" " \t\t\tcontinue;\n" - " \t\tif ((laddr->state = SCTP_ADDR_SRC) &&\n" - " \t\t (AF_INET = laddr->a.sa.sa_family)) {\n" + " \t\tif ((laddr->state == SCTP_ADDR_SRC) &&\n" + " \t\t (AF_INET == laddr->a.sa.sa_family)) {\n" "-\t\t\tfl4.saddr = laddr->a.v4.sin_addr.s_addr;\n" "-\t\t\tfl4.fl4_sport = laddr->a.v4.sin_port;\n" "-\t\t\trt = ip_route_output_key(&init_net, &fl4);\n" @@ -408,7 +408,8 @@ "--- a/net/sctp/socket.c\n" "+++ b/net/sctp/socket.c\n" "@@ -2287,7 +2287,7 @@ static int sctp_apply_peer_addr_params(struct sctp_paddrparams *params,\n" - " \t\t\ttrans->param_flags \t\t\t\t(trans->param_flags & ~SPP_PMTUD) | pmtud_change;\n" + " \t\t\ttrans->param_flags =\n" + " \t\t\t\t(trans->param_flags & ~SPP_PMTUD) | pmtud_change;\n" " \t\t\tif (update) {\n" "-\t\t\t\tsctp_transport_pmtu(trans);\n" "+\t\t\t\tsctp_transport_pmtu(trans, sctp_opt2sk(sp));\n" @@ -460,4 +461,4 @@ "-- \n" 1.6.5.2 -801eb55c0641675a42829888602d9b7300648e27448011d250b78eb8b5edfac2 +425b6ff44e96c2409ba081904fd46bd16fdbb6ee7a3af2e400fe1bb71a9bb580
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.