summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-02-28 13:56:37 -0800
committerDavid S. Miller <davem@davemloft.net>2008-02-28 13:56:37 -0800
commit64758bd7927be1f755e7a08edb2253d37e4b2445 (patch)
tree91bd6ac12e9f537568ede4b6113dea5ed60fe9f8 /include
parent16e297b35811c53288b35e15a5823fd8534c6d21 (diff)
parent7e8616d8e7731b026019d9af7cc9914b8bb42bc7 (diff)
downloadop-kernel-dev-64758bd7927be1f755e7a08edb2253d37e4b2445.zip
op-kernel-dev-64758bd7927be1f755e7a08edb2253d37e4b2445.tar.gz
Merge branch 'pending' of master.kernel.org:/pub/scm/linux/kernel/git/vxy/lksctp-dev
Diffstat (limited to 'include')
-rw-r--r--include/net/sctp/user.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/include/net/sctp/user.h b/include/net/sctp/user.h
index 9462d6a..9619b9d 100644
--- a/include/net/sctp/user.h
+++ b/include/net/sctp/user.h
@@ -411,6 +411,7 @@ struct sctp_event_subscribe {
__u8 sctp_shutdown_event;
__u8 sctp_partial_delivery_event;
__u8 sctp_adaptation_layer_event;
+ __u8 sctp_authentication_event;
};
/*
@@ -587,7 +588,7 @@ struct sctp_authchunk {
* endpoint requires the peer to use.
*/
struct sctp_hmacalgo {
- __u16 shmac_num_idents;
+ __u32 shmac_num_idents;
__u16 shmac_idents[];
};
@@ -600,7 +601,7 @@ struct sctp_hmacalgo {
struct sctp_authkey {
sctp_assoc_t sca_assoc_id;
__u16 sca_keynumber;
- __u16 sca_keylen;
+ __u16 sca_keylength;
__u8 sca_key[];
};
@@ -693,8 +694,9 @@ struct sctp_status {
* the peer requires to be received authenticated only.
*/
struct sctp_authchunks {
- sctp_assoc_t gauth_assoc_id;
- uint8_t gauth_chunks[];
+ sctp_assoc_t gauth_assoc_id;
+ __u32 gauth_number_of_chunks;
+ uint8_t gauth_chunks[];
};
/*
OpenPOWER on IntegriCloud