git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
net
/
irda
/
irda_device.c
diff --git
a/net/irda/irda_device.c
b/net/irda/irda_device.c
index
70543d8
..
7e7a317
100644
(file)
--- a/
net/irda/irda_device.c
+++ b/
net/irda/irda_device.c
@@
-29,10
+29,10
@@
*
********************************************************************/
*
********************************************************************/
-#include <linux/config.h>
#include <linux/string.h>
#include <linux/proc_fs.h>
#include <linux/skbuff.h>
#include <linux/string.h>
#include <linux/proc_fs.h>
#include <linux/skbuff.h>
+#include <linux/capability.h>
#include <linux/if.h>
#include <linux/if_ether.h>
#include <linux/if_arp.h>
#include <linux/if.h>
#include <linux/if_ether.h>
#include <linux/if_arp.h>
@@
-342,12
+342,12
@@
static void irda_task_timer_expired(void *data)
static void irda_device_setup(struct net_device *dev)
{
dev->hard_header_len = 0;
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 */
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;
dev->mtu = 2048;
dev->flags = IFF_NOARP;
@@
-401,12
+401,10
@@
dongle_t *irda_device_dongle_init(struct net_device *dev, int type)
}
/* Allocate dongle info for this instance */
}
/* Allocate dongle info for this instance */
- dongle = k
m
alloc(sizeof(dongle_t), GFP_KERNEL);
+ dongle = k
z
alloc(sizeof(dongle_t), GFP_KERNEL);
if (!dongle)
goto out;
if (!dongle)
goto out;
- memset(dongle, 0, sizeof(dongle_t));
-
/* Bind the registration info to this particular instance */
dongle->issue = reg;
dongle->dev = dev;
/* Bind the registration info to this particular instance */
dongle->issue = reg;
dongle->dev = dev;