diff options
Diffstat (limited to 'net/sctp/bind_addr.c')
-rw-r--r-- | net/sctp/bind_addr.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/net/sctp/bind_addr.c b/net/sctp/bind_addr.c index f90eadfb60a2..f71549710f2e 100644 --- a/net/sctp/bind_addr.c +++ b/net/sctp/bind_addr.c | |||
@@ -53,7 +53,8 @@ | |||
53 | 53 | ||
54 | /* Forward declarations for internal helpers. */ | 54 | /* Forward declarations for internal helpers. */ |
55 | static int sctp_copy_one_addr(struct sctp_bind_addr *, union sctp_addr *, | 55 | static int sctp_copy_one_addr(struct sctp_bind_addr *, union sctp_addr *, |
56 | sctp_scope_t scope, int gfp, int flags); | 56 | sctp_scope_t scope, unsigned int __nocast gfp, |
57 | int flags); | ||
57 | static void sctp_bind_addr_clean(struct sctp_bind_addr *); | 58 | static void sctp_bind_addr_clean(struct sctp_bind_addr *); |
58 | 59 | ||
59 | /* First Level Abstractions. */ | 60 | /* First Level Abstractions. */ |
@@ -63,7 +64,8 @@ static void sctp_bind_addr_clean(struct sctp_bind_addr *); | |||
63 | */ | 64 | */ |
64 | int sctp_bind_addr_copy(struct sctp_bind_addr *dest, | 65 | int sctp_bind_addr_copy(struct sctp_bind_addr *dest, |
65 | const struct sctp_bind_addr *src, | 66 | const struct sctp_bind_addr *src, |
66 | sctp_scope_t scope, int gfp, int flags) | 67 | sctp_scope_t scope, unsigned int __nocast gfp, |
68 | int flags) | ||
67 | { | 69 | { |
68 | struct sctp_sockaddr_entry *addr; | 70 | struct sctp_sockaddr_entry *addr; |
69 | struct list_head *pos; | 71 | struct list_head *pos; |
@@ -144,7 +146,7 @@ void sctp_bind_addr_free(struct sctp_bind_addr *bp) | |||
144 | 146 | ||
145 | /* Add an address to the bind address list in the SCTP_bind_addr structure. */ | 147 | /* Add an address to the bind address list in the SCTP_bind_addr structure. */ |
146 | int sctp_add_bind_addr(struct sctp_bind_addr *bp, union sctp_addr *new, | 148 | int sctp_add_bind_addr(struct sctp_bind_addr *bp, union sctp_addr *new, |
147 | int gfp) | 149 | unsigned int __nocast gfp) |
148 | { | 150 | { |
149 | struct sctp_sockaddr_entry *addr; | 151 | struct sctp_sockaddr_entry *addr; |
150 | 152 | ||
@@ -197,7 +199,8 @@ int sctp_del_bind_addr(struct sctp_bind_addr *bp, union sctp_addr *del_addr) | |||
197 | * The second argument is the return value for the length. | 199 | * The second argument is the return value for the length. |
198 | */ | 200 | */ |
199 | union sctp_params sctp_bind_addrs_to_raw(const struct sctp_bind_addr *bp, | 201 | union sctp_params sctp_bind_addrs_to_raw(const struct sctp_bind_addr *bp, |
200 | int *addrs_len, int gfp) | 202 | int *addrs_len, |
203 | unsigned int __nocast gfp) | ||
201 | { | 204 | { |
202 | union sctp_params addrparms; | 205 | union sctp_params addrparms; |
203 | union sctp_params retval; | 206 | union sctp_params retval; |
@@ -249,7 +252,7 @@ end_raw: | |||
249 | * address parameters). | 252 | * address parameters). |
250 | */ | 253 | */ |
251 | int sctp_raw_to_bind_addrs(struct sctp_bind_addr *bp, __u8 *raw_addr_list, | 254 | int sctp_raw_to_bind_addrs(struct sctp_bind_addr *bp, __u8 *raw_addr_list, |
252 | int addrs_len, __u16 port, int gfp) | 255 | int addrs_len, __u16 port, unsigned int __nocast gfp) |
253 | { | 256 | { |
254 | union sctp_addr_param *rawaddr; | 257 | union sctp_addr_param *rawaddr; |
255 | struct sctp_paramhdr *param; | 258 | struct sctp_paramhdr *param; |
@@ -347,7 +350,8 @@ union sctp_addr *sctp_find_unmatch_addr(struct sctp_bind_addr *bp, | |||
347 | /* Copy out addresses from the global local address list. */ | 350 | /* Copy out addresses from the global local address list. */ |
348 | static int sctp_copy_one_addr(struct sctp_bind_addr *dest, | 351 | static int sctp_copy_one_addr(struct sctp_bind_addr *dest, |
349 | union sctp_addr *addr, | 352 | union sctp_addr *addr, |
350 | sctp_scope_t scope, int gfp, int flags) | 353 | sctp_scope_t scope, unsigned int __nocast gfp, |
354 | int flags) | ||
351 | { | 355 | { |
352 | int error = 0; | 356 | int error = 0; |
353 | 357 | ||