diff --git a/[refs] b/[refs] index 296fad56c6a0..6a8467dbb515 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d8c6f4b9b7848bca8babfc0ae43a50c8ab22fbb9 +refs/heads/master: 81ce0dbc119fa31af21d02febde1cf923022d4d6 diff --git a/trunk/net/sctp/endpointola.c b/trunk/net/sctp/endpointola.c index 73aad3d16a45..9a680c075141 100644 --- a/trunk/net/sctp/endpointola.c +++ b/trunk/net/sctp/endpointola.c @@ -155,7 +155,7 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep, /* SCTP-AUTH extensions*/ INIT_LIST_HEAD(&ep->endpoint_shared_keys); - null_key = sctp_auth_shkey_create(0, GFP_KERNEL); + null_key = sctp_auth_shkey_create(0, gfp); if (!null_key) goto nomem;