From: Al Viro Date: Mon, 29 Oct 2007 05:03:23 +0000 (+0000) Subject: SCTP endianness annotations regression X-Git-Tag: v2.6.24-rc2~111 X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=d06f608265d5fc41aefe2fae5b62da4893ecae35;p=safe%2Fjmp%2Flinux-2.6 SCTP endianness annotations regression Signed-off-by: Al Viro Acked-by: David S. Miller Signed-off-by: Linus Torvalds --- diff --git a/include/net/sctp/auth.h b/include/net/sctp/auth.h index 9e8f13b..5db261a 100644 --- a/include/net/sctp/auth.h +++ b/include/net/sctp/auth.h @@ -103,7 +103,7 @@ struct sctp_hmac *sctp_auth_asoc_get_hmac(const struct sctp_association *asoc); void sctp_auth_asoc_set_default_hmac(struct sctp_association *asoc, struct sctp_hmac_algo_param *hmacs); int sctp_auth_asoc_verify_hmac_id(const struct sctp_association *asoc, - __u16 hmac_id); + __be16 hmac_id); int sctp_auth_send_cid(sctp_cid_t chunk, const struct sctp_association *asoc); int sctp_auth_recv_cid(sctp_cid_t chunk, const struct sctp_association *asoc); void sctp_auth_calculate_hmac(const struct sctp_association *asoc, diff --git a/net/sctp/auth.c b/net/sctp/auth.c index 8af1004..6d5fa6b 100644 --- a/net/sctp/auth.c +++ b/net/sctp/auth.c @@ -556,7 +556,7 @@ struct sctp_hmac *sctp_auth_asoc_get_hmac(const struct sctp_association *asoc) return &sctp_hmac_list[id]; } -static int __sctp_auth_find_hmacid(__u16 *hmacs, int n_elts, __u16 hmac_id) +static int __sctp_auth_find_hmacid(__be16 *hmacs, int n_elts, __be16 hmac_id) { int found = 0; int i; @@ -573,7 +573,7 @@ static int __sctp_auth_find_hmacid(__u16 *hmacs, int n_elts, __u16 hmac_id) /* See if the HMAC_ID is one that we claim as supported */ int sctp_auth_asoc_verify_hmac_id(const struct sctp_association *asoc, - __u16 hmac_id) + __be16 hmac_id) { struct sctp_hmac_algo_param *hmacs; __u16 n_elt;