64-bitness fixes for IrDA irlan protocol code

(fixing the new hashbin code)

diff --git a/net/irda/irlan/irlan_common.c b/net/irda/irlan/irlan_common.c
index 16ead3abe008504dda1aaf4532e059edfc6d2686..7c6764f93d765a2a045b7969d65e823bf06c752c 100644 (file)
--- a/net/irda/irlan/irlan_common.c
+++ b/net/irda/irlan/irlan_common.c
@@ -64,7 +64,8 @@
  *  Master structure
  */
 hashbin_t *irlan = NULL;
-static __u32 ckey, skey;
+static void *ckey;
+static void *skey;
 
 /* Module parameters */
 static int eth = 0; /* Use "eth" or "irlan" name for devices */

diff --git a/net/irda/irnet/irnet.h b/net/irda/irnet/irnet.h
index 768bb11be4696211e3c0fb7ba8d085afc7efb8ef..612030769391b0e7e5dd102862b4e4193fae3dae 100644 (file)
--- a/net/irda/irnet/irnet.h
+++ b/net/irda/irnet/irnet.h
@@ -434,7 +434,7 @@ typedef struct irnet_socket
 
   /* ------------------- IrLMP and IrIAS part ------------------- */
   /* Used for IrDA Discovery and socket name resolution */
-  __u32                        ckey;           /* IrLMP client handle */
+  void *               ckey;           /* IrLMP client handle */
   __u16                        mask;           /* Hint bits mask (filter discov.)*/
   int                  nslots;         /* Number of slots for discovery */
 

diff --git a/net/irda/irnet/irnet_irda.h b/net/irda/irnet/irnet_irda.h
index 2ad5cc05e02ca12e49e0b5056996c7a6ba445ab7..0dfa8e2fed52cd2cf0096da6b83797133814834d 100644 (file)
--- a/net/irda/irnet/irnet_irda.h
+++ b/net/irda/irnet/irnet_irda.h
@@ -53,7 +53,7 @@ typedef struct irnet_root
    * reentrant, beware... So, we blindly protect all with spinlock */
 
   /* Handle for the hint bit advertised in IrLMP */
-  __u32                        skey;
+  void *               skey;
 
   /* Server socket part */
   struct ias_object *  ias_obj;        /* Our service name + lsap in IAS */