Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15b1c0e8 authored by Ralf Baechle's avatar Ralf Baechle Committed by David S. Miller
Browse files

[AX.25]: Fix default address and broadcast address initialization. 



Only the callsign but not the SSID part of an AX.25 address is ASCII
based but Linux by initializes the SSID which should be just a 4-bit
number from ASCII anyway.

Fix that and convert the code to use a shared constant for both default
addresses.  While at it, use the same style for null_ax25_address also.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e8cc49bb

drivers/net/hamradio/6pack.c

+2 −7
Original line number Diff line number Diff line
@@ -325,11 +325,6 @@ static int sp_rebuild_header(struct sk_buff *skb) 


static void sp_setup(struct net_device *dev)

{

	static char ax25_bcast[AX25_ADDR_LEN] =

		{'Q'<<1,'S'<<1,'T'<<1,' '<<1,' '<<1,' '<<1,'0'<<1};

	static char ax25_test[AX25_ADDR_LEN] =

		{'L'<<1,'I'<<1,'N'<<1,'U'<<1,'X'<<1,' '<<1,'1'<<1};



	/* Finish setting up the DEVICE info. */

	dev->mtu		= SIXP_MTU;

	dev->hard_start_xmit	= sp_xmit;
@@ -347,8 +342,8 @@ static void sp_setup(struct net_device *dev) 
	dev->tx_timeout		= NULL;



	/* Only activated in AX.25 mode */

	memcpy(dev->broadcast, ax25_bcast, AX25_ADDR_LEN);

	memcpy(dev->dev_addr, ax25_test, AX25_ADDR_LEN);

	memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN);

	memcpy(dev->dev_addr, &ax25_defaddr, AX25_ADDR_LEN);



	SET_MODULE_OWNER(dev);

drivers/net/hamradio/baycom_epp.c

+2 −8
Original line number Diff line number Diff line
@@ -1141,12 +1141,6 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
 */

static void baycom_probe(struct net_device *dev)

{

	static char ax25_bcast[AX25_ADDR_LEN] = {

		'Q' << 1, 'S' << 1, 'T' << 1, ' ' << 1, ' ' << 1, ' ' << 1, '0' << 1

	};

	static char ax25_nocall[AX25_ADDR_LEN] = {

		'L' << 1, 'I' << 1, 'N' << 1, 'U' << 1, 'X' << 1, ' ' << 1, '1' << 1

	};

	const struct hdlcdrv_channel_params dflt_ch_params = { 

		20, 2, 10, 40, 0 

	};
@@ -1182,8 +1176,8 @@ static void baycom_probe(struct net_device *dev) 
	dev->hard_header_len = AX25_MAX_HEADER_LEN + AX25_BPQ_HEADER_LEN;

	dev->mtu = AX25_DEF_PACLEN;        /* eth_mtu is the default */

	dev->addr_len = AX25_ADDR_LEN;     /* sizeof an ax.25 address */

	memcpy(dev->broadcast, ax25_bcast, AX25_ADDR_LEN);

	memcpy(dev->dev_addr, ax25_nocall, AX25_ADDR_LEN);

	memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN);

	memcpy(dev->dev_addr, &ax25_nocall, AX25_ADDR_LEN);

	dev->tx_queue_len = 16;



	/* New style flags */

drivers/net/hamradio/bpqether.c

+2 −7
Original line number Diff line number Diff line
@@ -88,11 +88,6 @@ 


static char banner[] __initdata = KERN_INFO "AX.25: bpqether driver version 004\n";



static unsigned char ax25_bcast[AX25_ADDR_LEN] =

	{'Q' << 1, 'S' << 1, 'T' << 1, ' ' << 1, ' ' << 1, ' ' << 1, '0' << 1};

static unsigned char ax25_defaddr[AX25_ADDR_LEN] =

	{'L' << 1, 'I' << 1, 'N' << 1, 'U' << 1, 'X' << 1, ' ' << 1, '1' << 1};



static char bcast_addr[6]={0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};



static char bpq_eth_addr[6];
@@ -487,8 +482,8 @@ static void bpq_setup(struct net_device *dev) 
	dev->do_ioctl	     = bpq_ioctl;

	dev->destructor	     = free_netdev;



	memcpy(dev->broadcast, ax25_bcast, AX25_ADDR_LEN);

	memcpy(dev->dev_addr,  ax25_defaddr, AX25_ADDR_LEN);

	memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN);

	memcpy(dev->dev_addr,  &ax25_defaddr, AX25_ADDR_LEN);



	dev->flags      = 0;

drivers/net/hamradio/dmascc.c

+2 −8
Original line number Diff line number Diff line
@@ -264,12 +264,6 @@ static int io[MAX_NUM_DEVS] __initdata = { 0, }; 


/* Beware! hw[] is also used in cleanup_module(). */

static struct scc_hardware hw[NUM_TYPES] __initdata_or_module = HARDWARE;

static char ax25_broadcast[7] __initdata =

    { 'Q' << 1, 'S' << 1, 'T' << 1, ' ' << 1, ' ' << 1, ' ' << 1,

'0' << 1 };

static char ax25_test[7] __initdata =

    { 'L' << 1, 'I' << 1, 'N' << 1, 'U' << 1, 'X' << 1, ' ' << 1,

'1' << 1 };





/* Global variables */
@@ -443,8 +437,8 @@ static void __init dev_setup(struct net_device *dev) 
	dev->mtu = 1500;

	dev->addr_len = AX25_ADDR_LEN;

	dev->tx_queue_len = 64;

	memcpy(dev->broadcast, ax25_broadcast, AX25_ADDR_LEN);

	memcpy(dev->dev_addr, ax25_test, AX25_ADDR_LEN);

	memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN);

	memcpy(dev->dev_addr, &ax25_defaddr, AX25_ADDR_LEN);

}



static int __init setup_adapter(int card_base, int type, int n)

drivers/net/hamradio/hdlcdrv.c

+2 −14
Original line number Diff line number Diff line
@@ -63,18 +63,6 @@ 


/* --------------------------------------------------------------------- */



/*

 * The name of the card. Is used for messages and in the requests for

 * io regions, irqs and dma channels

 */



static char ax25_bcast[AX25_ADDR_LEN] =

{'Q' << 1, 'S' << 1, 'T' << 1, ' ' << 1, ' ' << 1, ' ' << 1, '0' << 1};

static char ax25_nocall[AX25_ADDR_LEN] =

{'L' << 1, 'I' << 1, 'N' << 1, 'U' << 1, 'X' << 1, ' ' << 1, '1' << 1};



/* --------------------------------------------------------------------- */



#define KISS_VERBOSE



/* --------------------------------------------------------------------- */
@@ -709,8 +697,8 @@ static void hdlcdrv_setup(struct net_device *dev) 
	dev->hard_header_len = AX25_MAX_HEADER_LEN + AX25_BPQ_HEADER_LEN;

	dev->mtu = AX25_DEF_PACLEN;        /* eth_mtu is the default */

	dev->addr_len = AX25_ADDR_LEN;     /* sizeof an ax.25 address */

	memcpy(dev->broadcast, ax25_bcast, AX25_ADDR_LEN);

	memcpy(dev->dev_addr, ax25_nocall, AX25_ADDR_LEN);

	memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN);

	memcpy(dev->dev_addr, &ax25_defaddr, AX25_ADDR_LEN);

	dev->tx_queue_len = 16;

}