openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Hagen Paul Pfeifer 2011-03-04 11:45:05 +00:00 committed by David S. Miller
parent e143038f4d
commit efea2c6b2e
6 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/sctp/associola.c
View File

@ -1089,7 +1089,6 @@ static void sctp_assoc_bh_rcv(struct work_struct *work)
base.inqueue.immediate); base.inqueue.immediate);
struct sctp_endpoint *ep; struct sctp_endpoint *ep;
struct sctp_chunk *chunk; struct sctp_chunk *chunk;
struct sock *sk;
struct sctp_inq *inqueue; struct sctp_inq *inqueue;
int state; int state;
sctp_subtype_t subtype; 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. */ /* The association should be held so we should be safe. */
ep = asoc->ep; ep = asoc->ep;
sk = asoc->base.sk;
inqueue = &asoc->base.inqueue; inqueue = &asoc->base.inqueue;
sctp_association_hold(asoc); sctp_association_hold(asoc);

3
net/sctp/input.c
View File

@ -948,14 +948,11 @@ static struct sctp_association *__sctp_rcv_init_lookup(struct sk_buff *skb,
union sctp_addr addr; union sctp_addr addr;
union sctp_addr *paddr = &addr; union sctp_addr *paddr = &addr;
struct sctphdr *sh = sctp_hdr(skb); struct sctphdr *sh = sctp_hdr(skb);
sctp_chunkhdr_t *ch;
union sctp_params params; union sctp_params params;
sctp_init_chunk_t *init; sctp_init_chunk_t *init;
struct sctp_transport *transport; struct sctp_transport *transport;
struct sctp_af *af; struct sctp_af *af;
ch = (sctp_chunkhdr_t *) skb->data;
/* /*
* This code will NOT touch anything inside the chunk--it is * This code will NOT touch anything inside the chunk--it is
* strictly READ-ONLY. * strictly READ-ONLY.

2
net/sctp/outqueue.c
View File

@ -545,13 +545,11 @@ static int sctp_outq_flush_rtx(struct sctp_outq *q, struct sctp_packet *pkt,
struct sctp_transport *transport = pkt->transport; struct sctp_transport *transport = pkt->transport;
sctp_xmit_t status; sctp_xmit_t status;
struct sctp_chunk *chunk, *chunk1; struct sctp_chunk *chunk, *chunk1;
struct sctp_association *asoc;
int fast_rtx; int fast_rtx;
int error = 0; int error = 0;
int timer = 0; int timer = 0;
int done = 0; int done = 0;
asoc = q->asoc;
lqueue = &q->retransmit; lqueue = &q->retransmit;
fast_rtx = q->fast_rtx; fast_rtx = q->fast_rtx;

3
net/sctp/sm_make_chunk.c
View File

@ -3375,7 +3375,6 @@ struct sctp_chunk *sctp_make_fwdtsn(const struct sctp_association *asoc,
struct sctp_fwdtsn_skip *skiplist) struct sctp_fwdtsn_skip *skiplist)
{ {
struct sctp_chunk *retval = NULL; struct sctp_chunk *retval = NULL;
struct sctp_fwdtsn_chunk *ftsn_chunk;
struct sctp_fwdtsn_hdr ftsn_hdr; struct sctp_fwdtsn_hdr ftsn_hdr;
struct sctp_fwdtsn_skip skip; struct sctp_fwdtsn_skip skip;
size_t hint; size_t hint;
@ -3388,8 +3387,6 @@ struct sctp_chunk *sctp_make_fwdtsn(const struct sctp_association *asoc,
if (!retval) if (!retval)
return NULL; return NULL;
ftsn_chunk = (struct sctp_fwdtsn_chunk *)retval->subh.fwdtsn_hdr;
ftsn_hdr.new_cum_tsn = htonl(new_cum_tsn); ftsn_hdr.new_cum_tsn = htonl(new_cum_tsn);
retval->subh.fwdtsn_hdr = retval->subh.fwdtsn_hdr =
sctp_addto_chunk(retval, sizeof(ftsn_hdr), &ftsn_hdr); sctp_addto_chunk(retval, sizeof(ftsn_hdr), &ftsn_hdr);

2
net/sctp/socket.c
View File

@ -2928,7 +2928,6 @@ static int sctp_setsockopt_peer_primary_addr(struct sock *sk, char __user *optva
unsigned int optlen) unsigned int optlen)
{ {
struct sctp_sock *sp; struct sctp_sock *sp;
struct sctp_endpoint *ep;
struct sctp_association *asoc = NULL; struct sctp_association *asoc = NULL;
struct sctp_setpeerprim prim; struct sctp_setpeerprim prim;
struct sctp_chunk *chunk; struct sctp_chunk *chunk;
@ -2936,7 +2935,6 @@ static int sctp_setsockopt_peer_primary_addr(struct sock *sk, char __user *optva
int err; int err;
sp = sctp_sk(sk); sp = sctp_sk(sk);
ep = sp->ep;
if (!sctp_addip_enable) if (!sctp_addip_enable)
return -EPERM; return -EPERM;

7
net/sctp/ulpqueue.c
View File

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