sctp: several declared/set but unused fixes

Signed-off-by: Hagen Paul Pfeifer <hagen@jauu.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sctp/associola.c b/net/sctp/associola.c
index 5f1fb8bd862dea391a2930f34d59d2129743ebaf..6b04287913cda3dcdc3573357d4856880eefb0bb 100644 (file)
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -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);

diff --git a/net/sctp/input.c b/net/sctp/input.c
index ea2192444ce66413261d20ce8ec236279496d141..826661be73e70f9e05824cc4f65f9e3d1e1cd712 100644 (file)
--- a/net/sctp/input.c
+++ b/net/sctp/input.c
@@ -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.

diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c
index 8c6d379b4bb682634c27c3fef9f4bfc17786e507..26dc005113a0972feb1f7f0a8eaa8503ee09504c 100644 (file)
--- a/net/sctp/outqueue.c
+++ b/net/sctp/outqueue.c
@@ -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;
 

diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index b23428f3c0dde3657187645e47c191a33a5dd7de..de98665db52440b61b9ca5b688f3812ec96a6d79 100644 (file)
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -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);

diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index b53b2ebbb198a06a07c3391ed8383c187f8f1f66..3951a10605bc483a4eac1787ffb08cef97e7d8a2 100644 (file)
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -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;

diff --git a/net/sctp/ulpqueue.c b/net/sctp/ulpqueue.c
index c7f7e49609cbf4e1732a99b51686f73f03616f45..17678189d0540df2895b2e867f5537d8192b9cdb 100644 (file)
--- a/net/sctp/ulpqueue.c
+++ b/net/sctp/ulpqueue.c
@@ -105,11 +105,8 @@ int sctp_ulpq_tail_data(struct sctp_ulpq *ulpq, struct sctp_chunk *chunk,
                        gfp_t gfp)
 {
        struct sk_buff_head temp;
-       sctp_data_chunk_t *hdr;
        struct sctp_ulpevent *event;
 
-       hdr = (sctp_data_chunk_t *) chunk->chunk_hdr;
-
        /* Create an event from the incoming chunk. */
        event = sctp_ulpevent_make_rcvmsg(chunk->asoc, chunk, gfp);
        if (!event)
@@ -743,11 +740,9 @@ static void sctp_ulpq_retrieve_ordered(struct sctp_ulpq *ulpq,
        struct sk_buff *pos, *tmp;
        struct sctp_ulpevent *cevent;
        struct sctp_stream *in;
-       __u16 sid, csid;
-       __u16 ssn, cssn;
+       __u16 sid, csid, cssn;
 
        sid = event->stream;
-       ssn = event->ssn;
        in  = &ulpq->asoc->ssnmap->in;
 
        event_list = (struct sk_buff_head *) sctp_event2skb(event)->prev;