Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [DCCP]: Update documentation references.
  [ATM] horizon: read_bia() needs to be __devinit
  [NETFILTER]: Fix ip6_tables extension header bypass bug
  [NETFILTER]: Fix ip6_tables protocol bypass bug
  [XFRM]: Fix xfrm_state accounting
  [IPV4] ipconfig: fix RARP ic_servaddr breakage

3 files changed, 10 insertions, 12 deletions

diff --git a/net/dccp/ccids/Kconfig b/net/dccp/ccids/Kconfig
index 32752f750447..8533dabfb9f8 100644
--- a/net/dccp/ccids/Kconfig
+++ b/net/dccp/ccids/Kconfig
@@ -22,11 +22,11 @@ config IP_DCCP_CCID2
           for lost packets, would prefer CCID 2 to CCID 3.  On-line games may
           also prefer CCID 2.
 
-          CCID 2 is further described in:
-          http://www.icir.org/kohler/dccp/draft-ietf-dccp-ccid2-10.txt
+          CCID 2 is further described in RFC 4341,
+          http://www.ietf.org/rfc/rfc4341.txt
 
-          This text was extracted from:
-          http://www.icir.org/kohler/dccp/draft-ietf-dccp-spec-13.txt
+          This text was extracted from RFC 4340 (sec. 10.1),
+          http://www.ietf.org/rfc/rfc4340.txt
 
           If in doubt, say M.
 
@@ -53,15 +53,14 @@ config IP_DCCP_CCID3
           suitable than CCID 2 for applications such streaming media where a
           relatively smooth sending rate is of importance.
 
-          CCID 3 is further described in:
-
-          http://www.icir.org/kohler/dccp/draft-ietf-dccp-ccid3-11.txt.
+          CCID 3 is further described in RFC 4342,
+          http://www.ietf.org/rfc/rfc4342.txt
 
           The TFRC congestion control algorithms were initially described in
           RFC 3448.
 
-          This text was extracted from:
-          http://www.icir.org/kohler/dccp/draft-ietf-dccp-spec-13.txt
+          This text was extracted from RFC 4340 (sec. 10.2),
+          http://www.ietf.org/rfc/rfc4340.txt
           
           If in doubt, say M.
 
diff --git a/net/dccp/ccids/ccid2.c b/net/dccp/ccids/ccid2.c
index 2efb505aeb35..2fbb84bf4e26 100644
--- a/net/dccp/ccids/ccid2.c
+++ b/net/dccp/ccids/ccid2.c
@@ -23,7 +23,7 @@
  */
 
 /*
- * This implementation should follow: draft-ietf-dccp-ccid2-10.txt
+ * This implementation should follow RFC 4341
  *
  * BUGS:
  * - sequence number wrapping
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
index 67d2dc0e7c67..cec23ad286de 100644
--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
@@ -379,8 +379,7 @@ static void ccid3_hc_tx_packet_sent(struct sock *sk, int more, int len)
                 packet->dccphtx_seqno  = dp->dccps_gss;
                 /*
                  * Check if win_count have changed
-                 * Algorithm in "8.1. Window Counter Valuer" in
-                 * draft-ietf-dccp-ccid3-11.txt
+                 * Algorithm in "8.1. Window Counter Value" in RFC 4342.
                  */
                 quarter_rtt = timeval_delta(&now, &hctx->ccid3hctx_t_last_win_count);
                 if (likely(hctx->ccid3hctx_rtt > 8))