diff --git a/[refs] b/[refs]
index 25f41df4fabb..f011bd944a73 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28633514afd68afa77ed2fa34fa53626837bf2d5
+refs/heads/master: d93077fb0e7cb9d4f4094a649501d840c55fdc8b
diff --git a/trunk/include/net/irda/irlap.h b/trunk/include/net/irda/irlap.h
index f55e86e75030..2127cae1e0a6 100644
--- a/trunk/include/net/irda/irlap.h
+++ b/trunk/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/trunk/net/irda/irda_device.c b/trunk/net/irda/irda_device.c
index 890bac0d4a56..e3debbdb67f5 100644
--- a/trunk/net/irda/irda_device.c
+++ b/trunk/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;