/spare/repo/libata-dev branch 'v2.6.13'

12 files changed, 26 insertions, 23 deletions

diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
index 66b94668ddd8..18c27e1e7884 100644
--- a/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig
@@ -435,7 +435,7 @@ config VENDOR_SANGOMA
           the driver to support.
 
           If you have one or more of these cards, say M to this option;
-          and read <file:Documentation/networking/wanpipe.txt>.
+          and read <file:Documentation/networking/wan-router.txt>.
 
           To compile this driver as a module, choose M here: the
           module will be called wanpipe.
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c
index 7575b799ce53..2c83cca34b86 100644
--- a/drivers/net/wan/farsync.c
+++ b/drivers/net/wan/farsync.c
@@ -861,8 +861,7 @@ fst_tx_dma_complete(struct fst_card_info *card, struct fst_port_info *port,
 /*
  * Mark it for our own raw sockets interface
  */
-static unsigned short farsync_type_trans(struct sk_buff *skb,
-                                         struct net_device *dev)
+static __be16 farsync_type_trans(struct sk_buff *skb, struct net_device *dev)
 {
         skb->dev = dev;
         skb->mac.raw = skb->data;
@@ -981,6 +980,7 @@ fst_issue_cmd(struct fst_port_info *port, unsigned short cmd)
         /* Wait for any previous command to complete */
         while (mbval > NAK) {
                 spin_unlock_irqrestore(&card->card_lock, flags);
+                set_current_state(TASK_UNINTERRUPTIBLE);
                 schedule_timeout(1);
                 spin_lock_irqsave(&card->card_lock, flags);
 
diff --git a/drivers/net/wan/hdlc_cisco.c b/drivers/net/wan/hdlc_cisco.c
index c1b6896d7007..48c03c11cd9a 100644
--- a/drivers/net/wan/hdlc_cisco.c
+++ b/drivers/net/wan/hdlc_cisco.c
@@ -72,7 +72,7 @@ static void cisco_keepalive_send(struct net_device *dev, u32 type,
         }
         skb_reserve(skb, 4);
         cisco_hard_header(skb, dev, CISCO_KEEPALIVE, NULL, NULL, 0);
-        data = (cisco_packet*)skb->tail;
+        data = (cisco_packet*)skb->data;
 
         data->type = htonl(type);
         data->par1 = htonl(par1);
@@ -91,8 +91,7 @@ static void cisco_keepalive_send(struct net_device *dev, u32 type,
 
 
 
-static unsigned short cisco_type_trans(struct sk_buff *skb,
-                                       struct net_device *dev)
+static __be16 cisco_type_trans(struct sk_buff *skb, struct net_device *dev)
 {
         hdlc_header *data = (hdlc_header*)skb->data;
 
diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c
index 7cd6195a2e46..b81263eaede0 100644
--- a/drivers/net/wan/hdlc_ppp.c
+++ b/drivers/net/wan/hdlc_ppp.c
@@ -66,8 +66,7 @@ static void ppp_close(struct net_device *dev)
 
 
 
-static unsigned short ppp_type_trans(struct sk_buff *skb,
-                                     struct net_device *dev)
+static __be16 ppp_type_trans(struct sk_buff *skb, struct net_device *dev)
 {
         return __constant_htons(ETH_P_WAN_PPP);
 }
diff --git a/drivers/net/wan/hdlc_raw.c b/drivers/net/wan/hdlc_raw.c
index c41fb70b6929..9456d31cb1c1 100644
--- a/drivers/net/wan/hdlc_raw.c
+++ b/drivers/net/wan/hdlc_raw.c
@@ -24,8 +24,7 @@
 #include <linux/hdlc.h>
 
 
-static unsigned short raw_type_trans(struct sk_buff *skb,
-                                     struct net_device *dev)
+static __be16 raw_type_trans(struct sk_buff *skb, struct net_device *dev)
 {
         return __constant_htons(ETH_P_IP);
 }
diff --git a/drivers/net/wan/sdla_fr.c b/drivers/net/wan/sdla_fr.c
index 2efccb0554c0..c5f5e62aab8b 100644
--- a/drivers/net/wan/sdla_fr.c
+++ b/drivers/net/wan/sdla_fr.c
@@ -152,6 +152,7 @@
 #include <asm/io.h>             /* for inb(), outb(), etc. */
 #include <linux/time.h>         /* for do_gettimeofday */       
 #include <linux/in.h>           /* sockaddr_in */
+#include <linux/jiffies.h>      /* time_after() macro */
 #include <asm/errno.h>
 
 #include <linux/ip.h>
@@ -773,7 +774,7 @@ static int update(struct wan_device* wandev)
         for(;;) {
                 if(card->u.f.update_comms_stats == 0)
                         break;
-                if ((jiffies - timeout) > (1 * HZ)){
+                if (time_after(jiffies, timeout + 1 * HZ)){
                         card->u.f.update_comms_stats = 0;
                         return -EAGAIN;
                 }
@@ -4799,7 +4800,7 @@ static void trigger_unconfig_fr(struct net_device *dev)
 {
         fr_channel_t *chan = dev->priv;
         volatile sdla_t *card = chan->card;
-        u32 timeout;
+        unsigned long timeout;
         fr508_flags_t* flags = card->flags;
         int reset_critical=0;
         
@@ -4821,7 +4822,7 @@ static void trigger_unconfig_fr(struct net_device *dev)
                 if(!(card->u.f.timer_int_enabled & TMR_INT_ENABLED_UNCONFIG))
                         break;
 
-                if ((jiffies - timeout) > (1 * HZ)){
+                if (time_after(jiffies, timeout + 1 * HZ)){
                         card->u.f.timer_int_enabled &= ~TMR_INT_ENABLED_UNCONFIG;
                         printk(KERN_INFO "%s: Failed to delete DLCI %i\n",
                                 card->devname,chan->dlci);
diff --git a/drivers/net/wan/sdla_ft1.c b/drivers/net/wan/sdla_ft1.c
index 5e3124856eb0..9d6528a50f7b 100644
--- a/drivers/net/wan/sdla_ft1.c
+++ b/drivers/net/wan/sdla_ft1.c
@@ -29,6 +29,7 @@
 #include <linux/wanrouter.h>    /* WAN router definitions */
 #include <linux/wanpipe.h>      /* WANPIPE common user API definitions */
 #include <linux/if_arp.h>       /* ARPHRD_* defines */
+#include <linux/jiffies.h>      /* time_after() macro */
 
 #include <linux/inetdevice.h>
 #include <asm/uaccess.h>
@@ -164,7 +165,7 @@ int wpft1_init (sdla_t* card, wandev_conf_t* conf)
 
                 timeout = jiffies;
                 while (mb->return_code != 'I')  /* Wait 1s for board to initialize */
-                        if ((jiffies - timeout) > 1*HZ) break;
+                        if (time_after(jiffies, timeout + 1*HZ)) break;
 
                 if (mb->return_code != 'I') {
                         printk(KERN_INFO
diff --git a/drivers/net/wan/sdla_ppp.c b/drivers/net/wan/sdla_ppp.c
index 1761cb68ab48..a4b489cccbbf 100644
--- a/drivers/net/wan/sdla_ppp.c
+++ b/drivers/net/wan/sdla_ppp.c
@@ -101,6 +101,7 @@
 #include <linux/if_arp.h>       /* ARPHRD_* defines */
 #include <asm/byteorder.h>      /* htons(), etc. */
 #include <linux/in.h>           /* sockaddr_in */
+#include <linux/jiffies.h>      /* time_after() macro */
 
 
 #include <asm/uaccess.h>
@@ -482,7 +483,7 @@ static int update(struct wan_device *wandev)
                 if(ppp_priv_area->update_comms_stats == 0){
                         break;
                 }
-                if ((jiffies - timeout) > (1 * HZ)){
+                if (time_after(jiffies, timeout + 1 * HZ)){
                         ppp_priv_area->update_comms_stats = 0;
                         ppp_priv_area->timer_int_enabled &=
                                 ~TMR_INT_ENABLED_UPDATE; 
diff --git a/drivers/net/wan/sdla_x25.c b/drivers/net/wan/sdla_x25.c
index 3a93d2fd4fbf..8a95d61a2f8f 100644
--- a/drivers/net/wan/sdla_x25.c
+++ b/drivers/net/wan/sdla_x25.c
@@ -91,6 +91,7 @@
 #include <linux/wanrouter.h>    /* WAN router definitions */
 #include <linux/wanpipe.h>      /* WANPIPE common user API definitions */
 #include <linux/workqueue.h>
+#include <linux/jiffies.h>      /* time_after() macro */
 #include <asm/byteorder.h>      /* htons(), etc. */
 #include <asm/atomic.h>
 #include <linux/delay.h>        /* Experimental delay */
@@ -867,7 +868,7 @@ static int update(struct wan_device* wandev)
                 if (!(card->u.x.timer_int_enabled & TMR_INT_ENABLED_UPDATE)){   
                         break;
                 }
-                if ((jiffies-timeout) > 1*HZ){
+                if (time_after(jiffies, timeout + 1*HZ)){
                         card->u.x.timer_int_enabled &= ~TMR_INT_ENABLED_UPDATE;
                         return -EAGAIN;
                 }
diff --git a/drivers/net/wan/wanpipe_multppp.c b/drivers/net/wan/wanpipe_multppp.c
index 6aa6987d96cb..812a1183c502 100644
--- a/drivers/net/wan/wanpipe_multppp.c
+++ b/drivers/net/wan/wanpipe_multppp.c
@@ -26,6 +26,7 @@
 #include <linux/wanrouter.h>    /* WAN router definitions */
 #include <linux/wanpipe.h>      /* WANPIPE common user API definitions */
 #include <linux/if_arp.h>       /* ARPHRD_* defines */
+#include <linux/jiffies.h>      /* time_after() macro */
 
 #include <linux/in.h>           /* sockaddr_in */
 #include <linux/inet.h> 
@@ -270,9 +271,9 @@ int wsppp_init (sdla_t* card, wandev_conf_t* conf)
                 ready to accept commands.  We expect this to be completed in less
                 than 1 second. */
 
-                timeout = jiffies;
+                timeout = jiffies + 1 * HZ;
                 while (mb->return_code != 'I')  /* Wait 1s for board to initialize */
-                        if ((jiffies - timeout) > 1*HZ) break;
+                        if (time_after(jiffies, timeout)) break;
 
                 if (mb->return_code != 'I') {
                         printk(KERN_INFO
@@ -493,11 +494,11 @@ static int update(struct wan_device* wandev)
         chdlc_priv_area->timer_int_enabled = TMR_INT_ENABLED_UPDATE;
   
         /* wait a maximum of 1 second for the statistics to be updated */ 
-        timeout = jiffies;
+        timeout = jiffies + 1 * HZ;
         for(;;) {
                 if(chdlc_priv_area->update_comms_stats == 0)
                         break;
-                if ((jiffies - timeout) > (1 * HZ)){
+                if (time_after(jiffies, timeout)){
                         chdlc_priv_area->update_comms_stats = 0;
                         chdlc_priv_area->timer_int_enabled &=
                                 ~TMR_INT_ENABLED_UPDATE; 
diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c
index 1e7b47704ad9..9c1e10602f2b 100644
--- a/drivers/net/wan/wanxl.c
+++ b/drivers/net/wan/wanxl.c
@@ -26,6 +26,7 @@
 #include <linux/netdevice.h>
 #include <linux/hdlc.h>
 #include <linux/pci.h>
+#include <linux/dma-mapping.h>
 #include <asm/io.h>
 #include <asm/delay.h>
 
@@ -624,8 +625,8 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
         /* FIXME when PCI/DMA subsystems are fixed.
            We set both dma_mask and consistent_dma_mask back to 32 bits
            to indicate the card can do 32-bit DMA addressing */
-        if (pci_set_consistent_dma_mask(pdev, 0xFFFFFFFF) ||
-            pci_set_dma_mask(pdev, 0xFFFFFFFF)) {
+        if (pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK) ||
+            pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
                 printk(KERN_ERR "wanXL: No usable DMA configuration\n");
                 wanxl_pci_remove_one(pdev);
                 return -EIO;
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
index 1c540d825551..bdf672c48182 100644
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
@@ -829,7 +829,7 @@ static void __exit exit_x25_asy(void)
         }
 
         kfree(x25_asy_devs);
-        tty_register_ldisc(N_X25, NULL);
+        tty_unregister_ldisc(N_X25);
 }
 
 module_init(init_x25_asy);