| Message ID | 1296036258.2899.44.camel@edumazet-laptop |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
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 <eric.dumazet@gmail.com> Thanks, looks sensible. Acked-by: Phil Blundell <philb@gnu.org> p. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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: >> 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 <eric.dumazet@gmail.com> > > Thanks, looks sensible. > > Acked-by: Phil Blundell <philb@gnu.org> Applied, thanks everyone.
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;
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 <eric.dumazet@gmail.com> --- net/econet/af_econet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html