Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ec7ffa2 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

misc drivers/net endianness noise 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8152b4a5

drivers/net/3c509.c

+7 −8
Original line number Diff line number Diff line
@@ -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,9 +635,8 @@ 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++) {

	for (i = 0; i < 3; i++)

		phys_addr[i] = htons(read_eeprom(ioaddr, i));

	}



	dev = alloc_etherdev(sizeof (struct el3_private));

	if (dev == NULL) {
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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");