Commit 090ee8ec authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by Arnaldo Carvalho de Melo

[ECONET] kill some trivial warnings

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@conectiva.com.br>
parent 5d18286c
...@@ -201,6 +201,7 @@ static int econet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len ...@@ -201,6 +201,7 @@ static int econet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len
return 0; return 0;
} }
#ifdef CONFIG_ECONET_NATIVE
/* /*
* Queue a transmit result for the user to be told about. * Queue a transmit result for the user to be told about.
*/ */
...@@ -228,7 +229,6 @@ static void tx_result(struct sock *sk, unsigned long cookie, int result) ...@@ -228,7 +229,6 @@ static void tx_result(struct sock *sk, unsigned long cookie, int result)
kfree_skb(skb); kfree_skb(skb);
} }
#ifdef CONFIG_ECONET_NATIVE
/* /*
* Called by the Econet hardware driver when a packet transmit * Called by the Econet hardware driver when a packet transmit
* has completed. Tell the user. * has completed. Tell the user.
...@@ -255,11 +255,6 @@ static int econet_sendmsg(struct kiocb *iocb, struct socket *sock, ...@@ -255,11 +255,6 @@ static int econet_sendmsg(struct kiocb *iocb, struct socket *sock,
struct ec_addr addr; struct ec_addr addr;
int err; int err;
unsigned char port, cb; unsigned char port, cb;
struct sk_buff *skb;
struct ec_cb *eb;
#ifdef CONFIG_ECONET_NATIVE
unsigned short proto = 0;
#endif
#ifdef CONFIG_ECONET_AUNUDP #ifdef CONFIG_ECONET_AUNUDP
struct msghdr udpmsg; struct msghdr udpmsg;
struct iovec iov[msg->msg_iovlen+1]; struct iovec iov[msg->msg_iovlen+1];
...@@ -316,6 +311,10 @@ static int econet_sendmsg(struct kiocb *iocb, struct socket *sock, ...@@ -316,6 +311,10 @@ static int econet_sendmsg(struct kiocb *iocb, struct socket *sock,
{ {
/* Real hardware Econet. We're not worthy etc. */ /* Real hardware Econet. We're not worthy etc. */
#ifdef CONFIG_ECONET_NATIVE #ifdef CONFIG_ECONET_NATIVE
struct ec_cb *eb;
struct sk_buff *skb;
unsigned short proto = 0;
dev_hold(dev); dev_hold(dev);
skb = sock_alloc_send_skb(sk, len+LL_RESERVED_SPACE(dev), skb = sock_alloc_send_skb(sk, len+LL_RESERVED_SPACE(dev),
...@@ -718,6 +717,7 @@ static struct proto_ops SOCKOPS_WRAPPED(econet_ops) = { ...@@ -718,6 +717,7 @@ static struct proto_ops SOCKOPS_WRAPPED(econet_ops) = {
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
SOCKOPS_WRAP(econet, PF_ECONET); SOCKOPS_WRAP(econet, PF_ECONET);
#ifdef CONFIG_ECONET_AUNUDP
/* /*
* Find the listening socket, if any, for the given data. * Find the listening socket, if any, for the given data.
*/ */
...@@ -762,8 +762,6 @@ static int ec_queue_packet(struct sock *sk, struct sk_buff *skb, ...@@ -762,8 +762,6 @@ static int ec_queue_packet(struct sock *sk, struct sk_buff *skb,
return sock_queue_rcv_skb(sk, skb); return sock_queue_rcv_skb(sk, skb);
} }
#ifdef CONFIG_ECONET_AUNUDP
/* /*
* Send an AUN protocol response. * Send an AUN protocol response.
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment