Commit b63c755c authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by David S. Miller
Browse files

appletalk: Remove deadcode 



alloc_ltalkdev in net/appletalk/dev.c is dead since
commit 00f3696f ("net: appletalk: remove cops support")

Removing it (and it's helper) leaves dev.c and if_ltalk.h empty;
remove them and the Makefile entry.

tun.c was including that if_ltalk.h but actually wanted
the uapi version for LTALK_ALEN, fix up the path.

Signed-off-by: default avatarDr. David Alan Gilbert <linux@treblig.org>
Reviewed-by: default avatarWillem de Bruijn <willemb@google.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2ee73c54

drivers/net/tun.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ 
#include <linux/bpf_trace.h>

#include <linux/mutex.h>

#include <linux/ieee802154.h>

#include <linux/if_ltalk.h>

#include <uapi/linux/if_ltalk.h>

#include <uapi/linux/if_fddi.h>

#include <uapi/linux/if_hippi.h>

#include <uapi/linux/if_fc.h>

include/linux/if_ltalk.h

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __LINUX_LTALK_H

#define __LINUX_LTALK_H



#include <uapi/linux/if_ltalk.h>



extern struct net_device *alloc_ltalkdev(int sizeof_priv);

#endif

net/appletalk/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,6 +5,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

net/appletalk/dev.c

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * 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 void ltalk_setup(struct net_device *dev)

{

	/* Fill in the fields of the device structure with localtalk-generic values. */



	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;

}



/**

 * alloc_ltalkdev - Allocates and sets up an localtalk device

 * @sizeof_priv: Size of additional driver-private structure to be allocated

 *	for this localtalk device

 *

 * Fill in the fields of the device structure with localtalk-generic

 * values. Basically does everything except registering the device.

 *

 * Constructs a new net device, complete with a private data area of

 * size @sizeof_priv.  A 32-byte (not bit) alignment is enforced for

 * this private data area.

 */



struct net_device *alloc_ltalkdev(int sizeof_priv)

{

	return alloc_netdev(sizeof_priv, "lt%d", NET_NAME_UNKNOWN,

			    ltalk_setup);

}

EXPORT_SYMBOL(alloc_ltalkdev);