Commit efea2c6b authored by Hagen Paul Pfeifer's avatar Hagen Paul Pfeifer Committed by David S. Miller
Browse files

sctp: several declared/set but unused fixes 



Signed-off-by: default avatarHagen Paul Pfeifer <hagen@jauu.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e143038f

net/sctp/associola.c

+0 −2
Original line number Diff line number Diff line
@@ -1089,7 +1089,6 @@ static void sctp_assoc_bh_rcv(struct work_struct *work) 
			     base.inqueue.immediate);

	struct sctp_endpoint *ep;

	struct sctp_chunk *chunk;

	struct sock *sk;

	struct sctp_inq *inqueue;

	int state;

	sctp_subtype_t subtype;
@@ -1097,7 +1096,6 @@ static void sctp_assoc_bh_rcv(struct work_struct *work) 


	/* The association should be held so we should be safe. */

	ep = asoc->ep;

	sk = asoc->base.sk;



	inqueue = &asoc->base.inqueue;

	sctp_association_hold(asoc);

net/sctp/input.c

+0 −3
Original line number Diff line number Diff line
@@ -948,14 +948,11 @@ static struct sctp_association *__sctp_rcv_init_lookup(struct sk_buff *skb, 
	union sctp_addr addr;

	union sctp_addr *paddr = &addr;

	struct sctphdr *sh = sctp_hdr(skb);

	sctp_chunkhdr_t *ch;

	union sctp_params params;

	sctp_init_chunk_t *init;

	struct sctp_transport *transport;

	struct sctp_af *af;



	ch = (sctp_chunkhdr_t *) skb->data;



	/*

	 * This code will NOT touch anything inside the chunk--it is

	 * strictly READ-ONLY.

net/sctp/outqueue.c

+0 −2
Original line number Diff line number Diff line
@@ -545,13 +545,11 @@ static int sctp_outq_flush_rtx(struct sctp_outq *q, struct sctp_packet *pkt, 
	struct sctp_transport *transport = pkt->transport;

	sctp_xmit_t status;

	struct sctp_chunk *chunk, *chunk1;

	struct sctp_association *asoc;

	int fast_rtx;

	int error = 0;

	int timer = 0;

	int done = 0;



	asoc = q->asoc;

	lqueue = &q->retransmit;

	fast_rtx = q->fast_rtx;

net/sctp/sm_make_chunk.c

+0 −3
Original line number Diff line number Diff line
@@ -3375,7 +3375,6 @@ struct sctp_chunk *sctp_make_fwdtsn(const struct sctp_association *asoc, 
				    struct sctp_fwdtsn_skip *skiplist)

{

	struct sctp_chunk *retval = NULL;

	struct sctp_fwdtsn_chunk *ftsn_chunk;

	struct sctp_fwdtsn_hdr ftsn_hdr;

	struct sctp_fwdtsn_skip skip;

	size_t hint;
@@ -3388,8 +3387,6 @@ struct sctp_chunk *sctp_make_fwdtsn(const struct sctp_association *asoc, 
	if (!retval)

		return NULL;



	ftsn_chunk = (struct sctp_fwdtsn_chunk *)retval->subh.fwdtsn_hdr;



	ftsn_hdr.new_cum_tsn = htonl(new_cum_tsn);

	retval->subh.fwdtsn_hdr =

		sctp_addto_chunk(retval, sizeof(ftsn_hdr), &ftsn_hdr);

net/sctp/socket.c

+0 −2
Original line number Diff line number Diff line
@@ -2928,7 +2928,6 @@ static int sctp_setsockopt_peer_primary_addr(struct sock *sk, char __user *optva 
					     unsigned int optlen)

{

	struct sctp_sock	*sp;

	struct sctp_endpoint	*ep;

	struct sctp_association	*asoc = NULL;

	struct sctp_setpeerprim	prim;

	struct sctp_chunk	*chunk;
@@ -2936,7 +2935,6 @@ static int sctp_setsockopt_peer_primary_addr(struct sock *sk, char __user *optva 
	int 			err;



	sp = sctp_sk(sk);

	ep = sp->ep;



	if (!sctp_addip_enable)

		return -EPERM;