Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

misc drivers/net endianness noise

Browse source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Al Viro 2008-05-21 06:32:11 +01:00 committed by Linus Torvalds
parent 8152b4a5b4
commit 4ec7ffa2df
6 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/net/3c509.c
View file

@ -413,7 +413,7 @@ static int __devinit el3_pnp_probe(struct pnp_dev *pdev,
{ {
short i; short i;
int ioaddr, irq, if_port; int ioaddr, irq, if_port;
u16 phys_addr[3]; __be16 phys_addr[3];
struct net_device *dev = NULL; struct net_device *dev = NULL;
int err; int err;
@ -605,7 +605,7 @@ static int __init el3_mca_probe(struct device *device)
short i; short i;
int ioaddr, irq, if_port; int ioaddr, irq, if_port;
u16 phys_addr[3]; __be16 phys_addr[3];
struct net_device *dev = NULL; struct net_device *dev = NULL;
u_char pos4, pos5; u_char pos4, pos5;
struct mca_device *mdev = to_mca_device(device); 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); printk(KERN_DEBUG "3c529: irq %d ioaddr 0x%x ifport %d\n", irq, ioaddr, if_port);
} }
EL3WINDOW(0); EL3WINDOW(0);
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++)
phys_addr[i] = htons(read_eeprom(ioaddr, i)); phys_addr[i] = htons(read_eeprom(ioaddr, i));
}
dev = alloc_etherdev(sizeof (struct el3_private)); dev = alloc_etherdev(sizeof (struct el3_private));
if (dev == NULL) { if (dev == NULL) {
release_region(ioaddr, EL3_IO_EXTENT); release_region(ioaddr, EL3_IO_EXTENT);
return -ENOMEM; return -ENOMEM;
} }
netdev_boot_setup_check(dev); netdev_boot_setup_check(dev);
@ -668,7 +667,7 @@ static int __init el3_eisa_probe (struct device *device)
{ {
short i; short i;
int ioaddr, irq, if_port; int ioaddr, irq, if_port;
u16 phys_addr[3]; __be16 phys_addr[3];
struct net_device *dev = NULL; struct net_device *dev = NULL;
struct eisa_device *edev; struct eisa_device *edev;
int err; int err;

2
drivers/net/atlx/atl1.c
View file

@ -2135,7 +2135,7 @@ static int atl1_tso(struct atl1_adapter *adapter, struct sk_buff *skb,
return -1; return -1;
} }
if (skb->protocol == ntohs(ETH_P_IP)) { if (skb->protocol == htons(ETH_P_IP)) {
struct iphdr *iph = ip_hdr(skb); struct iphdr *iph = ip_hdr(skb);
real_len = (((unsigned char *)iph - skb->data) + real_len = (((unsigned char *)iph - skb->data) +

5
drivers/net/usb/catc.c
View file

@ -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; catc->tx_ptr = (((catc->tx_ptr - 1) >> 6) + 1) << 6;
tx_buf = catc->tx_buf[catc->tx_idx] + catc->tx_ptr; 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); skb_copy_from_linear_data(skb, tx_buf + 2, skb->len);
catc->tx_ptr += skb->len + 2; catc->tx_ptr += skb->len + 2;

4
drivers/net/usb/rndis_host.c
View file

@ -283,8 +283,8 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags)
struct rndis_set_c *set_c; struct rndis_set_c *set_c;
struct rndis_halt *halt; struct rndis_halt *halt;
} u; } u;
u32 tmp, phym_unspec; u32 tmp;
__le32 *phym; __le32 phym_unspec, *phym;
int reply_len; int reply_len;
unsigned char *bp; unsigned char *bp;

2
drivers/net/wireless/zd1211rw/zd_mac.c
View file

@ -805,7 +805,7 @@ void zd_process_intr(struct work_struct *work)
u16 int_status; u16 int_status;
struct zd_mac *mac = container_of(work, struct zd_mac, process_intr); 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 (int_status & INT_CFG_NEXT_BCN) {
if (net_ratelimit()) if (net_ratelimit())
dev_dbg_f(zd_mac_dev(mac), "INT_CFG_NEXT_BCN\n"); dev_dbg_f(zd_mac_dev(mac), "INT_CFG_NEXT_BCN\n");

2
drivers/net/wireless/zd1211rw/zd_usb.c
View file

@ -342,7 +342,7 @@ static inline void handle_regs_int(struct urb *urb)
ZD_ASSERT(in_interrupt()); ZD_ASSERT(in_interrupt());
spin_lock(&intr->lock); 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) { if (int_num == CR_INTERRUPT) {
struct zd_mac *mac = zd_hw_mac(zd_usb_to_hw(urb->context)); struct zd_mac *mac = zd_hw_mac(zd_usb_to_hw(urb->context));
memcpy(&mac->intr_buffer, urb->transfer_buffer, memcpy(&mac->intr_buffer, urb->transfer_buffer,