aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-01-12 16:22:32 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-01-12 17:06:41 -0500
commit880b005f294454d989783d0984dc554dfe3c8214 (patch)
treed1cffd5367f0bc939ef6952f6dacd78fb8592f39 /net
parente86eaa3abc285a988524d95e867285aad5d026a7 (diff)
[TIPC]: Fix 64-bit build warnings.
When storing u32 values in a pointer, need to do some long casts to keep GCC happy. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/tipc/bcast.c4
-rw-r--r--net/tipc/port.c3
-rw-r--r--net/tipc/subscr.c8
3 files changed, 9 insertions, 6 deletions
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c
index 24d949c8943a..9713d622efb8 100644
--- a/net/tipc/bcast.c
+++ b/net/tipc/bcast.c
@@ -114,12 +114,12 @@ static inline u32 buf_seqno(struct sk_buff *buf)
114 114
115static inline u32 bcbuf_acks(struct sk_buff *buf) 115static inline u32 bcbuf_acks(struct sk_buff *buf)
116{ 116{
117 return (u32)TIPC_SKB_CB(buf)->handle; 117 return (u32)(unsigned long)TIPC_SKB_CB(buf)->handle;
118} 118}
119 119
120static inline void bcbuf_set_acks(struct sk_buff *buf, u32 acks) 120static inline void bcbuf_set_acks(struct sk_buff *buf, u32 acks)
121{ 121{
122 TIPC_SKB_CB(buf)->handle = (void *)acks; 122 TIPC_SKB_CB(buf)->handle = (void *)(unsigned long)acks;
123} 123}
124 124
125static inline void bcbuf_decr_acks(struct sk_buff *buf) 125static inline void bcbuf_decr_acks(struct sk_buff *buf)
diff --git a/net/tipc/port.c b/net/tipc/port.c
index bb9404661df3..66caca7abe92 100644
--- a/net/tipc/port.c
+++ b/net/tipc/port.c
@@ -1234,7 +1234,8 @@ int tipc_connect2port(u32 ref, struct tipc_portid const *peer)
1234 p_ptr->publ.connected = 1; 1234 p_ptr->publ.connected = 1;
1235 k_start_timer(&p_ptr->timer, p_ptr->probing_interval); 1235 k_start_timer(&p_ptr->timer, p_ptr->probing_interval);
1236 1236
1237 nodesub_subscribe(&p_ptr->subscription,peer->node, (void *)ref, 1237 nodesub_subscribe(&p_ptr->subscription,peer->node,
1238 (void *)(unsigned long)ref,
1238 (net_ev_handler)port_handle_node_down); 1239 (net_ev_handler)port_handle_node_down);
1239 res = TIPC_OK; 1240 res = TIPC_OK;
1240exit: 1241exit:
diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c
index 451d875befcb..80e219ba527d 100644
--- a/net/tipc/subscr.c
+++ b/net/tipc/subscr.c
@@ -329,9 +329,10 @@ static void subscr_conn_shutdown_event(void *usr_handle,
329 unsigned int size, 329 unsigned int size,
330 int reason) 330 int reason)
331{ 331{
332 struct subscriber *subscriber = ref_lock((u32)usr_handle); 332 struct subscriber *subscriber;
333 spinlock_t *subscriber_lock; 333 spinlock_t *subscriber_lock;
334 334
335 subscriber = ref_lock((u32)(unsigned long)usr_handle);
335 if (subscriber == NULL) 336 if (subscriber == NULL)
336 return; 337 return;
337 338
@@ -350,9 +351,10 @@ static void subscr_conn_msg_event(void *usr_handle,
350 const unchar *data, 351 const unchar *data,
351 u32 size) 352 u32 size)
352{ 353{
353 struct subscriber *subscriber = ref_lock((u32)usr_handle); 354 struct subscriber *subscriber;
354 spinlock_t *subscriber_lock; 355 spinlock_t *subscriber_lock;
355 356
357 subscriber = ref_lock((u32)(unsigned long)usr_handle);
356 if (subscriber == NULL) 358 if (subscriber == NULL)
357 return; 359 return;
358 360
@@ -409,7 +411,7 @@ static void subscr_named_msg_event(void *usr_handle,
409 /* Establish a connection to subscriber */ 411 /* Establish a connection to subscriber */
410 412
411 tipc_createport(topsrv.user_ref, 413 tipc_createport(topsrv.user_ref,
412 (void *)subscriber->ref, 414 (void *)(unsigned long)subscriber->ref,
413 importance, 415 importance,
414 0, 416 0,
415 0, 417 0,