aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-11-20 17:24:53 -0800
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-02 21:27:08 -0800
commit6fbfa9f951878ab489147d9e459191d4aacfa819 (patch)
treeb542f52199466aab195f86f1565e3beb62d2c04d
parentc9c938cb050e6d45088c5c39e4097742e875c496 (diff)
[SCTP]: Annotate ->inaddr_any().
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/sctp/structs.h2
-rw-r--r--net/sctp/ipv6.c2
-rw-r--r--net/sctp/protocol.c2
-rw-r--r--net/sctp/socket.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index d44202b0487..3a6b8745538 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 8e2b1e4ec66..268d32c8959 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 c6297744a4e..5da887528bf 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 adbe531fded..56f77d35a8e 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;