diff options
Diffstat (limited to 'net/sctp/associola.c')
-rw-r--r-- | net/sctp/associola.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/net/sctp/associola.c b/net/sctp/associola.c index 4b47dd6f2485..5b24ae0650d3 100644 --- a/net/sctp/associola.c +++ b/net/sctp/associola.c | |||
@@ -71,7 +71,7 @@ static struct sctp_association *sctp_association_init(struct sctp_association *a | |||
71 | const struct sctp_endpoint *ep, | 71 | const struct sctp_endpoint *ep, |
72 | const struct sock *sk, | 72 | const struct sock *sk, |
73 | sctp_scope_t scope, | 73 | sctp_scope_t scope, |
74 | int gfp) | 74 | unsigned int __nocast gfp) |
75 | { | 75 | { |
76 | struct sctp_sock *sp; | 76 | struct sctp_sock *sp; |
77 | int i; | 77 | int i; |
@@ -272,7 +272,8 @@ fail_init: | |||
272 | /* Allocate and initialize a new association */ | 272 | /* Allocate and initialize a new association */ |
273 | struct sctp_association *sctp_association_new(const struct sctp_endpoint *ep, | 273 | struct sctp_association *sctp_association_new(const struct sctp_endpoint *ep, |
274 | const struct sock *sk, | 274 | const struct sock *sk, |
275 | sctp_scope_t scope, int gfp) | 275 | sctp_scope_t scope, |
276 | unsigned int __nocast gfp) | ||
276 | { | 277 | { |
277 | struct sctp_association *asoc; | 278 | struct sctp_association *asoc; |
278 | 279 | ||
@@ -478,7 +479,7 @@ void sctp_assoc_rm_peer(struct sctp_association *asoc, | |||
478 | /* Add a transport address to an association. */ | 479 | /* Add a transport address to an association. */ |
479 | struct sctp_transport *sctp_assoc_add_peer(struct sctp_association *asoc, | 480 | struct sctp_transport *sctp_assoc_add_peer(struct sctp_association *asoc, |
480 | const union sctp_addr *addr, | 481 | const union sctp_addr *addr, |
481 | const int gfp, | 482 | const unsigned int __nocast gfp, |
482 | const int peer_state) | 483 | const int peer_state) |
483 | { | 484 | { |
484 | struct sctp_transport *peer; | 485 | struct sctp_transport *peer; |
@@ -1229,7 +1230,8 @@ void sctp_assoc_rwnd_decrease(struct sctp_association *asoc, unsigned len) | |||
1229 | /* Build the bind address list for the association based on info from the | 1230 | /* Build the bind address list for the association based on info from the |
1230 | * local endpoint and the remote peer. | 1231 | * local endpoint and the remote peer. |
1231 | */ | 1232 | */ |
1232 | int sctp_assoc_set_bind_addr_from_ep(struct sctp_association *asoc, int gfp) | 1233 | int sctp_assoc_set_bind_addr_from_ep(struct sctp_association *asoc, |
1234 | unsigned int __nocast gfp) | ||
1233 | { | 1235 | { |
1234 | sctp_scope_t scope; | 1236 | sctp_scope_t scope; |
1235 | int flags; | 1237 | int flags; |
@@ -1251,7 +1253,8 @@ int sctp_assoc_set_bind_addr_from_ep(struct sctp_association *asoc, int gfp) | |||
1251 | 1253 | ||
1252 | /* Build the association's bind address list from the cookie. */ | 1254 | /* Build the association's bind address list from the cookie. */ |
1253 | int sctp_assoc_set_bind_addr_from_cookie(struct sctp_association *asoc, | 1255 | int sctp_assoc_set_bind_addr_from_cookie(struct sctp_association *asoc, |
1254 | struct sctp_cookie *cookie, int gfp) | 1256 | struct sctp_cookie *cookie, |
1257 | unsigned int __nocast gfp) | ||
1255 | { | 1258 | { |
1256 | int var_size2 = ntohs(cookie->peer_init->chunk_hdr.length); | 1259 | int var_size2 = ntohs(cookie->peer_init->chunk_hdr.length); |
1257 | int var_size3 = cookie->raw_addr_list_len; | 1260 | int var_size3 = cookie->raw_addr_list_len; |