Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

appletalk: Remove deadcode

alloc_ltalkdev in net/appletalk/dev.c is dead since
commit 00f3696f7555 ("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: Dr. David Alan Gilbert <linux@treblig.org>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Dr. David Alan Gilbert and committed by
David S. Miller
b63c755c 2ee73c54

+2 -56
+1 -1
drivers/net/tun.c
··· 71 71 #include <linux/bpf_trace.h> 72 72 #include <linux/mutex.h> 73 73 #include <linux/ieee802154.h> 74 - #include <linux/if_ltalk.h> 74 + #include <uapi/linux/if_ltalk.h> 75 75 #include <uapi/linux/if_fddi.h> 76 76 #include <uapi/linux/if_hippi.h> 77 77 #include <uapi/linux/if_fc.h>
-8
include/linux/if_ltalk.h
··· 1 - /* SPDX-License-Identifier: GPL-2.0 */ 2 - #ifndef __LINUX_LTALK_H 3 - #define __LINUX_LTALK_H 4 - 5 - #include <uapi/linux/if_ltalk.h> 6 - 7 - extern struct net_device *alloc_ltalkdev(int sizeof_priv); 8 - #endif
+1 -1
net/appletalk/Makefile
··· 5 5 6 6 obj-$(CONFIG_ATALK) += appletalk.o 7 7 8 - appletalk-y := aarp.o ddp.o dev.o 8 + appletalk-y := aarp.o ddp.o 9 9 appletalk-$(CONFIG_PROC_FS) += atalk_proc.o 10 10 appletalk-$(CONFIG_SYSCTL) += sysctl_net_atalk.o
-46
net/appletalk/dev.c
··· 1 - // SPDX-License-Identifier: GPL-2.0 2 - /* 3 - * Moved here from drivers/net/net_init.c, which is: 4 - * Written 1993,1994,1995 by Donald Becker. 5 - */ 6 - 7 - #include <linux/errno.h> 8 - #include <linux/module.h> 9 - #include <linux/netdevice.h> 10 - #include <linux/if_arp.h> 11 - #include <linux/if_ltalk.h> 12 - 13 - static void ltalk_setup(struct net_device *dev) 14 - { 15 - /* Fill in the fields of the device structure with localtalk-generic values. */ 16 - 17 - dev->type = ARPHRD_LOCALTLK; 18 - dev->hard_header_len = LTALK_HLEN; 19 - dev->mtu = LTALK_MTU; 20 - dev->addr_len = LTALK_ALEN; 21 - dev->tx_queue_len = 10; 22 - 23 - dev->broadcast[0] = 0xFF; 24 - 25 - dev->flags = IFF_BROADCAST|IFF_MULTICAST|IFF_NOARP; 26 - } 27 - 28 - /** 29 - * alloc_ltalkdev - Allocates and sets up an localtalk device 30 - * @sizeof_priv: Size of additional driver-private structure to be allocated 31 - * for this localtalk device 32 - * 33 - * Fill in the fields of the device structure with localtalk-generic 34 - * values. Basically does everything except registering the device. 35 - * 36 - * Constructs a new net device, complete with a private data area of 37 - * size @sizeof_priv. A 32-byte (not bit) alignment is enforced for 38 - * this private data area. 39 - */ 40 - 41 - struct net_device *alloc_ltalkdev(int sizeof_priv) 42 - { 43 - return alloc_netdev(sizeof_priv, "lt%d", NET_NAME_UNKNOWN, 44 - ltalk_setup); 45 - } 46 - EXPORT_SYMBOL(alloc_ltalkdev);