diff options
| author | Samuel Ortiz <samuel.ortiz@nokia.com> | 2006-02-09 16:58:46 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-02-09 16:58:46 -0800 |
| commit | d93077fb0e7cb9d4f4094a649501d840c55fdc8b (patch) | |
| tree | 4786704b28bdddd2696e2791ea1dc641bf134cb3 | |
| parent | 28633514afd68afa77ed2fa34fa53626837bf2d5 (diff) | |
| download | linux-stable-d93077fb0e7cb9d4f4094a649501d840c55fdc8b.tar.gz linux-stable-d93077fb0e7cb9d4f4094a649501d840c55fdc8b.tar.bz2 linux-stable-d93077fb0e7cb9d4f4094a649501d840c55fdc8b.zip | |
[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>
| -rw-r--r-- | include/net/irda/irlap.h | 3 | ||||
| -rw-r--r-- | net/irda/irda_device.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/net/irda/irlap.h b/include/net/irda/irlap.h index f55e86e75030..2127cae1e0a6 100644 --- a/include/net/irda/irlap.h +++ b/include/net/irda/irlap.h @@ -50,6 +50,9 @@ /* May be different when we get VFIR */ #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 CBROADCAST 0xfe /* Connection broadcast address */ #define XID_FORMAT 0x01 /* Discovery XID format */ diff --git a/net/irda/irda_device.c b/net/irda/irda_device.c index 890bac0d4a56..e3debbdb67f5 100644 --- a/net/irda/irda_device.c +++ b/net/irda/irda_device.c @@ -343,12 +343,12 @@ static void irda_task_timer_expired(void *data) static void irda_device_setup(struct net_device *dev) { dev->hard_header_len = 0; - dev->addr_len = 0; + dev->addr_len = LAP_ALEN; dev->type = ARPHRD_IRDA; 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->flags = IFF_NOARP; |