[DCCPv6]: Choose a genuine initial sequence number

This
	* resolves a FIXME - DCCPv6 connections started all with
	  an initial sequence number of 1;
	* provides a redirection `secure_dccpv6_sequence_number'
	  in case the init_sequence_v6 code should be updated later;
	* concentrates the update of S.GAR into dccp_connect_init();
	* removes a duplicate dccp_update_gss() in ipv4.c;
	* uses inet->dport instead of usin->sin_port, due to the
	  following assignment in dccp_v4_connect():
 		inet->dport = usin->sin_port;

Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>

1 files changed, 2 insertions, 7 deletions

diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index b56a2fa2694a..bc400b2ba25e 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -113,13 +113,8 @@ int dccp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
         /* OK, now commit destination to socket.  */
         sk_setup_caps(sk, &rt->u.dst);
 
-        dp->dccps_gar =
-                dp->dccps_iss = secure_dccp_sequence_number(inet->saddr,
-                                                            inet->daddr,
-                                                            inet->sport,
-                                                            usin->sin_port);
-        dccp_update_gss(sk, dp->dccps_iss);
-
+        dp->dccps_iss = secure_dccp_sequence_number(inet->saddr, inet->daddr,
+                                                    inet->sport, inet->dport);
         inet->id = dp->dccps_iss ^ jiffies;
 
         err = dccp_connect(sk);