misc drivers/net endianness noise
PATCH 1/1 misc drivers/net endianness noise
--- drivers/net/3c509.c | 15 +++++++-------- drivers/net/atlx/atl1.c | 2 +- drivers/net/usb/catc.c | 5 ++++- drivers/net/usb/rndis_host.c | 4 ++-- drivers/net/wireless/zd1211rw/zd_mac.c | 2 +- drivers/net/wireless/zd1211rw/zd_usb.c | 2 +- 6 files changed, 16 insertions(+), 14 deletions(-)
drivers/net/3c509.c +7 -8
@@ -413,7 +413,7 @@ static int __devinit el3_pnp_probe(struct pnp_dev *pdev, {short i;int ioaddr, irq, if_port; -u16 phys_addr[3 ]; +__be16 phys_addr[3 ];struct net_device *dev =NULL ;int err;
@@ -605,7 +605,7 @@ static int __init el3_mca_probe(struct device *device)short i;int ioaddr, irq, if_port; -u16 phys_addr[3 ]; +__be16 phys_addr[3 ];struct net_device *dev =NULL ;u_char pos4, pos5;struct mca_device *mdev =to_mca_device (device);
@@ -635,14 +635,13 @@ static int __init el3_mca_probe(struct device *device)printk (KERN_DEBUG "3c529: irq %d ioaddr 0x%x ifport %d\n" , irq, ioaddr, if_port); }EL3WINDOW (0 ); -for (i =0 ; i <3 ; i++) { - phys_addr[i] =htons (read_eeprom (ioaddr, i)); - } +for (i =0 ; i <3 ; i++) + phys_addr[i] =htons (read_eeprom (ioaddr, i)); dev =alloc_etherdev (sizeof (struct el3_private ));if (dev ==NULL ) { -release_region (ioaddr,EL3_IO_EXTENT ); -return -ENOMEM ; +release_region (ioaddr,EL3_IO_EXTENT ); +return -ENOMEM ; }netdev_boot_setup_check (dev);
@@ -668,7 +667,7 @@ static int __init el3_eisa_probe (struct device *device) {short i;int ioaddr, irq, if_port; -u16 phys_addr[3 ]; +__be16 phys_addr[3 ];struct net_device *dev =NULL ;struct eisa_device *edev;int err;
drivers/net/atlx/atl1.c +1 -1
@@ -2135,7 +2135,7 @@ static int atl1_tso(struct atl1_adapter *adapter, struct sk_buff *skb,return -1 ; } -if (skb->protocol ==ntohs (ETH_P_IP )) { +if (skb->protocol ==htons (ETH_P_IP )) {struct iphdr *iph =ip_hdr (skb); real_len = (((unsigned char *)iph - skb->data) +
drivers/net/usb/catc.c +4 -1
@@ -423,7 +423,10 @@ static int catc_hard_start_xmit(struct sk_buff *skb, struct net_device *netdev) catc->tx_ptr = (((catc->tx_ptr -1 ) >>6 ) +1 ) <<6 ; tx_buf = catc->tx_buf[catc->tx_idx] + catc->tx_ptr; - *((u16 *)tx_buf) = (catc->is_f5u011) ?cpu_to_be16 ((u16 )skb->len) :cpu_to_le16 ((u16 )skb->len); +if (catc->is_f5u011) + *(__be16 *)tx_buf =cpu_to_be16 (skb->len); +else + *(__le16 *)tx_buf =cpu_to_le16 (skb->len);skb_copy_from_linear_data (skb, tx_buf +2 , skb->len); catc->tx_ptr += skb->len +2 ;
drivers/net/usb/rndis_host.c +2 -2
@@ -283,8 +283,8 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags)struct rndis_set_c *set_c;struct rndis_halt *halt; } u; -u32 tmp, phym_unspec; -__le32 *phym; +u32 tmp; +__le32 phym_unspec, *phym;int reply_len;unsigned char *bp;
drivers/net/wireless/zd1211rw/zd_mac.c +1 -1
@@ -805,7 +805,7 @@ void zd_process_intr(struct work_struct *work)u16 int_status; struct zd_mac *mac = container_of(work, struct zd_mac, process_intr); - int_status =le16_to_cpu (*(u16 *)(mac->intr_buffer+4 )); + int_status =le16_to_cpu (*(__le16 *)(mac->intr_buffer+4 ));if (int_status &INT_CFG_NEXT_BCN ) {if (net_ratelimit ())dev_dbg_f (zd_mac_dev (mac),"INT_CFG_NEXT_BCN\n" );
drivers/net/wireless/zd1211rw/zd_usb.c +1 -1
@@ -342,7 +342,7 @@ static inline void handle_regs_int(struct urb *urb)ZD_ASSERT (in_interrupt ());spin_lock (&intr->lock); - int_num =le16_to_cpu (*(u16 *)(urb->transfer_buffer+2 )); + int_num =le16_to_cpu (*(__le16 *)(urb->transfer_buffer+2 ));if (int_num ==CR_INTERRUPT ) {struct zd_mac *mac =zd_hw_mac (zd_usb_to_hw (urb->context)); memcpy(&mac->intr_buffer, urb->transfer_buffer,
Signature · 1 line
1.5.3.GIT
drivers/net/usb/catc.c static int catc_hard_start_xmit(struct sk_buff *skb, struct net_device *netdev) · line 430
Quoted 9 lines · Al Viro
Signed-off-by Al Viro <[email protected]>---
drivers/net/usb/catc.c +4
-1tx_buf = catc->tx_buf[catc->tx_idx] + catc->tx_ptr; - *((u16 *)tx_buf) = (catc->is_f5u011) ?cpu_to_be16 ((u16 )skb->len) :cpu_to_le16 ((u16 )skb->len); +if (catc->is_f5u011) + *(__be16 *)tx_buf =cpu_to_be16 (skb->len); +else + *(__le16 *)tx_buf =cpu_to_le16 (skb->len);skb_copy_from_linear_data (skb, tx_buf +2 , skb->len);
I was contemplating an api like:
void put_le16(u16 val, __le16 *ptr)
{
*ptr = cpu_to_le16(val);
}which would allow the above to become:
if (catc->is_f5u011) put_be16(skb->len, tx_buf); else put_le16(skb->len, tx_buf);
Thoughts?
Harvey
Quoted 7 lines · Harvey Harrison
I was contemplating an api like:
void
put_le16(u16 val, __le16 *ptr){ *ptr = cpu_to_le16(val); }
Quoted 8 lines
which would allow the above to become:
if (catc->is_f5u011) put_be16(skb->len, tx_buf); else put_le16(skb->len, tx_buf);Thoughts?
Do not grow API too much. Mental savings on recognizing what's done are offset by need to remember more helper functions...
Quoted 15 lines · Al Viro
Quoted 14 lines · Harvey Harrison
I was contemplating an api like:
void
put_le16(u16 val, __le16 *ptr){ *ptr = cpu_to_le16(val); }which would allow the above to become:
if (catc->is_f5u011) put_be16(skb->len, tx_buf); else put_le16(skb->len, tx_buf);
Quoted 4 lines
Quoted 1 line
Thoughts?
Do not grow API too much. Mental savings on recognizing what's done are offset by need to remember more helper functions...
Fair point, I was hoping to get the following family:
get_le16put_le16
get_unaligned_le16put_unaligned_le16
And get rid of the le16_to_cpup api.
Then the it's explicit when alignment is an issue, and the endianess is also explicit. That and I think it just looks nicer than the existing *p versions.
Just a thought,
Harvey
Jeff Garzik
AppliedQuoted 9 lines · Al Viro
Signed-off-by Al Viro <[email protected]>--- drivers/net/3c509.c | 15 +++++++-------- drivers/net/atlx/atl1.c | 2 +- drivers/net/usb/catc.c | 5 ++++- drivers/net/usb/rndis_host.c | 4 ++-- drivers/net/wireless/zd1211rw/zd_mac.c | 2 +- drivers/net/wireless/zd1211rw/zd_usb.c | 2 +- 6 files changed, 16 insertions(+), 14 deletions(-)
applied