netdev
[Top] [All Lists]

Re: [PATCH] ECONET: fix compilation failure

To: yoshfuji@xxxxxxxxxxxxxx
Subject: Re: [PATCH] ECONET: fix compilation failure
From: "David S. Miller" <davem@xxxxxxxxxx>
Date: Sat, 19 Jun 2004 16:04:51 -0700 (PDT)
Cc: netdev@xxxxxxxxxxx
In-reply-to: <20040620.080053.38195926.yoshfuji@xxxxxxxxxxxxxx>
References: <20040620.080053.38195926.yoshfuji@xxxxxxxxxxxxxx>
Sender: netdev-bounce@xxxxxxxxxxx
   From: YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@xxxxxxxxxxxxxx>
   Date: Sun, 20 Jun 2004 08:00:53 +0900 (JST)

   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>

Andrew Morton already sent me a fix for this, as follows:

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/06/19 11:36:58-07:00 akpm@xxxxxxxx 
#   [NET]: Fix econet build bustage.
#   
#   Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
#   Signed-off-by: David S. Miller <davem@xxxxxxxxxx>
# 
# net/econet/af_econet.c
#   2004/06/19 11:36:43-07:00 akpm@xxxxxxxx +2 -2
#   [NET]: Fix econet build bustage.
#   
#   Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
#   Signed-off-by: David S. Miller <davem@xxxxxxxxxx>
# 
diff -Nru a/net/econet/af_econet.c b/net/econet/af_econet.c
--- a/net/econet/af_econet.c    2004-06-19 16:00:46 -07:00
+++ b/net/econet/af_econet.c    2004-06-19 16:00:46 -07:00
@@ -255,6 +255,8 @@
        struct ec_addr addr;
        int err;
        unsigned char port, cb;
+       struct sk_buff *skb = 0;
+       struct ec_cb *eb = 0;
 #ifdef CONFIG_ECONET_AUNUDP
        struct msghdr udpmsg;
        struct iovec iov[msg->msg_iovlen+1];
@@ -311,8 +313,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);

<Prev in Thread] Current Thread [Next in Thread>