Commit 168521c4 authored by Hideaki Yoshifuji's avatar Hideaki Yoshifuji

[ECONET]: Fix some warnings.

parent f614ba1b
......@@ -201,7 +201,7 @@ static int econet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len
return 0;
}
#ifdef CONFIG_ECONET_NATIVE
#if defined(CONFIG_ECONET_AUNUDP) || defined(CONFIG_ECONET_NATIVE)
/*
* Queue a transmit result for the user to be told about.
*/
......@@ -228,7 +228,9 @@ static void tx_result(struct sock *sk, unsigned long cookie, int result)
if (sock_queue_rcv_skb(sk, skb) < 0)
kfree_skb(skb);
}
#endif
#ifdef CONFIG_ECONET_NATIVE
/*
* Called by the Econet hardware driver when a packet transmit
* has completed. Tell the user.
......@@ -255,8 +257,10 @@ static int econet_sendmsg(struct kiocb *iocb, struct socket *sock,
struct ec_addr addr;
int err;
unsigned char port, cb;
struct sk_buff *skb = 0;
struct ec_cb *eb = 0;
#if defined(CONFIG_ECONET_AUNUDP) || defined(CONFIG_ECONET_NATIVE)
struct sk_buff *skb;
struct ec_cb *eb;
#endif
#ifdef CONFIG_ECONET_AUNUDP
struct msghdr udpmsg;
struct iovec iov[msg->msg_iovlen+1];
......@@ -717,7 +721,7 @@ static struct proto_ops SOCKOPS_WRAPPED(econet_ops) = {
#include <linux/smp_lock.h>
SOCKOPS_WRAP(econet, PF_ECONET);
#ifdef CONFIG_ECONET_AUNUDP
#if defined(CONFIG_ECONET_AUNUDP) || defined(CONFIG_ECONET_NATIVE)
/*
* Find the listening socket, if any, for the given data.
*/
......@@ -761,7 +765,9 @@ static int ec_queue_packet(struct sock *sk, struct sk_buff *skb,
return sock_queue_rcv_skb(sk, skb);
}
#endif
#ifdef CONFIG_ECONET_AUNUDP
/*
* 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