Merge git://git.infradead.org/battery-2.6

[linux.git] / net / sctp / ssnmap.c

diff --git a/net/sctp/ssnmap.c b/net/sctp/ssnmap.c
index 25037daf3fa0ca1542ee34265acfd77794541840..737d330e5ffc6a4fdeb4d8b64cccc53e34b619f0 100644 (file)
--- a/net/sctp/ssnmap.c
+++ b/net/sctp/ssnmap.c
@@ -1,17 +1,17 @@
-/* SCTP kernel reference Implementation
+/* SCTP kernel implementation

  * Copyright (c) 2003 International Business Machines, Corp.
  *
  * Copyright (c) 2003 International Business Machines, Corp.
  *

- * This file is part of the SCTP kernel reference Implementation
+ * This file is part of the SCTP kernel implementation

  *
  * These functions manipulate sctp SSN tracker.
  *
  *
  * These functions manipulate sctp SSN tracker.
  *

- * The SCTP reference implementation is free software;
+ * This SCTP implementation is free software;

  * you can redistribute it and/or modify it under the terms of
  * the GNU General Public License as published by
  * the Free Software Foundation; either version 2, or (at your option)
  * any later version.
  *
  * you can redistribute it and/or modify it under the terms of
  * the GNU General Public License as published by
  * the Free Software Foundation; either version 2, or (at your option)
  * any later version.
  *

- * The SCTP reference implementation is distributed in the hope that it
+ * This SCTP implementation is distributed in the hope that it

  * will be useful, but WITHOUT ANY WARRANTY; without even the implied
  *                 ************************
  * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * will be useful, but WITHOUT ANY WARRANTY; without even the implied
  *                 ************************
  * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.


@@ -58,7 +58,7 @@ static inline size_t sctp_ssnmap_size(__u16 in, __u16 out)
  * Allocate room to store at least 'len' contiguous TSNs.
  */
 struct sctp_ssnmap *sctp_ssnmap_new(__u16 in, __u16 out,
  * Allocate room to store at least 'len' contiguous TSNs.
  */
 struct sctp_ssnmap *sctp_ssnmap_new(__u16 in, __u16 out,

-                                   unsigned int __nocast gfp)
+                                   gfp_t gfp)

 {
        struct sctp_ssnmap *retval;
        int size;
 {
        struct sctp_ssnmap *retval;
        int size;