[PATCH] econet: remove compiler warnings

Subsystems: networking [general], the rest

STALE5738d

3 messages, 3 authors, 2011-01-27 · open the first message on its own page

[PATCH] econet: remove compiler warnings

From: Eric Dumazet <hidden>
Date: 2011-01-26 10:04:22

net/econet/af_econet.c: In function ‘econet_sendmsg’:
net/econet/af_econet.c:494: warning: label ‘error’ defined but not used
net/econet/af_econet.c:268: warning: unused variable ‘sk’

Signed-off-by: Eric Dumazet <redacted>
---
 net/econet/af_econet.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/econet/af_econet.c b/net/econet/af_econet.c
index 15dcc1a..0c28263 100644
--- a/net/econet/af_econet.c
+++ b/net/econet/af_econet.c
@@ -265,13 +265,13 @@ static void ec_tx_done(struct sk_buff *skb, int result)
 static int econet_sendmsg(struct kiocb *iocb, struct socket *sock,
 			  struct msghdr *msg, size_t len)
 {
-	struct sock *sk = sock->sk;
 	struct sockaddr_ec *saddr=(struct sockaddr_ec *)msg->msg_name;
 	struct net_device *dev;
 	struct ec_addr addr;
 	int err;
 	unsigned char port, cb;
 #if defined(CONFIG_ECONET_AUNUDP) || defined(CONFIG_ECONET_NATIVE)
+	struct sock *sk = sock->sk;
 	struct sk_buff *skb;
 	struct ec_cb *eb;
 #endif
@@ -488,10 +488,10 @@ static int econet_sendmsg(struct kiocb *iocb, struct socket *sock,
 
 error_free_buf:
 	vfree(userbuf);
+error:
 #else
 	err = -EPROTOTYPE;
 #endif
-	error:
 	mutex_unlock(&econet_mutex);
 
 	return err;

Re: [PATCH] econet: remove compiler warnings

From: Phil Blundell <philb@gnu.org>
Date: 2011-01-26 13:54:31

On Wed, Jan 26, 2011 at 11:04:18AM +0100, Eric Dumazet wrote:
net/econet/af_econet.c: In function ‘econet_sendmsg’:
net/econet/af_econet.c:494: warning: label ‘error’ defined but not used
net/econet/af_econet.c:268: warning: unused variable ‘sk’

Signed-off-by: Eric Dumazet <redacted>
Thanks, looks sensible.

Acked-by: Phil Blundell <philb@gnu.org>

p.

Re: [PATCH] econet: remove compiler warnings

From: David Miller <davem@davemloft.net>
Date: 2011-01-27 22:23:39

From: Phil Blundell <philb@gnu.org>
Date: Wed, 26 Jan 2011 14:19:59 +0100
On Wed, Jan 26, 2011 at 11:04:18AM +0100, Eric Dumazet wrote:
quoted
net/econet/af_econet.c: In function ‘econet_sendmsg’:
net/econet/af_econet.c:494: warning: label ‘error’ defined but not used
net/econet/af_econet.c:268: warning: unused variable ‘sk’

Signed-off-by: Eric Dumazet <redacted>
Thanks, looks sensible.

Acked-by: Phil Blundell <philb@gnu.org>
Applied, thanks everyone.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help