[BK PATCHES] 2.6.x net driver fixes

[Jeff Garzik <jgarzik@xxxxxxxxx>]

Please do a

        bk pull bk://gkernel.bkbits.net/net-drivers-2.6

This will update the following files:

 drivers/net/typhoon.c      |    1 +
 drivers/net/wan/cycx_x25.c |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

through these ChangeSets:

<viro@xxxxxxxxxxxxxxxx> (04/10/16 1.2201)
   [PATCH] 64bit fix in cycx_x25.c
   
   comparing u32 with ~0UL is wrong
   
   Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>

<viro@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx> (04/10/15 1.2200)
   [PATCH] typhoon.c missing include
   
   DMA_32BIT_MASK is declared in linux/dma-mapping.h; not all platforms get
   it from already included headers, so we need explicit include here (fixes
   breakage at least on alpha and sparc64).
   
   Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>

diff -Nru a/drivers/net/typhoon.c b/drivers/net/typhoon.c
--- a/drivers/net/typhoon.c     2004-10-18 19:14:46 -04:00
+++ b/drivers/net/typhoon.c     2004-10-18 19:14:46 -04:00
@@ -114,6 +114,7 @@
 #include <linux/in6.h>
 #include <asm/checksum.h>
 #include <linux/version.h>
+#include <linux/dma-mapping.h>
 
 #include "typhoon.h"
 #include "typhoon-firmware.h"
diff -Nru a/drivers/net/wan/cycx_x25.c b/drivers/net/wan/cycx_x25.c
--- a/drivers/net/wan/cycx_x25.c        2004-10-18 19:14:46 -04:00
+++ b/drivers/net/wan/cycx_x25.c        2004-10-18 19:14:46 -04:00
@@ -1195,7 +1195,7 @@
             remotelen = strlen(chan->addr);
        u8 key;
 
-       if (card->u.x.connection_keys == ~0UL) {
+       if (card->u.x.connection_keys == ~0U) {
                printk(KERN_INFO "%s: too many simultaneous connection "
                                 "requests!\n", card->devname);
                return -EAGAIN;