From 6038d5584d7ea7ab449508c57917a01743a53c0c Mon Sep 17 00:00:00 2001 From: Al Viro Date: Mon, 20 Nov 2006 17:24:53 -0800 Subject: [PATCH] --- yaml --- r: 41843 b: refs/heads/master c: 6fbfa9f951878ab489147d9e459191d4aacfa819 h: refs/heads/master i: 41841: f491961c485bd64e475a7a16cb585aa2b1167562 41839: 1cf9a88099eea751293e7c83c0433f695e42ff1b v: v3 --- [refs] | 2 +- trunk/include/net/sctp/structs.h | 2 +- trunk/net/sctp/ipv6.c | 2 +- trunk/net/sctp/protocol.c | 2 +- trunk/net/sctp/socket.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d377a57f9271..6a19b1c0de3d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c9c938cb050e6d45088c5c39e4097742e875c496 +refs/heads/master: 6fbfa9f951878ab489147d9e459191d4aacfa819 diff --git a/trunk/include/net/sctp/structs.h b/trunk/include/net/sctp/structs.h index d44202b0487d..3a6b8745538c 100644 --- a/trunk/include/net/sctp/structs.h +++ b/trunk/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/trunk/net/sctp/ipv6.c b/trunk/net/sctp/ipv6.c index 8e2b1e4ec66e..268d32c89594 100644 --- a/trunk/net/sctp/ipv6.c +++ b/trunk/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/trunk/net/sctp/protocol.c b/trunk/net/sctp/protocol.c index c6297744a4ed..5da887528bf1 100644 --- a/trunk/net/sctp/protocol.c +++ b/trunk/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/trunk/net/sctp/socket.c b/trunk/net/sctp/socket.c index adbe531fdedc..56f77d35a8e1 100644 --- a/trunk/net/sctp/socket.c +++ b/trunk/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;