diff options
author | fan.du <fan.du@windriver.com> | 2013-08-01 22:45:13 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-08-02 15:36:00 -0400 |
commit | d27fc78208b53ccdfd6a57d4ac44a459ca66806f (patch) | |
tree | 700f653b85cac0da64bdcbfb86021a4da07cd3d9 /include/net | |
parent | ba5082c71476891623757956ebfc36040ac317e2 (diff) |
sctp: Don't lookup dst if transport dst is still valid
When sctp sits on IPv6, sctp_transport_dst_check pass cookie as ZERO,
as a result ip6_dst_check always fail out. This behaviour makes
transport->dst useless, because every sctp_packet_transmit must look
for valid dst.
Add a dst_cookie into sctp_transport, and set the cookie whenever we
get new dst for sctp_transport. So dst validness could be checked
against it.
Since I have split genid for IPv4 and IPv6, also delete/add IPv6 address
will also bump IPv6 genid. So issues we discussed in:
http://marc.info/?l=linux-netdev&m=137404469219410&w=4
have all been sloved for this patch.
Signed-off-by: Fan Du <fan.du@windriver.com>
Acked-by: Vlad Yasevich <vyasevich@gmail.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/sctp/sctp.h | 2 | ||||
-rw-r--r-- | include/net/sctp/structs.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h index 554cf88605fc..cb28df9c2781 100644 --- a/include/net/sctp/sctp.h +++ b/include/net/sctp/sctp.h | |||
@@ -613,7 +613,7 @@ static inline void sctp_v4_map_v6(union sctp_addr *addr) | |||
613 | */ | 613 | */ |
614 | static inline struct dst_entry *sctp_transport_dst_check(struct sctp_transport *t) | 614 | static inline struct dst_entry *sctp_transport_dst_check(struct sctp_transport *t) |
615 | { | 615 | { |
616 | if (t->dst && !dst_check(t->dst, 0)) { | 616 | if (t->dst && !dst_check(t->dst, t->dst_cookie)) { |
617 | dst_release(t->dst); | 617 | dst_release(t->dst); |
618 | t->dst = NULL; | 618 | t->dst = NULL; |
619 | } | 619 | } |
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h index 75c4c16601b6..c0f4e29eedd5 100644 --- a/include/net/sctp/structs.h +++ b/include/net/sctp/structs.h | |||
@@ -946,6 +946,7 @@ struct sctp_transport { | |||
946 | __u64 hb_nonce; | 946 | __u64 hb_nonce; |
947 | 947 | ||
948 | struct rcu_head rcu; | 948 | struct rcu_head rcu; |
949 | u32 dst_cookie; | ||
949 | }; | 950 | }; |
950 | 951 | ||
951 | struct sctp_transport *sctp_transport_new(struct net *, const union sctp_addr *, | 952 | struct sctp_transport *sctp_transport_new(struct net *, const union sctp_addr *, |