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]
/
drivers
/
net
/
wan
/
dlci.c
diff --git
a/drivers/net/wan/dlci.c
b/drivers/net/wan/dlci.c
index
82798fd
..
7369875
100644
(file)
--- a/
drivers/net/wan/dlci.c
+++ b/
drivers/net/wan/dlci.c
@@
-28,7
+28,6
@@
* 2 of the License, or (at your option) any later version.
*/
* 2 of the License, or (at your option) any later version.
*/
-#include <linux/config.h> /* for CONFIG_DLCI_COUNT */
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/types.h>
@@
-45,11
+44,11
@@
#include <linux/skbuff.h>
#include <linux/if_arp.h>
#include <linux/if_frad.h>
#include <linux/skbuff.h>
#include <linux/if_arp.h>
#include <linux/if_frad.h>
+#include <linux/bitops.h>
#include <net/sock.h>
#include <asm/system.h>
#include <net/sock.h>
#include <asm/system.h>
-#include <asm/bitops.h>
#include <asm/io.h>
#include <asm/dma.h>
#include <asm/uaccess.h>
#include <asm/io.h>
#include <asm/dma.h>
#include <asm/uaccess.h>
@@
-229,7
+228,7
@@
static int dlci_transmit(struct sk_buff *skb, struct net_device *dev)
return(ret);
}
return(ret);
}
-static int dlci_config(struct net_device *dev, struct dlci_conf *conf, int get)
+static int dlci_config(struct net_device *dev, struct dlci_conf
__user
*conf, int get)
{
struct dlci_conf config;
struct dlci_local *dlp;
{
struct dlci_conf config;
struct dlci_local *dlp;
@@
-286,7
+285,7
@@
static int dlci_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
if (!*(short *)(dev->dev_addr))
return(-EINVAL);
if (!*(short *)(dev->dev_addr))
return(-EINVAL);
- return(dlci_config(dev,
(struct dlci_conf *)
ifr->ifr_data, cmd == DLCI_GET_CONF));
+ return(dlci_config(dev, ifr->ifr_data, cmd == DLCI_GET_CONF));
break;
default:
break;
default:
@@
-454,7
+453,7
@@
static int dlci_del(struct dlci_add *dlci)
return(err);
}
return(err);
}
-static int dlci_ioctl(unsigned int cmd, void *arg)
+static int dlci_ioctl(unsigned int cmd, void
__user
*arg)
{
struct dlci_add add;
int err;
{
struct dlci_add add;
int err;