summaryrefslogtreecommitdiffstats
path: root/net/econet
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2011-01-26 00:04:18 +0000
committerDavid S. Miller <davem@davemloft.net>2011-01-27 14:15:54 -0800
commit389f2a18c6a2a5531ac5a155c3ba25784065b1cb (patch)
tree545f2dfc66e580b75ad7c6442e910e0821159bcb /net/econet
parent4bb9ebc78097376b3734c6d3001a96aecac0f7bb (diff)
downloadlinux-389f2a18c6a2a5531ac5a155c3ba25784065b1cb.tar.gz
linux-389f2a18c6a2a5531ac5a155c3ba25784065b1cb.tar.bz2
linux-389f2a18c6a2a5531ac5a155c3ba25784065b1cb.zip
econet: remove compiler warnings
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> Acked-by: Phil Blundell <philb@gnu.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/econet')
-rw-r--r--net/econet/af_econet.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/econet/af_econet.c b/net/econet/af_econet.c
index 15dcc1a586b4..0c2826337919 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;