diff options
| author | David S. Miller | 2008-10-01 15:12:56 +0200 |
|---|---|---|
| committer | David S. Miller | 2008-10-01 15:12:56 +0200 |
| commit | b262e60309e1b0eb25d300c7e739427d5316abb1 (patch) | |
| tree | bf319d78c79bb5cb617ff0c8340c73aa349bba15 /include/net/sctp | |
| parent | ipv6: almost identical frag hashing funcs combined (diff) | |
| parent | af_key: Free dumping state on socket close (diff) | |
| download | kernel-qcow2-linux-b262e60309e1b0eb25d300c7e739427d5316abb1.tar.gz kernel-qcow2-linux-b262e60309e1b0eb25d300c7e739427d5316abb1.tar.xz kernel-qcow2-linux-b262e60309e1b0eb25d300c7e739427d5316abb1.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath9k/core.c
drivers/net/wireless/ath9k/main.c
net/core/dev.c
Diffstat (limited to 'include/net/sctp')
| -rw-r--r-- | include/net/sctp/sm.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h index 24811732bdb2..029a54a02396 100644 --- a/include/net/sctp/sm.h +++ b/include/net/sctp/sm.h @@ -227,6 +227,9 @@ struct sctp_chunk *sctp_make_abort_violation(const struct sctp_association *, const struct sctp_chunk *, const __u8 *, const size_t ); +struct sctp_chunk *sctp_make_violation_paramlen(const struct sctp_association *, + const struct sctp_chunk *, + struct sctp_paramhdr *); struct sctp_chunk *sctp_make_heartbeat(const struct sctp_association *, const struct sctp_transport *, const void *payload, |