Commit f33a62c5 authored by Jean Tourrilhes's avatar Jean Tourrilhes Committed by Linus Torvalds

64-bitness fixes for IrDA irlan protocol code

(fixing the new hashbin code)
parent fb4cab96
...@@ -64,7 +64,8 @@ ...@@ -64,7 +64,8 @@
* Master structure * Master structure
*/ */
hashbin_t *irlan = NULL; hashbin_t *irlan = NULL;
static __u32 ckey, skey; static void *ckey;
static void *skey;
/* Module parameters */ /* Module parameters */
static int eth = 0; /* Use "eth" or "irlan" name for devices */ static int eth = 0; /* Use "eth" or "irlan" name for devices */
......
...@@ -434,7 +434,7 @@ typedef struct irnet_socket ...@@ -434,7 +434,7 @@ typedef struct irnet_socket
/* ------------------- IrLMP and IrIAS part ------------------- */ /* ------------------- IrLMP and IrIAS part ------------------- */
/* Used for IrDA Discovery and socket name resolution */ /* 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.)*/ __u16 mask; /* Hint bits mask (filter discov.)*/
int nslots; /* Number of slots for discovery */ int nslots; /* Number of slots for discovery */
......
...@@ -53,7 +53,7 @@ typedef struct irnet_root ...@@ -53,7 +53,7 @@ typedef struct irnet_root
* reentrant, beware... So, we blindly protect all with spinlock */ * reentrant, beware... So, we blindly protect all with spinlock */
/* Handle for the hint bit advertised in IrLMP */ /* Handle for the hint bit advertised in IrLMP */
__u32 skey; void * skey;
/* Server socket part */ /* Server socket part */
struct ias_object * ias_obj; /* Our service name + lsap in IAS */ struct ias_object * ias_obj; /* Our service name + lsap in IAS */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment