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

Commit d93077fb authored Feb 09, 2006 by Samuel Ortiz Committed by David S. Miller Feb 09, 2006

[IRDA]: Set proper IrLAP device address length



This patch set IrDA's addr_len properly, i.e to 4 bytes, the size of the
IrLAP device address.

Signed-off-by: Samuel Ortiz <samuel.ortiz@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 28633514

include/net/irda/irlap.h

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -50,6 +50,9 @@
	/* May be different when we get VFIR */		/* May be different when we get VFIR */
	#define LAP_MAX_HEADER (LAP_ADDR_HEADER + LAP_CTRL_HEADER)		#define LAP_MAX_HEADER (LAP_ADDR_HEADER + LAP_CTRL_HEADER)

			/* Each IrDA device gets a random 32 bits IRLAP device address */
			#define LAP_ALEN 4

	#define BROADCAST 0xffffffff /* Broadcast device address */		#define BROADCAST 0xffffffff /* Broadcast device address */
	#define CBROADCAST 0xfe /* Connection broadcast address */		#define CBROADCAST 0xfe /* Connection broadcast address */
	#define XID_FORMAT 0x01 /* Discovery XID format */		#define XID_FORMAT 0x01 /* Discovery XID format */

net/irda/irda_device.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -343,12 +343,12 @@ static void irda_task_timer_expired(void *data)
	static void irda_device_setup(struct net_device *dev)		static void irda_device_setup(struct net_device *dev)
	{		{
	dev->hard_header_len = 0;		dev->hard_header_len = 0;
	dev->addr_len = 0;		dev->addr_len = LAP_ALEN;

	dev->type = ARPHRD_IRDA;		dev->type = ARPHRD_IRDA;
	dev->tx_queue_len = 8; /* Window size + 1 s-frame */		dev->tx_queue_len = 8; /* Window size + 1 s-frame */

	memset(dev->broadcast, 0xff, 4);		memset(dev->broadcast, 0xff, LAP_ALEN);

	dev->mtu = 2048;		dev->mtu = 2048;
	dev->flags = IFF_NOARP;		dev->flags = IFF_NOARP;