diff --git a/[refs] b/[refs] index 50063c4b930a..ecf68be6484e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a5fcb9cf8e5c3fabaab1c20668f58fe85d7c70d +refs/heads/master: c86dabcf00f3ca167df59f3526a53b3da3ede2c8 diff --git a/trunk/net/sctp/sm_make_chunk.c b/trunk/net/sctp/sm_make_chunk.c index ad02311dcd83..ba76ceca2a4e 100644 --- a/trunk/net/sctp/sm_make_chunk.c +++ b/trunk/net/sctp/sm_make_chunk.c @@ -1452,7 +1452,6 @@ struct sctp_association *sctp_unpack_cookie( do_gettimeofday(&tv); if (!asoc && tv_lt(bear_cookie->expiration, tv)) { - __u16 len; /* * Section 3.3.10.3 Stale Cookie Error (3) * diff --git a/trunk/net/sctp/socket.c b/trunk/net/sctp/socket.c index f8de0eb235d9..b31be0994572 100644 --- a/trunk/net/sctp/socket.c +++ b/trunk/net/sctp/socket.c @@ -1529,7 +1529,6 @@ SCTP_STATIC int sctp_sendmsg(struct kiocb *iocb, struct sock *sk, goto out_unlock; } if (sinfo_flags & SCTP_ABORT) { - struct sctp_chunk *chunk; chunk = sctp_make_abort_user(asoc, msg, msg_len); if (!chunk) {