From: Al Viro <viro@zeniv.linux.org.uk>
Date: Tue, 21 Nov 2006 01:24:53 +0000 (-0800)
Subject: [SCTP]: Annotate ->inaddr_any().
X-Git-Tag: v2.6.20-rc1~34^2~40^2~187
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6fbfa9f951878ab489147d9e459191d4aacfa819;p=linux-2.6

[SCTP]: Annotate ->inaddr_any().

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index d44202b048..3a6b874553 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -560,7 +560,7 @@ struct sctp_af {
 					 struct sctp_sock *,
 					 const struct sk_buff *);
 	sctp_scope_t	(*scope) (union sctp_addr *);
-	void		(*inaddr_any)	(union sctp_addr *, unsigned short);
+	void		(*inaddr_any)	(union sctp_addr *, __be16);
 	int		(*is_any)	(const union sctp_addr *);
 	int		(*available)	(union sctp_addr *,
 					 struct sctp_sock *);
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index 8e2b1e4ec6..268d32c895 100644
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -478,7 +478,7 @@ static int sctp_v6_cmp_addr(const union sctp_addr *addr1,
 }
 
 /* Initialize addr struct to INADDR_ANY. */
-static void sctp_v6_inaddr_any(union sctp_addr *addr, unsigned short port)
+static void sctp_v6_inaddr_any(union sctp_addr *addr, __be16 port)
 {
 	memset(addr, 0x00, sizeof(union sctp_addr));
 	addr->v6.sin6_family = AF_INET6;
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index c6297744a4..5da887528b 100644
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -338,7 +338,7 @@ static int sctp_v4_cmp_addr(const union sctp_addr *addr1,
 }
 
 /* Initialize addr struct to INADDR_ANY. */
-static void sctp_v4_inaddr_any(union sctp_addr *addr, unsigned short port)
+static void sctp_v4_inaddr_any(union sctp_addr *addr, __be16 port)
 {
 	addr->v4.sin_family = AF_INET;
 	addr->v4.sin_addr.s_addr = INADDR_ANY;
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index adbe531fde..56f77d35a8 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -5055,7 +5055,7 @@ static int sctp_autobind(struct sock *sk)
 {
 	union sctp_addr autoaddr;
 	struct sctp_af *af;
-	unsigned short port;
+	__be16 port;
 
 	/* Initialize a local sockaddr structure to INADDR_ANY. */
 	af = sctp_sk(sk)->pf->af;