fix broken uses of NIPQUAD in net/atm
Subsystems (2)
PATCH 1/1 fix broken uses of NIPQUAD in net/atm
NIPQUAD expects an l-value of type __be32, _NOT_ a pointer to __be32.
Signed-off-by Al Viro <[email protected]>
---
net/atm/mpc.c | 13 +++---------- net/atm/mpoa_caches.c | 12 ++++-------- 2 files changed, 7 insertions(+), 18 deletions(-)
f94b4d3e9349e01adf01b658b383ed3168a5f06e
net/atm/mpc.c +3 -10
@@ -229,20 +229,15 @@ int atm_mpoa_delete_qos(struct atm_mpoa_/* this is buggered - we need locking for qos_head */ void atm_mpoa_disp_qos (struct seq_file *m) { -unsigned char *ip; -char ipaddr[16 ];struct atm_mpoa_qos *qos; qos = qos_head;seq_printf (m,"QoS entries for shortcuts:\n" );seq_printf (m,"IP address\n TX:max_pcr pcr min_pcr max_cdv max_sdu\n RX:max_pcr pcr min_pcr max_cdv max_sdu\n" ); - ipaddr[sizeof (ipaddr)-1 ] ='\0' ;while (qos !=NULL ) { - ip = (unsigned char *)&qos->ipaddr; -sprintf (ipaddr,"%u.%u.%u.%u" ,NIPQUAD (ip));seq_printf (m,"%u.%u.%u.%u\n %-7d %-7d %-7d %-7d %-7d\n %-7d %-7d %-7d %-7d %-7d\n" , -NIPQUAD (ipaddr), +NIPQUAD (qos->ipaddr), qos->qos.txtp.max_pcr, qos->qos.txtp.pcr, qos->qos.txtp.min_pcr, qos->qos.txtp.max_cdv, qos->qos.txtp.max_sdu, qos->qos.rxtp.max_pcr, qos->qos.rxtp.pcr, qos->qos.rxtp.min_pcr, qos->qos.rxtp.max_cdv, qos->qos.rxtp.max_sdu); qos = qos->next;
@@ -1083,7 +1078,6 @@ static void MPOA_trigger_rcvd(struct k_mstatic void check_qos_and_open_shortcut (struct k_message *msg,struct mpoa_client *client,in_cache_entry *entry) {uint32_t dst_ip = msg->content.in_info.in_dst_ip; - unsigned char *ip __attribute__ ((unused)) = (unsigned char *)&dst_ip;struct atm_mpoa_qos *qos =atm_mpoa_search_qos (dst_ip);eg_cache_entry *eg_entry = client->eg_ops->get_by_src_ip (dst_ip, client);
@@ -1097,7 +1091,7 @@ static void check_qos_and_open_shortcut( entry->shortcut = eg_entry->shortcut; }if (entry->shortcut){ -dprintk ("mpoa: (%s) using egress SVC to reach %u.%u.%u.%u\n" ,client->dev->name,NIPQUAD (ip)); +dprintk ("mpoa: (%s) using egress SVC to reach %u.%u.%u.%u\n" ,client->dev->name,NIPQUAD (dst_ip)); client->eg_ops->put (eg_entry);return ; }
@@ -1123,8 +1117,7 @@ static void MPOA_res_reply_rcvd(struct kuint32_t dst_ip = msg->content.in_info.in_dst_ip;in_cache_entry *entry = mpc->in_ops->get (dst_ip, mpc); - ip = (unsigned char *)&dst_ip; -dprintk ("mpoa: (%s) MPOA_res_reply_rcvd: ip %u.%u.%u.%u\n" , mpc->dev->name,NIPQUAD (ip)); +dprintk ("mpoa: (%s) MPOA_res_reply_rcvd: ip %u.%u.%u.%u\n" , mpc->dev->name,NIPQUAD (dst_ip));ddprintk ("mpoa: (%s) MPOA_res_reply_rcvd() entry = %p" , mpc->dev->name, entry);if (entry ==NULL ){printk ("\nmpoa: (%s) ARGH, received res. reply for an entry that doesn't exist.\n" , mpc->dev->name);
net/atm/mpoa_caches.c +4 -8
@@ -223,7 +223,6 @@ static void in_cache_remove_entry(in_cacbut an easy one... */ static void clear_count_and_expired (struct mpoa_client *client) { -unsigned char *ip;in_cache_entry *entry, *next_entry;struct timeval now;
@@ -236,8 +235,7 @@ static void clear_count_and_expired(stru next_entry = entry->next;if ((now.tv_sec - entry->tv.tv_sec) > entry->ctrl_info.holding_time){ - ip = (unsigned char *)&entry->ctrl_info.in_dst_ip; -dprintk ("mpoa: mpoa_caches.c: holding time expired, ip = %u.%u.%u.%u\n" ,NIPQUAD (ip)); +dprintk ("mpoa: mpoa_caches.c: holding time expired, ip = %u.%u.%u.%u\n" ,NIPQUAD (entry->ctrl_info.in_dst_ip)); client->in_ops->remove_entry (entry, client); } entry = next_entry;
@@ -455,7 +453,6 @@ static void eg_cache_remove_entry(eg_cacstatic eg_cache_entry *eg_cache_add_entry (struct k_message *msg,struct mpoa_client *client) { -unsigned char *ip;eg_cache_entry *entry =kmalloc (sizeof (eg_cache_entry),GFP_KERNEL );if (entry ==NULL ) {
@@ -463,8 +460,7 @@ static eg_cache_entry *eg_cache_add_entrreturn NULL ; } - ip = (unsigned char *)&msg->content.eg_info.eg_dst_ip; -dprintk ("mpoa: mpoa_caches.c: adding an egress entry, ip = %u.%u.%u.%u, this should be our IP\n" ,NIPQUAD (ip)); +dprintk ("mpoa: mpoa_caches.c: adding an egress entry, ip = %u.%u.%u.%u, this should be our IP\n" ,NIPQUAD (msg->content.eg_info.eg_dst_ip));memset (entry,0 ,sizeof (eg_cache_entry));atomic_set (&entry->use,1 );
@@ -481,8 +477,8 @@ static eg_cache_entry *eg_cache_add_entrdo_gettimeofday (&(entry->tv)); entry->entry_state =EGRESS_RESOLVED ;dprintk ("mpoa: mpoa_caches.c: new_eg_cache_entry cache_id %lu\n" ,ntohl (entry->ctrl_info.cache_id)); - ip = (unsigned char *)&entry->ctrl_info.mps_ip; -dprintk ("mpoa: mpoa_caches.c: mps_ip = %u.%u.%u.%u\n" ,NIPQUAD (ip)); +dprintk ("mpoa: mpoa_caches.c: mps_ip = %u.%u.%u.%u\n" , +NIPQUAD (entry->ctrl_info.mps_ip));atomic_inc (&entry->use);write_unlock_irq (&client->egress_lock);
Signature · 1 line
1.3.GIT