diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-07-13 22:09:23 (GMT) |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-07-13 22:09:23 (GMT) |
| commit | c514720716c7b109ff980f8b3cb93f9af872c91c (patch) | |
| tree | 490a9578995705de69712893a190b67651bddc56 /include/net/sctp/sctp.h | |
| parent | 07929dcb963786512c760dd3ecd148d89295e7e5 (diff) | |
| parent | 1e279dd855d15b72364b4103f872d67d8592647e (diff) | |
| download | linux-fsl-qoriq-c514720716c7b109ff980f8b3cb93f9af872c91c.tar.xz | |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'include/net/sctp/sctp.h')
| -rw-r--r-- | include/net/sctp/sctp.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h index ef27381..4a26adf 100644 --- a/include/net/sctp/sctp.h +++ b/include/net/sctp/sctp.h @@ -125,7 +125,8 @@ */ extern struct sock *sctp_get_ctl_sock(void); extern int sctp_copy_local_addr_list(struct sctp_bind_addr *, - sctp_scope_t, int gfp, int flags); + sctp_scope_t, unsigned int __nocast gfp, + int flags); extern struct sctp_pf *sctp_get_pf_specific(sa_family_t family); extern int sctp_register_pf(struct sctp_pf *, sa_family_t); |