aboutsummaryrefslogtreecommitdiffstats
path: root/net/sctp/socket.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/sctp/socket.c')
-rw-r--r--net/sctp/socket.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 3dd7ada8026c..d09589a51c44 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -313,7 +313,6 @@ SCTP_STATIC int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len)
313 struct sctp_af *af; 313 struct sctp_af *af;
314 unsigned short snum; 314 unsigned short snum;
315 int ret = 0; 315 int ret = 0;
316 union sctp_addr tmp;
317 316
318 /* Common sockaddr verification. */ 317 /* Common sockaddr verification. */
319 af = sctp_sockaddr_af(sp, addr, len); 318 af = sctp_sockaddr_af(sp, addr, len);
@@ -369,8 +368,7 @@ SCTP_STATIC int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len)
369 sctp_write_lock(&ep->base.addr_lock); 368 sctp_write_lock(&ep->base.addr_lock);
370 369
371 /* Use GFP_ATOMIC since BHs are disabled. */ 370 /* Use GFP_ATOMIC since BHs are disabled. */
372 flip_to_h(&tmp, addr); 371 ret = sctp_add_bind_addr(bp, addr, 1, GFP_ATOMIC);
373 ret = sctp_add_bind_addr(bp, &tmp, 1, GFP_ATOMIC);
374 sctp_write_unlock(&ep->base.addr_lock); 372 sctp_write_unlock(&ep->base.addr_lock);
375 sctp_local_bh_enable(); 373 sctp_local_bh_enable();
376 374
@@ -572,7 +570,6 @@ static int sctp_send_asconf_add_ip(struct sock *sk,
572 addr = (union sctp_addr *)addr_buf; 570 addr = (union sctp_addr *)addr_buf;
573 af = sctp_get_af_specific(addr->v4.sin_family); 571 af = sctp_get_af_specific(addr->v4.sin_family);
574 memcpy(&saveaddr, addr, af->sockaddr_len); 572 memcpy(&saveaddr, addr, af->sockaddr_len);
575 saveaddr.v4.sin_port = ntohs(saveaddr.v4.sin_port);
576 retval = sctp_add_bind_addr(bp, &saveaddr, 0, 573 retval = sctp_add_bind_addr(bp, &saveaddr, 0,
577 GFP_ATOMIC); 574 GFP_ATOMIC);
578 addr_buf += af->sockaddr_len; 575 addr_buf += af->sockaddr_len;