mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 10:57:46 +00:00
[HAMRADIO]: driver cleanups
Misc related cleanups in hamradio drivers: o Use symbolic constants instead of magic numbers o Don't try to handle the case where AX.25 isn't configured - the kernel configuration doesn't permit that. o Remove useless headers Signed-off-by: Ralf Baechle DL5RB <ralf@linux-mips.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
59c2353dd0
commit
c4bc7ee2e4
4 changed files with 13 additions and 50 deletions
|
@ -40,7 +40,7 @@
|
|||
|
||||
/*****************************************************************************/
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <linux/crc-ccitt.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/init.h>
|
||||
|
@ -48,18 +48,12 @@
|
|||
#include <linux/workqueue.h>
|
||||
#include <linux/fs.h>
|
||||
#include <linux/parport.h>
|
||||
#include <linux/smp_lock.h>
|
||||
#include <asm/uaccess.h>
|
||||
#include <linux/if_arp.h>
|
||||
#include <linux/kmod.h>
|
||||
#include <linux/hdlcdrv.h>
|
||||
#include <linux/baycom.h>
|
||||
#include <linux/jiffies.h>
|
||||
#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
|
||||
/* prototypes for ax25_encapsulate and ax25_rebuild_header */
|
||||
#include <net/ax25.h>
|
||||
#endif /* CONFIG_AX25 || CONFIG_AX25_MODULE */
|
||||
#include <linux/crc-ccitt.h>
|
||||
#include <asm/uaccess.h>
|
||||
|
||||
/* --------------------------------------------------------------------- */
|
||||
|
||||
|
@ -1177,13 +1171,8 @@ static void baycom_probe(struct net_device *dev)
|
|||
/* Fill in the fields of the device structure */
|
||||
bc->skb = NULL;
|
||||
|
||||
#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
|
||||
dev->hard_header = ax25_encapsulate;
|
||||
dev->rebuild_header = ax25_rebuild_header;
|
||||
#else /* CONFIG_AX25 || CONFIG_AX25_MODULE */
|
||||
dev->hard_header = NULL;
|
||||
dev->rebuild_header = NULL;
|
||||
#endif /* CONFIG_AX25 || CONFIG_AX25_MODULE */
|
||||
dev->set_mac_address = baycom_set_mac_address;
|
||||
|
||||
dev->type = ARPHRD_AX25; /* AF_AX25 device */
|
||||
|
|
|
@ -449,12 +449,12 @@ module_exit(dmascc_exit);
|
|||
static void dev_setup(struct net_device *dev)
|
||||
{
|
||||
dev->type = ARPHRD_AX25;
|
||||
dev->hard_header_len = 73;
|
||||
dev->hard_header_len = AX25_MAX_HEADER_LEN;
|
||||
dev->mtu = 1500;
|
||||
dev->addr_len = 7;
|
||||
dev->addr_len = AX25_ADDR_LEN;
|
||||
dev->tx_queue_len = 64;
|
||||
memcpy(dev->broadcast, ax25_broadcast, 7);
|
||||
memcpy(dev->dev_addr, ax25_test, 7);
|
||||
memcpy(dev->broadcast, ax25_broadcast, AX25_ADDR_LEN);
|
||||
memcpy(dev->dev_addr, ax25_test, AX25_ADDR_LEN);
|
||||
}
|
||||
|
||||
static int __init setup_adapter(int card_base, int type, int n)
|
||||
|
|
|
@ -42,7 +42,6 @@
|
|||
|
||||
/*****************************************************************************/
|
||||
|
||||
#include <linux/config.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/net.h>
|
||||
|
@ -52,20 +51,14 @@
|
|||
#include <linux/errno.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/bitops.h>
|
||||
#include <asm/uaccess.h>
|
||||
|
||||
#include <linux/netdevice.h>
|
||||
#include <linux/if_arp.h>
|
||||
#include <linux/etherdevice.h>
|
||||
#include <linux/skbuff.h>
|
||||
#include <linux/hdlcdrv.h>
|
||||
/* prototypes for ax25_encapsulate and ax25_rebuild_header */
|
||||
#include <net/ax25.h>
|
||||
#include <asm/uaccess.h>
|
||||
|
||||
/* make genksyms happy */
|
||||
#include <linux/ip.h>
|
||||
#include <linux/udp.h>
|
||||
#include <linux/tcp.h>
|
||||
#include <linux/crc-ccitt.h>
|
||||
|
||||
/* --------------------------------------------------------------------- */
|
||||
|
@ -708,13 +701,8 @@ static void hdlcdrv_setup(struct net_device *dev)
|
|||
|
||||
s->skb = NULL;
|
||||
|
||||
#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
|
||||
dev->hard_header = ax25_encapsulate;
|
||||
dev->rebuild_header = ax25_rebuild_header;
|
||||
#else /* CONFIG_AX25 || CONFIG_AX25_MODULE */
|
||||
dev->hard_header = NULL;
|
||||
dev->rebuild_header = NULL;
|
||||
#endif /* CONFIG_AX25 || CONFIG_AX25_MODULE */
|
||||
dev->set_mac_address = hdlcdrv_set_mac_address;
|
||||
|
||||
dev->type = ARPHRD_AX25; /* AF_AX25 device */
|
||||
|
|
|
@ -60,15 +60,7 @@
|
|||
#include <linux/if_arp.h>
|
||||
#include <linux/etherdevice.h>
|
||||
#include <linux/skbuff.h>
|
||||
#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
|
||||
/* prototypes for ax25_encapsulate and ax25_rebuild_header */
|
||||
#include <net/ax25.h>
|
||||
#endif /* CONFIG_AX25 || CONFIG_AX25_MODULE */
|
||||
|
||||
/* make genksyms happy */
|
||||
#include <linux/ip.h>
|
||||
#include <linux/udp.h>
|
||||
#include <linux/tcp.h>
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/proc_fs.h>
|
||||
|
@ -1116,23 +1108,17 @@ static void yam_setup(struct net_device *dev)
|
|||
|
||||
skb_queue_head_init(&yp->send_queue);
|
||||
|
||||
#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
|
||||
dev->hard_header = ax25_encapsulate;
|
||||
dev->rebuild_header = ax25_rebuild_header;
|
||||
#else /* CONFIG_AX25 || CONFIG_AX25_MODULE */
|
||||
dev->hard_header = NULL;
|
||||
dev->rebuild_header = NULL;
|
||||
#endif /* CONFIG_AX25 || CONFIG_AX25_MODULE */
|
||||
|
||||
dev->set_mac_address = yam_set_mac_address;
|
||||
|
||||
dev->type = ARPHRD_AX25; /* AF_AX25 device */
|
||||
dev->hard_header_len = 73; /* We do digipeaters now */
|
||||
dev->mtu = 256; /* AX25 is the default */
|
||||
dev->addr_len = 7; /* sizeof an ax.25 address */
|
||||
memcpy(dev->broadcast, ax25_bcast, 7);
|
||||
memcpy(dev->dev_addr, ax25_test, 7);
|
||||
|
||||
dev->type = ARPHRD_AX25;
|
||||
dev->hard_header_len = AX25_MAX_HEADER_LEN;
|
||||
dev->mtu = AX25_MTU;
|
||||
dev->addr_len = AX25_ADDR_LEN;
|
||||
memcpy(dev->broadcast, ax25_bcast, AX25_ADDR_LEN);
|
||||
memcpy(dev->dev_addr, ax25_test, AX25_ADDR_LEN);
|
||||
}
|
||||
|
||||
static int __init yam_init_driver(void)
|
||||
|
|
Loading…
Reference in a new issue