Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

29 files changed, 121 insertions, 92 deletions

diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
index 8e25ca7080c7..f0bd70fb650c 100644
--- a/drivers/net/wan/cosa.c
+++ b/drivers/net/wan/cosa.c
@@ -297,8 +297,8 @@ static ssize_t cosa_write(struct file *file,
 static unsigned int cosa_poll(struct file *file, poll_table *poll);
 static int cosa_open(struct inode *inode, struct file *file);
 static int cosa_release(struct inode *inode, struct file *file);
-static int cosa_chardev_ioctl(struct inode *inode, struct file *file,
-        unsigned int cmd, unsigned long arg);
+static long cosa_chardev_ioctl(struct file *file, unsigned int cmd,
+                                unsigned long arg);
 #ifdef COSA_FASYNC_WORKING
 static int cosa_fasync(struct inode *inode, struct file *file, int on);
 #endif
@@ -309,7 +309,7 @@ static const struct file_operations cosa_fops = {
         .read           = cosa_read,
         .write          = cosa_write,
         .poll           = cosa_poll,
-        .ioctl          = cosa_chardev_ioctl,
+        .unlocked_ioctl = cosa_chardev_ioctl,
         .open           = cosa_open,
         .release        = cosa_release,
 #ifdef COSA_FASYNC_WORKING
@@ -811,7 +811,7 @@ static ssize_t cosa_read(struct file *file,
         cosa_enable_rx(chan);
         spin_lock_irqsave(&cosa->lock, flags);
         add_wait_queue(&chan->rxwaitq, &wait);
-        while(!chan->rx_status) {
+        while (!chan->rx_status) {
                 current->state = TASK_INTERRUPTIBLE;
                 spin_unlock_irqrestore(&cosa->lock, flags);
                 schedule();
@@ -896,7 +896,7 @@ static ssize_t cosa_write(struct file *file,
 
         spin_lock_irqsave(&cosa->lock, flags);
         add_wait_queue(&chan->txwaitq, &wait);
-        while(!chan->tx_status) {
+        while (!chan->tx_status) {
                 current->state = TASK_INTERRUPTIBLE;
                 spin_unlock_irqrestore(&cosa->lock, flags);
                 schedule();
@@ -1153,7 +1153,7 @@ static int cosa_ioctl_common(struct cosa_data *cosa,
         struct channel_data *channel, unsigned int cmd, unsigned long arg)
 {
         void __user *argp = (void __user *)arg;
-        switch(cmd) {
+        switch (cmd) {
         case COSAIORSET:        /* Reset the device */
                 if (!capable(CAP_NET_ADMIN))
                         return -EACCES;
@@ -1205,12 +1205,18 @@ static int cosa_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
         return hdlc_ioctl(dev, ifr, cmd);
 }
 
-static int cosa_chardev_ioctl(struct inode *inode, struct file *file,
-        unsigned int cmd, unsigned long arg)
+static long cosa_chardev_ioctl(struct file *file, unsigned int cmd,
+                                                        unsigned long arg)
 {
         struct channel_data *channel = file->private_data;
-        struct cosa_data *cosa = channel->cosa;
-        return cosa_ioctl_common(cosa, channel, cmd, arg);
+        struct cosa_data *cosa;
+        long ret;
+
+        lock_kernel();
+        cosa = channel->cosa;
+        ret = cosa_ioctl_common(cosa, channel, cmd, arg);
+        unlock_kernel();
+        return ret;
 }
 
 
@@ -1698,7 +1704,7 @@ static inline void tx_interrupt(struct cosa_data *cosa, int status)
                         spin_unlock_irqrestore(&cosa->lock, flags);
                         return;
                 }
-                while(1) {
+                while (1) {
                         cosa->txchan++;
                         i++;
                         if (cosa->txchan >= cosa->nchannels)
@@ -2004,7 +2010,7 @@ again:
 static void debug_status_in(struct cosa_data *cosa, int status)
 {
         char *s;
-        switch(status & SR_CMD_FROM_SRP_MASK) {
+        switch (status & SR_CMD_FROM_SRP_MASK) {
         case SR_UP_REQUEST:
                 s = "RX_REQ";
                 break;
diff --git a/drivers/net/wan/dlci.c b/drivers/net/wan/dlci.c
index 15d353f268b5..421d0715310e 100644
--- a/drivers/net/wan/dlci.c
+++ b/drivers/net/wan/dlci.c
@@ -77,7 +77,7 @@ static int dlci_header(struct sk_buff *skb, struct net_device *dev,
         dlp = netdev_priv(dev);
 
         hdr.control = FRAD_I_UI;
-        switch(type)
+        switch (type)
         {
                 case ETH_P_IP:
                         hdr.IP_NLPID = FRAD_P_IP;
@@ -130,7 +130,7 @@ static void dlci_receive(struct sk_buff *skb, struct net_device *dev)
                 dev->stats.rx_errors++;
         }
         else
-                switch(hdr->IP_NLPID)
+                switch (hdr->IP_NLPID)
                 {
                         case FRAD_P_PADDING:
                                 if (hdr->NLPID != FRAD_P_SNAP)
@@ -208,7 +208,7 @@ static int dlci_config(struct net_device *dev, struct dlci_conf __user *conf, in
 
         if (!get)
         {
-                if(copy_from_user(&config, conf, sizeof(struct dlci_conf)))
+                if (copy_from_user(&config, conf, sizeof(struct dlci_conf)))
                         return -EFAULT;
                 if (config.flags & ~DLCI_VALID_FLAGS)
                         return(-EINVAL);
@@ -222,7 +222,7 @@ static int dlci_config(struct net_device *dev, struct dlci_conf __user *conf, in
 
         if (get)
         {
-                if(copy_to_user(conf, &dlp->config, sizeof(struct dlci_conf)))
+                if (copy_to_user(conf, &dlp->config, sizeof(struct dlci_conf)))
                         return -EFAULT;
         }
 
@@ -238,7 +238,7 @@ static int dlci_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 
         dlp = netdev_priv(dev);
 
-        switch(cmd)
+        switch (cmd)
         {
                 case DLCI_GET_SLAVE:
                         if (!*(short *)(dev->dev_addr))
@@ -417,7 +417,7 @@ static int dlci_ioctl(unsigned int cmd, void __user *arg)
         if (!capable(CAP_NET_ADMIN))
                 return(-EPERM);
 
-        if(copy_from_user(&add, arg, sizeof(struct dlci_add)))
+        if (copy_from_user(&add, arg, sizeof(struct dlci_add)))
                 return -EFAULT;
 
         switch (cmd)
@@ -426,7 +426,7 @@ static int dlci_ioctl(unsigned int cmd, void __user *arg)
                         err = dlci_add(&add);
 
                         if (!err)
-                                if(copy_to_user(arg, &add, sizeof(struct dlci_add)))
+                                if (copy_to_user(arg, &add, sizeof(struct dlci_add)))
                                         return -EFAULT;
                         break;
 
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index 07d00b4cf48a..a4859f7a7cc0 100644
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -89,6 +89,7 @@
 #include <linux/pci.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
+#include <linux/slab.h>
 
 #include <asm/system.h>
 #include <asm/cache.h>
@@ -1128,7 +1129,7 @@ done:
         init_timer(&dpriv->timer);
         dpriv->timer.expires = jiffies + 10*HZ;
         dpriv->timer.data = (unsigned long)dev;
-        dpriv->timer.function = &dscc4_timer;
+        dpriv->timer.function = dscc4_timer;
         add_timer(&dpriv->timer);
         netif_carrier_on(dev);
 
@@ -2050,7 +2051,7 @@ static int __init dscc4_setup(char *str)
 __setup("dscc4.setup=", dscc4_setup);
 #endif
 
-static struct pci_device_id dscc4_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(dscc4_pci_tbl) = {
         { PCI_VENDOR_ID_SIEMENS, PCI_DEVICE_ID_SIEMENS_DSCC4,
                 PCI_ANY_ID, PCI_ANY_ID, },
         { 0,}
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c
index beda387f2fc7..e087b9a6daaa 100644
--- a/drivers/net/wan/farsync.c
+++ b/drivers/net/wan/farsync.c
@@ -20,6 +20,7 @@
 #include <linux/version.h>
 #include <linux/pci.h>
 #include <linux/sched.h>
+#include <linux/slab.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/if.h>
@@ -528,7 +529,7 @@ static int fst_debug_mask = { FST_DEBUG };
 /*
  *      PCI ID lookup table
  */
-static struct pci_device_id fst_pci_dev_id[] __devinitdata = {
+static DEFINE_PCI_DEVICE_TABLE(fst_pci_dev_id) = {
         {PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_T2P, PCI_ANY_ID, 
          PCI_ANY_ID, 0, 0, FST_TYPE_T2P},
 
@@ -1346,8 +1347,8 @@ do_bottom_half_tx(struct fst_card_info *card)
 
                 dev = port_to_dev(port);
                 while (!(FST_RDB(card, txDescrRing[pi][port->txpos].bits) &
-                         DMA_OWN)
-                       && !(card->dmatx_in_progress)) {
+                         DMA_OWN) &&
+                       !(card->dmatx_in_progress)) {
                         /*
                          * There doesn't seem to be a txdone event per-se
                          * We seem to have to deduce it, by checking the DMA_OWN
@@ -1379,8 +1380,8 @@ do_bottom_half_tx(struct fst_card_info *card)
                                  */
                                 FST_WRW(card, txDescrRing[pi][port->txpos].bcnt,
                                         cnv_bcnt(skb->len));
-                                if ((skb->len < FST_MIN_DMA_LEN)
-                                    || (card->family == FST_FAMILY_TXP)) {
+                                if ((skb->len < FST_MIN_DMA_LEN) ||
+                                    (card->family == FST_FAMILY_TXP)) {
                                         /* Enqueue the packet with normal io */
                                         memcpy_toio(card->mem +
                                                     BUF_OFFSET(txBuffer[pi]
@@ -2030,8 +2031,8 @@ fst_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                 /* Sanity check the parameters. We don't support partial writes
                  * when going over the top
                  */
-                if (wrthdr.size > FST_MEMSIZE || wrthdr.offset > FST_MEMSIZE
-                    || wrthdr.size + wrthdr.offset > FST_MEMSIZE) {
+                if (wrthdr.size > FST_MEMSIZE || wrthdr.offset > FST_MEMSIZE ||
+                    wrthdr.size + wrthdr.offset > FST_MEMSIZE) {
                         return -ENXIO;
                 }
 
diff --git a/drivers/net/wan/hd64570.c b/drivers/net/wan/hd64570.c
index 80114c93bae7..4dde2ea4a189 100644
--- a/drivers/net/wan/hd64570.c
+++ b/drivers/net/wan/hd64570.c
@@ -37,7 +37,6 @@
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
-#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <asm/io.h>
diff --git a/drivers/net/wan/hd64572.c b/drivers/net/wan/hd64572.c
index 84f01373e11f..aad9ed45c254 100644
--- a/drivers/net/wan/hd64572.c
+++ b/drivers/net/wan/hd64572.c
@@ -37,7 +37,6 @@
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
-#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <asm/io.h>
diff --git a/drivers/net/wan/hdlc.c b/drivers/net/wan/hdlc.c
index cc07236ea734..9937bbab938d 100644
--- a/drivers/net/wan/hdlc.c
+++ b/drivers/net/wan/hdlc.c
@@ -57,7 +57,7 @@ static int hdlc_rcv(struct sk_buff *skb, struct net_device *dev,
 {
         struct hdlc_device *hdlc = dev_to_hdlc(dev);
 
-        if (dev_net(dev) != &init_net) {
+        if (!net_eq(dev_net(dev), &init_net)) {
                 kfree_skb(skb);
                 return 0;
         }
@@ -102,7 +102,7 @@ static int hdlc_device_event(struct notifier_block *this, unsigned long event,
         unsigned long flags;
         int on;
 
-        if (dev_net(dev) != &init_net)
+        if (!net_eq(dev_net(dev), &init_net))
                 return NOTIFY_DONE;
 
         if (!(dev->priv_flags & IFF_WAN_HDLC))
diff --git a/drivers/net/wan/hdlc_cisco.c b/drivers/net/wan/hdlc_cisco.c
index f1bff98acd1f..ee7083fbea50 100644
--- a/drivers/net/wan/hdlc_cisco.c
+++ b/drivers/net/wan/hdlc_cisco.c
@@ -20,7 +20,6 @@
 #include <linux/poll.h>
 #include <linux/rtnetlink.h>
 #include <linux/skbuff.h>
-#include <linux/slab.h>
 
 #undef DEBUG_HARD_HEADER
 
@@ -141,7 +140,7 @@ static __be16 cisco_type_trans(struct sk_buff *skb, struct net_device *dev)
             data->address != CISCO_UNICAST)
                 return cpu_to_be16(ETH_P_HDLC);
 
-        switch(data->protocol) {
+        switch (data->protocol) {
         case cpu_to_be16(ETH_P_IP):
         case cpu_to_be16(ETH_P_IPX):
         case cpu_to_be16(ETH_P_IPV6):
@@ -190,7 +189,7 @@ static int cisco_rx(struct sk_buff *skb)
                 cisco_data = (struct cisco_packet*)(skb->data + sizeof
                                                     (struct hdlc_header));
 
-                switch(ntohl (cisco_data->type)) {
+                switch (ntohl (cisco_data->type)) {
                 case CISCO_ADDR_REQ: /* Stolen from syncppp.c :-) */
                         in_dev = dev->ip_ptr;
                         addr = 0;
@@ -245,8 +244,8 @@ static int cisco_rx(struct sk_buff *skb)
 
                         dev_kfree_skb_any(skb);
                         return NET_RX_SUCCESS;
-                } /* switch(keepalive type) */
-        } /* switch(protocol) */
+                } /* switch (keepalive type) */
+        } /* switch (protocol) */
 
         printk(KERN_INFO "%s: Unsupported protocol %x\n", dev->name,
                ntohs(data->protocol));
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c
index 840cff72a0f1..0e52993e2079 100644
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
@@ -182,7 +182,7 @@ static inline pvc_device* find_pvc(hdlc_device *hdlc, u16 dlci)
                 if (pvc->dlci == dlci)
                         return pvc;
                 if (pvc->dlci > dlci)
-                        return NULL; /* the listed is sorted */
+                        return NULL; /* the list is sorted */
                 pvc = pvc->next;
         }
 
@@ -1214,10 +1214,10 @@ static int fr_ioctl(struct net_device *dev, struct ifreq *ifr)
                 return 0;
 
         case IF_PROTO_FR:
-                if(!capable(CAP_NET_ADMIN))
+                if (!capable(CAP_NET_ADMIN))
                         return -EPERM;
 
-                if(dev->flags & IFF_UP)
+                if (dev->flags & IFF_UP)
                         return -EBUSY;
 
                 if (copy_from_user(&new_settings, fr_s, size))
@@ -1263,7 +1263,7 @@ static int fr_ioctl(struct net_device *dev, struct ifreq *ifr)
                 if (dev_to_hdlc(dev)->proto != &proto) /* Different proto */
                         return -EINVAL;
 
-                if(!capable(CAP_NET_ADMIN))
+                if (!capable(CAP_NET_ADMIN))
                         return -EPERM;
 
                 if (copy_from_user(&pvc, ifr->ifr_settings.ifs_ifsu.fr_pvc,
diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c
index b9b9d6b01c0b..941f053e650e 100644
--- a/drivers/net/wan/hdlc_ppp.c
+++ b/drivers/net/wan/hdlc_ppp.c
@@ -628,9 +628,15 @@ static void ppp_stop(struct net_device *dev)
         ppp_cp_event(dev, PID_LCP, STOP, 0, 0, 0, NULL);
 }
 
+static void ppp_close(struct net_device *dev)
+{
+        ppp_tx_flush();
+}
+
 static struct hdlc_proto proto = {
         .start          = ppp_start,
         .stop           = ppp_stop,
+        .close          = ppp_close,
         .type_trans     = ppp_type_trans,
         .ioctl          = ppp_ioctl,
         .netif_rx       = ppp_rx,
diff --git a/drivers/net/wan/hdlc_raw.c b/drivers/net/wan/hdlc_raw.c
index 19f51fdd5522..5dc153e8a29d 100644
--- a/drivers/net/wan/hdlc_raw.c
+++ b/drivers/net/wan/hdlc_raw.c
@@ -20,7 +20,6 @@
 #include <linux/poll.h>
 #include <linux/rtnetlink.h>
 #include <linux/skbuff.h>
-#include <linux/slab.h>
 
 
 static int raw_ioctl(struct net_device *dev, struct ifreq *ifr);
diff --git a/drivers/net/wan/hdlc_raw_eth.c b/drivers/net/wan/hdlc_raw_eth.c
index 1b30fcc24145..05c9b0b96239 100644
--- a/drivers/net/wan/hdlc_raw_eth.c
+++ b/drivers/net/wan/hdlc_raw_eth.c
@@ -11,6 +11,7 @@
 
 #include <linux/errno.h>
 #include <linux/etherdevice.h>
+#include <linux/gfp.h>
 #include <linux/hdlc.h>
 #include <linux/if_arp.h>
 #include <linux/inetdevice.h>
@@ -21,7 +22,6 @@
 #include <linux/poll.h>
 #include <linux/rtnetlink.h>
 #include <linux/skbuff.h>
-#include <linux/slab.h>
 
 static int raw_eth_ioctl(struct net_device *dev, struct ifreq *ifr);
 
diff --git a/drivers/net/wan/hdlc_x25.c b/drivers/net/wan/hdlc_x25.c
index aa9248f8eb1a..c7adbb79f7cc 100644
--- a/drivers/net/wan/hdlc_x25.c
+++ b/drivers/net/wan/hdlc_x25.c
@@ -10,6 +10,7 @@
  */
 
 #include <linux/errno.h>
+#include <linux/gfp.h>
 #include <linux/hdlc.h>
 #include <linux/if_arp.h>
 #include <linux/inetdevice.h>
@@ -21,7 +22,6 @@
 #include <linux/poll.h>
 #include <linux/rtnetlink.h>
 #include <linux/skbuff.h>
-#include <linux/slab.h>
 #include <net/x25device.h>
 
 static int x25_ioctl(struct net_device *dev, struct ifreq *ifr);
@@ -202,10 +202,10 @@ static int x25_ioctl(struct net_device *dev, struct ifreq *ifr)
                 return 0; /* return protocol only, no settable parameters */
 
         case IF_PROTO_X25:
-                if(!capable(CAP_NET_ADMIN))
+                if (!capable(CAP_NET_ADMIN))
                         return -EPERM;
 
-                if(dev->flags & IFF_UP)
+                if (dev->flags & IFF_UP)
                         return -EBUSY;
 
                 result=hdlc->attach(dev, ENCODING_NRZ,PARITY_CRC16_PR1_CCITT);
diff --git a/drivers/net/wan/hostess_sv11.c b/drivers/net/wan/hostess_sv11.c
index 15002c3d0d95..48edc5f4dac8 100644
--- a/drivers/net/wan/hostess_sv11.c
+++ b/drivers/net/wan/hostess_sv11.c
@@ -30,6 +30,7 @@
 #include <linux/delay.h>
 #include <linux/hdlc.h>
 #include <linux/ioport.h>
+#include <linux/slab.h>
 #include <net/arp.h>
 
 #include <asm/irq.h>
@@ -218,7 +219,7 @@ static struct z8530_dev *sv11_init(int iobase, int irq)
         /* We want a fast IRQ for this device. Actually we'd like an even faster
            IRQ ;) - This is one driver RtLinux is made for */
 
-        if (request_irq(irq, &z8530_interrupt, IRQF_DISABLED,
+        if (request_irq(irq, z8530_interrupt, IRQF_DISABLED,
                         "Hostess SV11", sv) < 0) {
                 printk(KERN_WARNING "hostess: IRQ %d already in use.\n", irq);
                 goto err_irq;
diff --git a/drivers/net/wan/ixp4xx_hss.c b/drivers/net/wan/ixp4xx_hss.c
index c705046d8615..0c2cdde686a0 100644
--- a/drivers/net/wan/ixp4xx_hss.c
+++ b/drivers/net/wan/ixp4xx_hss.c
@@ -18,6 +18,7 @@
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/poll.h>
+#include <linux/slab.h>
 #include <mach/npe.h>
 #include <mach/qmgr.h>
 
diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c
index d1e3c673e9b2..98e2f99903d7 100644
--- a/drivers/net/wan/lapbether.c
+++ b/drivers/net/wan/lapbether.c
@@ -24,6 +24,7 @@
 #include <linux/types.h>
 #include <linux/socket.h>
 #include <linux/in.h>
+#include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/net.h>
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c
index 7ea71b33d2e9..b27850377121 100644
--- a/drivers/net/wan/lmc/lmc_main.c
+++ b/drivers/net/wan/lmc/lmc_main.c
@@ -77,7 +77,7 @@
 
 static int LMC_PKT_BUF_SZ = 1542;
 
-static struct pci_device_id lmc_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(lmc_pci_tbl) = {
         { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP_FAST,
           PCI_VENDOR_ID_LMC, PCI_ANY_ID },
         { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP_FAST,
@@ -927,7 +927,7 @@ static int __devinit lmc_init_one(struct pci_dev *pdev,
         sc->lmc_media = &lmc_t1_media;
         break;
     default:
-        printk(KERN_WARNING "%s: LMC UNKOWN CARD!\n", dev->name);
+        printk(KERN_WARNING "%s: LMC UNKNOWN CARD!\n", dev->name);
         break;
     }
 
@@ -1028,7 +1028,7 @@ static int lmc_open(struct net_device *dev)
     lmc_softreset (sc);
 
     /* Since we have to use PCI bus, this should work on x86,alpha,ppc */
-    if (request_irq (dev->irq, &lmc_interrupt, IRQF_SHARED, dev->name, dev)){
+    if (request_irq (dev->irq, lmc_interrupt, IRQF_SHARED, dev->name, dev)){
         printk(KERN_WARNING "%s: could not get irq: %d\n", dev->name, dev->irq);
         lmc_trace(dev, "lmc_open irq failed out");
         return -EAGAIN;
diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c
index f327674fc93a..5920c996fcdf 100644
--- a/drivers/net/wan/lmc/lmc_media.c
+++ b/drivers/net/wan/lmc/lmc_media.c
@@ -6,7 +6,6 @@
 #include <linux/ptrace.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
-#include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/in.h>
 #include <linux/if_arp.h>
diff --git a/drivers/net/wan/lmc/lmc_proto.c b/drivers/net/wan/lmc/lmc_proto.c
index 044a48175c42..f600075e84a2 100644
--- a/drivers/net/wan/lmc/lmc_proto.c
+++ b/drivers/net/wan/lmc/lmc_proto.c
@@ -25,7 +25,6 @@
 #include <linux/ptrace.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
-#include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/in.h>
 #include <linux/if_arp.h>
diff --git a/drivers/net/wan/n2.c b/drivers/net/wan/n2.c
index 58c66819f39b..5394b51bdb2f 100644
--- a/drivers/net/wan/n2.c
+++ b/drivers/net/wan/n2.c
@@ -376,7 +376,7 @@ static int __init n2_run(unsigned long io, unsigned long irq,
         }
         card->io = io;
 
-        if (request_irq(irq, &sca_intr, 0, devname, card)) {
+        if (request_irq(irq, sca_intr, 0, devname, card)) {
                 printk(KERN_ERR "n2: could not allocate IRQ\n");
                 n2_destroy_card(card);
                 return(-EBUSY);
diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c
index 79dabc557bd3..3f744c643094 100644
--- a/drivers/net/wan/pc300_drv.c
+++ b/drivers/net/wan/pc300_drv.c
@@ -228,6 +228,7 @@ static char rcsid[] =
 #include <linux/etherdevice.h>
 #include <linux/spinlock.h>
 #include <linux/if.h>
+#include <linux/slab.h>
 #include <net/arp.h>
 
 #include <asm/io.h>
@@ -251,7 +252,7 @@ static char rcsid[] =
 #undef  PC300_DEBUG_RX
 #undef  PC300_DEBUG_OTHER
 
-static struct pci_device_id cpc_pci_dev_id[] __devinitdata = {
+static DEFINE_PCI_DEVICE_TABLE(cpc_pci_dev_id) = {
         /* PC300/RSV or PC300/X21, 2 chan */
         {0x120e, 0x300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0x300},
         /* PC300/RSV or PC300/X21, 1 chan */
@@ -514,8 +515,8 @@ static int dma_buf_read(pc300_t * card, int ch, struct sk_buff *skb)
                                   RX_BD_ADDR(ch, chan->rx_first_bd));
         while ((status = cpc_readb(&ptdescr->status)) & DST_OSB) {
                 nchar = cpc_readw(&ptdescr->len);
-                if ((status & (DST_OVR | DST_CRC | DST_RBIT | DST_SHRT | DST_ABT))
-                    || (nchar > BD_DEF_LEN)) {
+                if ((status & (DST_OVR | DST_CRC | DST_RBIT | DST_SHRT | DST_ABT)) ||
+                    (nchar > BD_DEF_LEN)) {
 
                         if (nchar > BD_DEF_LEN)
                                 status |= DST_RBIT;
@@ -1428,8 +1429,7 @@ static void falc_update_stats(pc300_t * card, int ch)
 
                 if (((conf->media == IF_IFACE_T1) &&
                      (cpc_readb(falcbase + F_REG(FRS1, ch)) & FRS1_LLBAD) &&
-                     (!(cpc_readb(falcbase + F_REG(FRS1, ch)) & FRS1_PDEN)))
-                    ||
+                     (!(cpc_readb(falcbase + F_REG(FRS1, ch)) & FRS1_PDEN))) ||
                     ((conf->media == IF_IFACE_E1) &&
                      (cpc_readb(falcbase + F_REG(RSP, ch)) & RSP_LLBAD))) {
                         pfalc->prbs = 2;
@@ -2285,8 +2285,8 @@ static void falc_e1_intr(pc300_t * card, int ch)
                 if (gis & GIS_ISR1) {
                         isr1 = cpc_readb(falcbase + F_REG(FISR1, ch));
                         if (isr1 & FISR1_XMB) {
-                                if ((pfalc->xmb_cause & 2)
-                                    && pfalc->multiframe_mode) {
+                                if ((pfalc->xmb_cause & 2) &&
+                                    pfalc->multiframe_mode) {
                                         if (cpc_readb (falcbase + F_REG(FRS0, ch)) & 
                                                                         (FRS0_LOS | FRS0_AIS | FRS0_LFA)) {
                                                 cpc_writeb(falcbase + F_REG(XSP, ch),
@@ -2639,9 +2639,9 @@ static int cpc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                                                 !(cpc_readb (scabase + M_REG(CTL, ch)) & CTL_DTR);
                                         /* There is no DSR in HD64572 */
                                 }
-                                if (!arg
-                                    || copy_to_user(arg, &pc300status, sizeof(pc300status_t)))
-                                                return -EINVAL;
+                                if (!arg ||
+                                    copy_to_user(arg, &pc300status, sizeof(pc300status_t)))
+                                        return -EINVAL;
                                 return 0;
                         }
 
diff --git a/drivers/net/wan/pc300too.c b/drivers/net/wan/pc300too.c
index 60ece54bdd94..c7ab3becd261 100644
--- a/drivers/net/wan/pc300too.c
+++ b/drivers/net/wan/pc300too.c
@@ -481,7 +481,7 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
 
 
 
-static struct pci_device_id pc300_pci_tbl[] __devinitdata = {
+static DEFINE_PCI_DEVICE_TABLE(pc300_pci_tbl) = {
         { PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_PC300_RX_1, PCI_ANY_ID,
           PCI_ANY_ID, 0, 0, 0 },
         { PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_PC300_RX_2, PCI_ANY_ID,
diff --git a/drivers/net/wan/pci200syn.c b/drivers/net/wan/pci200syn.c
index f1340faaf022..e2cff64a446a 100644
--- a/drivers/net/wan/pci200syn.c
+++ b/drivers/net/wan/pci200syn.c
@@ -417,7 +417,7 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
 
 
 
-static struct pci_device_id pci200_pci_tbl[] __devinitdata = {
+static DEFINE_PCI_DEVICE_TABLE(pci200_pci_tbl) = {
         { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_VENDOR_ID_PLX,
           PCI_DEVICE_ID_PLX_PCI200SYN, 0, 0, 0 },
         { 0, }
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c
index 1cc24a45f003..cff13a9597cd 100644
--- a/drivers/net/wan/sbni.c
+++ b/drivers/net/wan/sbni.c
@@ -43,7 +43,6 @@
 #include <linux/fcntl.h>
 #include <linux/ioport.h>
 #include <linux/interrupt.h>
-#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/netdevice.h>
@@ -195,9 +194,9 @@ static unsigned int  netcard_portlist[ ] __initdata = {
 static inline int __init
 sbni_isa_probe( struct net_device  *dev )
 {
-        if( dev->base_addr > 0x1ff
-            &&  request_region( dev->base_addr, SBNI_IO_EXTENT, dev->name )
-            &&  sbni_probe1( dev, dev->base_addr, dev->irq ) )
+        if( dev->base_addr > 0x1ff &&
+            request_region( dev->base_addr, SBNI_IO_EXTENT, dev->name ) &&
+            sbni_probe1( dev, dev->base_addr, dev->irq ) )
 
                 return  0;
         else {
@@ -286,8 +285,8 @@ static int __init sbni_init(struct net_device *dev)
 
         for( i = 0;  netcard_portlist[ i ];  ++i ) {
                 int  ioaddr = netcard_portlist[ i ];
-                if( request_region( ioaddr, SBNI_IO_EXTENT, dev->name )
-                    &&  sbni_probe1( dev, ioaddr, 0 ))
+                if( request_region( ioaddr, SBNI_IO_EXTENT, dev->name ) &&
+                    sbni_probe1( dev, ioaddr, 0 ))
                         return 0;
         }
 
@@ -306,9 +305,9 @@ sbni_pci_probe( struct net_device  *dev )
                 unsigned long  pci_ioaddr;
                 u16  subsys;
 
-                if( pdev->vendor != SBNI_PCI_VENDOR
-                    &&  pdev->device != SBNI_PCI_DEVICE )
-                                continue;
+                if( pdev->vendor != SBNI_PCI_VENDOR &&
+                    pdev->device != SBNI_PCI_DEVICE )
+                        continue;
 
                 pci_ioaddr = pci_resource_start( pdev, 0 );
                 pci_irq_line = pdev->irq;
@@ -977,8 +976,8 @@ check_fhdr( u32  ioaddr,  u32  *framelen,  u32  *frameno,  u32  *ack,
         *ack = *framelen & FRAME_ACK_MASK;
         *is_first = (*framelen & FRAME_FIRST) != 0;
 
-        if( (*framelen &= FRAME_LEN_MASK) < 6
-            ||  *framelen > SBNI_MAX_FRAME - 3 )
+        if( (*framelen &= FRAME_LEN_MASK) < 6 ||
+            *framelen > SBNI_MAX_FRAME - 3 )
                 return  0;
 
         value = inb( ioaddr + DAT );
@@ -1173,10 +1172,10 @@ sbni_open( struct net_device  *dev )
         if( dev->base_addr < 0x400 ) {          /* ISA only */
                 struct net_device  **p = sbni_cards;
                 for( ;  *p  &&  p < sbni_cards + SBNI_MAX_NUM_CARDS;  ++p )
-                        if( (*p)->irq == dev->irq
-                            &&  ((*p)->base_addr == dev->base_addr + 4
-                                 ||  (*p)->base_addr == dev->base_addr - 4)
-                            &&  (*p)->flags & IFF_UP ) {
+                        if( (*p)->irq == dev->irq &&
+                            ((*p)->base_addr == dev->base_addr + 4 ||
+                             (*p)->base_addr == dev->base_addr - 4) &&
+                            (*p)->flags & IFF_UP ) {
 
                                 ((struct net_local *) (netdev_priv(*p)))
                                         ->second = dev;
diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c
index 2b15a7e40d5b..31c41af2246d 100644
--- a/drivers/net/wan/sdla.c
+++ b/drivers/net/wan/sdla.c
@@ -1457,7 +1457,7 @@ got_type:
         }
 
         err = -EAGAIN;
-        if (request_irq(dev->irq, &sdla_isr, 0, dev->name, dev)) 
+        if (request_irq(dev->irq, sdla_isr, 0, dev->name, dev)) 
                 goto fail;
 
         if (flp->type == SDLA_S507) {
diff --git a/drivers/net/wan/sealevel.c b/drivers/net/wan/sealevel.c
index 0c525e24b247..e91457d6023e 100644
--- a/drivers/net/wan/sealevel.c
+++ b/drivers/net/wan/sealevel.c
@@ -23,6 +23,7 @@
 #include <linux/hdlc.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <net/arp.h>
 
 #include <asm/irq.h>
@@ -84,8 +85,7 @@ static int sealevel_open(struct net_device *d)
          *      Link layer up.
          */
 
-        switch (unit)
-        {
+        switch (unit) {
                 case 0:
                         err = z8530_sync_dma_open(d, slvl->chan);
                         break;
@@ -133,8 +133,7 @@ static int sealevel_close(struct net_device *d)
         hdlc_close(d);
         netif_stop_queue(d);
 
-        switch (unit)
-        {
+        switch (unit) {
                 case 0:
                         z8530_sync_dma_close(d, slvl->chan);
                         break;
@@ -266,7 +265,7 @@ static __init struct slvl_board *slvl_init(int iobase, int irq,
         /* We want a fast IRQ for this device. Actually we'd like an even faster
            IRQ ;) - This is one driver RtLinux is made for */
 
-        if (request_irq(irq, &z8530_interrupt, IRQF_DISABLED,
+        if (request_irq(irq, z8530_interrupt, IRQF_DISABLED,
                         "SeaLevel", dev) < 0) {
                 printk(KERN_WARNING "sealevel: IRQ %d already in use.\n", irq);
                 goto err_request_irq;
@@ -342,8 +341,7 @@ static void __exit slvl_shutdown(struct slvl_board *b)
 
         z8530_shutdown(&b->board);
 
-        for (u = 0; u < 2; u++)
-        {
+        for (u = 0; u < 2; u++) {
                 struct net_device *d = b->dev[u].chan->netdevice;
                 unregister_hdlc_device(d);
                 free_netdev(d);
@@ -391,7 +389,7 @@ static int __init slvl_init_module(void)
 
 static void __exit slvl_cleanup_module(void)
 {
-        if(slvl_unit)
+        if (slvl_unit)
                 slvl_shutdown(slvl_unit);
 }
 
diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c
index daee8a0624ee..541c700dceef 100644
--- a/drivers/net/wan/wanxl.c
+++ b/drivers/net/wan/wanxl.c
@@ -814,7 +814,7 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
         return 0;
 }
 
-static struct pci_device_id wanxl_pci_tbl[] __devinitdata = {
+static DEFINE_PCI_DEVICE_TABLE(wanxl_pci_tbl) = {
         { PCI_VENDOR_ID_SBE, PCI_DEVICE_ID_SBE_WANXL100, PCI_ANY_ID,
           PCI_ANY_ID, 0, 0, 0 },
         { PCI_VENDOR_ID_SBE, PCI_DEVICE_ID_SBE_WANXL200, PCI_ANY_ID,
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
index 27945049c9e1..80d5c5834a0b 100644
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
@@ -33,6 +33,8 @@
 #include <linux/lapb.h>
 #include <linux/init.h>
 #include <linux/rtnetlink.h>
+#include <linux/compat.h>
+#include <linux/slab.h>
 #include "x25_asy.h"
 
 #include <net/x25device.h>
@@ -656,8 +658,8 @@ static void x25_asy_unesc(struct x25_asy *sl, unsigned char s)
 
         switch (s) {
         case X25_END:
-                if (!test_and_clear_bit(SLF_ERROR, &sl->flags)
-                        && sl->rcount > 2)
+                if (!test_and_clear_bit(SLF_ERROR, &sl->flags) &&
+                    sl->rcount > 2)
                         x25_asy_bump(sl);
                 clear_bit(SLF_ESCAPE, &sl->flags);
                 sl->rcount = 0;
@@ -705,6 +707,21 @@ static int x25_asy_ioctl(struct tty_struct *tty, struct file *file,
         }
 }
 
+#ifdef CONFIG_COMPAT
+static long x25_asy_compat_ioctl(struct tty_struct *tty, struct file *file,
+                         unsigned int cmd,  unsigned long arg)
+{
+        switch (cmd) {
+        case SIOCGIFNAME:
+        case SIOCSIFHWADDR:
+                return x25_asy_ioctl(tty, file, cmd,
+                                     (unsigned long)compat_ptr(arg));
+        }
+
+        return -ENOIOCTLCMD;
+}
+#endif
+
 static int x25_asy_open_dev(struct net_device *dev)
 {
         struct x25_asy *sl = netdev_priv(dev);
@@ -754,6 +771,9 @@ static struct tty_ldisc_ops x25_ldisc = {
         .open           = x25_asy_open_tty,
         .close          = x25_asy_close_tty,
         .ioctl          = x25_asy_ioctl,
+#ifdef CONFIG_COMPAT
+        .compat_ioctl   = x25_asy_compat_ioctl,
+#endif
         .receive_buf    = x25_asy_receive_buf,
         .write_wakeup   = x25_asy_write_wakeup,
 };
diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
index 0be7ec7299db..fbf5e843d48c 100644
--- a/drivers/net/wan/z85230.c
+++ b/drivers/net/wan/z85230.c
@@ -47,6 +47,7 @@
 #include <linux/hdlc.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
+#include <linux/gfp.h>
 #include <asm/dma.h>
 #include <asm/io.h>
 #define RT_LOCK