[PATCH] ECONET: fix compilation failure

[YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@xxxxxxxxxxxxxx>]

Hello.

Econet (CONFIG_ECONET) does not compile if "AUN over UDP" 
(CONFIG_ECONET_UDP) is enabled.

D: Fix compilation failure when CONFIG_ECONET_UDP is set.

Signed-Off-By: Hideaki YOSHIFUJI <yoshfuji@xxxxxxxxxxxxxx>

Thanks.

===== net/econet/af_econet.c 1.38 vs edited =====
--- 1.38/net/econet/af_econet.c 2004-06-16 12:33:01 +09:00
+++ edited/net/econet/af_econet.c       2004-06-20 07:37:22 +09:00
@@ -201,7 +201,7 @@
        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 @@
        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,6 +257,10 @@
        struct ec_addr addr;
        int err;
        unsigned char port, cb;
+#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];
@@ -311,8 +317,6 @@
        {
                /* Real hardware Econet.  We're not worthy etc. */
 #ifdef CONFIG_ECONET_NATIVE
-               struct ec_cb *eb;
-               struct sk_buff *skb;
                unsigned short proto = 0;
 
                dev_hold(dev);
@@ -717,7 +721,7 @@
 #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 @@
 
        return sock_queue_rcv_skb(sk, skb);
 }
+#endif
 
+#ifdef CONFIG_ECONET_AUNUDP
 /*
  *     Send an AUN protocol response. 
  */

-- 
Hideaki YOSHIFUJI @ USAGI Project <yoshfuji@xxxxxxxxxxxxxx>
GPG FP: 9022 65EB 1ECF 3AD1 0BDF  80D8 4807 F894 E062 0EEA