* [PATCH 1/4] mcast: net_device dev not used
@ 2011-03-04 21:45 Hagen Paul Pfeifer
2011-03-04 21:45 ` [PATCH 2/4] af_packet: struct socket declared/assigned but unused Hagen Paul Pfeifer
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Hagen Paul Pfeifer @ 2011-03-04 21:45 UTC (permalink / raw)
To: netdev; +Cc: Hagen Paul Pfeifer
ip6_mc_source(), ip6_mc_msfilter() as well as ip6_mc_msfget() declare
and assign dev but do not use the variable afterwards.
Signed-off-by: Hagen Paul Pfeifer <hagen@jauu.net>
---
net/ipv6/mcast.c | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index 7b27d08..f2c9b69 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -319,7 +319,6 @@ int ip6_mc_source(int add, int omode, struct sock *sk,
{
struct in6_addr *source, *group;
struct ipv6_mc_socklist *pmc;
- struct net_device *dev;
struct inet6_dev *idev;
struct ipv6_pinfo *inet6 = inet6_sk(sk);
struct ip6_sf_socklist *psl;
@@ -341,7 +340,6 @@ int ip6_mc_source(int add, int omode, struct sock *sk,
rcu_read_unlock();
return -ENODEV;
}
- dev = idev->dev;
err = -EADDRNOTAVAIL;
@@ -455,7 +453,6 @@ int ip6_mc_msfilter(struct sock *sk, struct group_filter *gsf)
{
struct in6_addr *group;
struct ipv6_mc_socklist *pmc;
- struct net_device *dev;
struct inet6_dev *idev;
struct ipv6_pinfo *inet6 = inet6_sk(sk);
struct ip6_sf_socklist *newpsl, *psl;
@@ -478,7 +475,6 @@ int ip6_mc_msfilter(struct sock *sk, struct group_filter *gsf)
rcu_read_unlock();
return -ENODEV;
}
- dev = idev->dev;
err = 0;
@@ -549,7 +545,6 @@ int ip6_mc_msfget(struct sock *sk, struct group_filter *gsf,
struct in6_addr *group;
struct ipv6_mc_socklist *pmc;
struct inet6_dev *idev;
- struct net_device *dev;
struct ipv6_pinfo *inet6 = inet6_sk(sk);
struct ip6_sf_socklist *psl;
struct net *net = sock_net(sk);
@@ -566,7 +561,6 @@ int ip6_mc_msfget(struct sock *sk, struct group_filter *gsf,
rcu_read_unlock();
return -ENODEV;
}
- dev = idev->dev;
err = -EADDRNOTAVAIL;
/*
--
1.7.4.1.57.g0466.dirty
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/4] af_packet: struct socket declared/assigned but unused
2011-03-04 21:45 [PATCH 1/4] mcast: net_device dev not used Hagen Paul Pfeifer
@ 2011-03-04 21:45 ` Hagen Paul Pfeifer
2011-03-07 23:51 ` David Miller
2011-03-04 21:45 ` [PATCH 3/4] sctp: several declared/set but unused fixes Hagen Paul Pfeifer
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Hagen Paul Pfeifer @ 2011-03-04 21:45 UTC (permalink / raw)
To: netdev; +Cc: Hagen Paul Pfeifer
Signed-off-by: Hagen Paul Pfeifer <hagen@jauu.net>
---
net/packet/af_packet.c | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 5efef5b..b5362e9 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -966,7 +966,6 @@ static int tpacket_fill_skb(struct packet_sock *po, struct sk_buff *skb,
static int tpacket_snd(struct packet_sock *po, struct msghdr *msg)
{
- struct socket *sock;
struct sk_buff *skb;
struct net_device *dev;
__be16 proto;
@@ -978,8 +977,6 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg)
int len_sum = 0;
int status = 0;
- sock = po->sk.sk_socket;
-
mutex_lock(&po->pg_vec_lock);
err = -EBUSY;
--
1.7.4.1.57.g0466.dirty
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/4] sctp: several declared/set but unused fixes
2011-03-04 21:45 [PATCH 1/4] mcast: net_device dev not used Hagen Paul Pfeifer
2011-03-04 21:45 ` [PATCH 2/4] af_packet: struct socket declared/assigned but unused Hagen Paul Pfeifer
@ 2011-03-04 21:45 ` Hagen Paul Pfeifer
2011-03-07 23:51 ` David Miller
2011-03-04 21:45 ` [PATCH 4/4] af_unix: remove unused struct sockaddr_un cruft Hagen Paul Pfeifer
2011-03-07 23:51 ` [PATCH 1/4] mcast: net_device dev not used David Miller
3 siblings, 1 reply; 8+ messages in thread
From: Hagen Paul Pfeifer @ 2011-03-04 21:45 UTC (permalink / raw)
To: netdev; +Cc: Hagen Paul Pfeifer
Signed-off-by: Hagen Paul Pfeifer <hagen@jauu.net>
---
net/sctp/associola.c | 2 --
net/sctp/input.c | 3 ---
net/sctp/outqueue.c | 2 --
net/sctp/sm_make_chunk.c | 3 ---
net/sctp/socket.c | 2 --
net/sctp/ulpqueue.c | 7 +------
6 files changed, 1 insertions(+), 18 deletions(-)
diff --git a/net/sctp/associola.c b/net/sctp/associola.c
index 5f1fb8b..6b04287 100644
--- 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 ea21924..826661b 100644
--- 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 8c6d379..26dc005 100644
--- 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 b23428f..de98665 100644
--- 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 b53b2eb..3951a10 100644
--- 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 c7f7e49..1767818 100644
--- 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;
--
1.7.4.1.57.g0466.dirty
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 4/4] af_unix: remove unused struct sockaddr_un cruft
2011-03-04 21:45 [PATCH 1/4] mcast: net_device dev not used Hagen Paul Pfeifer
2011-03-04 21:45 ` [PATCH 2/4] af_packet: struct socket declared/assigned but unused Hagen Paul Pfeifer
2011-03-04 21:45 ` [PATCH 3/4] sctp: several declared/set but unused fixes Hagen Paul Pfeifer
@ 2011-03-04 21:45 ` Hagen Paul Pfeifer
2011-03-07 23:51 ` David Miller
2011-03-07 23:51 ` [PATCH 1/4] mcast: net_device dev not used David Miller
3 siblings, 1 reply; 8+ messages in thread
From: Hagen Paul Pfeifer @ 2011-03-04 21:45 UTC (permalink / raw)
To: netdev; +Cc: Hagen Paul Pfeifer
Signed-off-by: Hagen Paul Pfeifer <hagen@jauu.net>
---
net/unix/af_unix.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 217fb7f..df5997d 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1567,7 +1567,6 @@ static int unix_stream_sendmsg(struct kiocb *kiocb, struct socket *sock,
struct sock_iocb *siocb = kiocb_to_siocb(kiocb);
struct sock *sk = sock->sk;
struct sock *other = NULL;
- struct sockaddr_un *sunaddr = msg->msg_name;
int err, size;
struct sk_buff *skb;
int sent = 0;
@@ -1590,7 +1589,6 @@ static int unix_stream_sendmsg(struct kiocb *kiocb, struct socket *sock,
err = sk->sk_state == TCP_ESTABLISHED ? -EISCONN : -EOPNOTSUPP;
goto out_err;
} else {
- sunaddr = NULL;
err = -ENOTCONN;
other = unix_peer(sk);
if (!other)
--
1.7.4.1.57.g0466.dirty
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/4] mcast: net_device dev not used
2011-03-04 21:45 [PATCH 1/4] mcast: net_device dev not used Hagen Paul Pfeifer
` (2 preceding siblings ...)
2011-03-04 21:45 ` [PATCH 4/4] af_unix: remove unused struct sockaddr_un cruft Hagen Paul Pfeifer
@ 2011-03-07 23:51 ` David Miller
3 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2011-03-07 23:51 UTC (permalink / raw)
To: hagen; +Cc: netdev
From: Hagen Paul Pfeifer <hagen@jauu.net>
Date: Fri, 4 Mar 2011 22:45:03 +0100
> ip6_mc_source(), ip6_mc_msfilter() as well as ip6_mc_msfget() declare
> and assign dev but do not use the variable afterwards.
>
> Signed-off-by: Hagen Paul Pfeifer <hagen@jauu.net>
Applied.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/4] af_packet: struct socket declared/assigned but unused
2011-03-04 21:45 ` [PATCH 2/4] af_packet: struct socket declared/assigned but unused Hagen Paul Pfeifer
@ 2011-03-07 23:51 ` David Miller
0 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2011-03-07 23:51 UTC (permalink / raw)
To: hagen; +Cc: netdev
From: Hagen Paul Pfeifer <hagen@jauu.net>
Date: Fri, 4 Mar 2011 22:45:04 +0100
> Signed-off-by: Hagen Paul Pfeifer <hagen@jauu.net>
Applied.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 3/4] sctp: several declared/set but unused fixes
2011-03-04 21:45 ` [PATCH 3/4] sctp: several declared/set but unused fixes Hagen Paul Pfeifer
@ 2011-03-07 23:51 ` David Miller
0 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2011-03-07 23:51 UTC (permalink / raw)
To: hagen; +Cc: netdev
From: Hagen Paul Pfeifer <hagen@jauu.net>
Date: Fri, 4 Mar 2011 22:45:05 +0100
> Signed-off-by: Hagen Paul Pfeifer <hagen@jauu.net>
Applied.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 4/4] af_unix: remove unused struct sockaddr_un cruft
2011-03-04 21:45 ` [PATCH 4/4] af_unix: remove unused struct sockaddr_un cruft Hagen Paul Pfeifer
@ 2011-03-07 23:51 ` David Miller
0 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2011-03-07 23:51 UTC (permalink / raw)
To: hagen; +Cc: netdev
From: Hagen Paul Pfeifer <hagen@jauu.net>
Date: Fri, 4 Mar 2011 22:45:06 +0100
> Signed-off-by: Hagen Paul Pfeifer <hagen@jauu.net>
Applied.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2011-03-07 23:51 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-04 21:45 [PATCH 1/4] mcast: net_device dev not used Hagen Paul Pfeifer
2011-03-04 21:45 ` [PATCH 2/4] af_packet: struct socket declared/assigned but unused Hagen Paul Pfeifer
2011-03-07 23:51 ` David Miller
2011-03-04 21:45 ` [PATCH 3/4] sctp: several declared/set but unused fixes Hagen Paul Pfeifer
2011-03-07 23:51 ` David Miller
2011-03-04 21:45 ` [PATCH 4/4] af_unix: remove unused struct sockaddr_un cruft Hagen Paul Pfeifer
2011-03-07 23:51 ` David Miller
2011-03-07 23:51 ` [PATCH 1/4] mcast: net_device dev not used David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).