2004-11-15 11:59:42

by Andries E. Brouwer

[permalink] [raw]
Subject: [PATCH] appletalk Makefile

There is no dev.c in net/appletalk.

diff -uprN -X /linux/dontdiff a/net/appletalk/Makefile b/net/appletalk/Makefile
--- a/net/appletalk/Makefile 2004-11-15 11:44:20.000000000 +0100
+++ b/net/appletalk/Makefile 2004-11-15 12:47:12.000000000 +0100
@@ -4,6 +4,6 @@

obj-$(CONFIG_ATALK) += appletalk.o

-appletalk-y := aarp.o ddp.o dev.o
+appletalk-y := aarp.o ddp.o
appletalk-$(CONFIG_PROC_FS) += atalk_proc.o
appletalk-$(CONFIG_SYSCTL) += sysctl_net_atalk.o


2004-11-15 12:04:39

by Christoph Hellwig

[permalink] [raw]
Subject: Re: [PATCH] appletalk Makefile

On Mon, Nov 15, 2004 at 12:58:44PM +0100, [email protected] wrote:
> There is no dev.c in net/appletalk.

Dave forgot to bk add it when I sent him the patch. Here's what
should be dev.c:

------------ snip ------------
/*
* Moved here from drivers/net/net_init.c, which is:
* Written 1993,1994,1995 by Donald Becker.
*/

#include <linux/errno.h>
#include <linux/module.h>
#include <linux/netdevice.h>
#include <linux/if_arp.h>
#include <linux/if_ltalk.h>

static int ltalk_change_mtu(struct net_device *dev, int mtu)
{
return -EINVAL;
}

static int ltalk_mac_addr(struct net_device *dev, void *addr)
{
return -EINVAL;
}

void ltalk_setup(struct net_device *dev)
{
dev->change_mtu = ltalk_change_mtu;
dev->hard_header = NULL;
dev->rebuild_header = NULL;
dev->set_mac_address = ltalk_mac_addr;
dev->hard_header_cache = NULL;
dev->header_cache_update= NULL;

dev->type = ARPHRD_LOCALTLK;
dev->hard_header_len = LTALK_HLEN;
dev->mtu = LTALK_MTU;
dev->addr_len = LTALK_ALEN;
dev->tx_queue_len = 10;

dev->broadcast[0] = 0xFF;

dev->flags = IFF_BROADCAST|IFF_MULTICAST|IFF_NOARP;
}
EXPORT_SYMBOL(ltalk_setup);

2004-11-15 12:51:25

by Andries E. Brouwer

[permalink] [raw]
Subject: Re: [PATCH] appletalk Makefile

On Mon, Nov 15, 2004 at 01:04:09PM +0100, Christoph Hellwig wrote:
> On Mon, Nov 15, 2004 at 12:58:44PM +0100, [email protected] wrote:
> > There is no dev.c in net/appletalk.
>
> Dave forgot to bk add it when I sent him the patch. Here's what
> should be dev.c:

Thanks!

(Looking why I did not need this, I see that ltalk_setup is referenced
only by ltpc.c and cops.c. But it would be a bit messy to express this
dependence.)

Andries

2004-11-15 12:53:17

by Christoph Hellwig

[permalink] [raw]
Subject: Re: [PATCH] appletalk Makefile

On Mon, Nov 15, 2004 at 01:51:05PM +0100, Andries Brouwer wrote:
> On Mon, Nov 15, 2004 at 01:04:09PM +0100, Christoph Hellwig wrote:
> > On Mon, Nov 15, 2004 at 12:58:44PM +0100, [email protected] wrote:
> > > There is no dev.c in net/appletalk.
> >
> > Dave forgot to bk add it when I sent him the patch. Here's what
> > should be dev.c:
>
> Thanks!
>
> (Looking why I did not need this, I see that ltalk_setup is referenced
> only by ltpc.c and cops.c. But it would be a bit messy to express this
> dependence.)

Depencies haven't changed from the previous state (when it was ifdef'ed
in drivers/net/net_init.c)