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

Commit eca1ad82 authored by Al Viro's avatar Al Viro Committed by Jeff Garzik
Browse files

misc drivers/net annotations 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 05bd831f

drivers/net/8139too.c

+5 −5
Original line number Diff line number Diff line
@@ -966,8 +966,8 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev, 


	addr_len = read_eeprom (ioaddr, 0, 8) == 0x8129 ? 8 : 6;

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

		((u16 *) (dev->dev_addr))[i] =

		    le16_to_cpu (read_eeprom (ioaddr, i + 7, addr_len));

		((__le16 *) (dev->dev_addr))[i] =

		    cpu_to_le16(read_eeprom (ioaddr, i + 7, addr_len));

	memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);



	/* The Rtl8139-specific entries in the device structure. */
@@ -1373,8 +1373,8 @@ static void rtl8139_hw_start (struct net_device *dev) 
	/* unlock Config[01234] and BMCR register writes */

	RTL_W8_F (Cfg9346, Cfg9346_Unlock);

	/* Restore our idea of the MAC address. */

	RTL_W32_F (MAC0 + 0, cpu_to_le32 (*(u32 *) (dev->dev_addr + 0)));

	RTL_W32_F (MAC0 + 4, cpu_to_le32 (*(u32 *) (dev->dev_addr + 4)));

	RTL_W32_F (MAC0 + 0, le32_to_cpu (*(__le32 *) (dev->dev_addr + 0)));

	RTL_W32_F (MAC0 + 4, le16_to_cpu (*(__le16 *) (dev->dev_addr + 4)));



	/* Must enable Tx/Rx before setting transfer thresholds! */

	RTL_W8 (ChipCmd, CmdRxEnb | CmdTxEnb);
@@ -1945,7 +1945,7 @@ static int rtl8139_rx(struct net_device *dev, struct rtl8139_private *tp, 
		rmb();



		/* read size+status of next frame from DMA ring buffer */

		rx_status = le32_to_cpu (*(u32 *) (rx_ring + ring_offset));

		rx_status = le32_to_cpu (*(__le32 *) (rx_ring + ring_offset));

		rx_size = rx_status >> 16;

		pkt_size = rx_size - 4;

drivers/net/atp.c

+2 −2
Original line number Diff line number Diff line
@@ -378,8 +378,8 @@ static void __init get_node_ID(struct net_device *dev) 
		sa_offset = 15;



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

		((u16 *)dev->dev_addr)[i] =

			be16_to_cpu(eeprom_op(ioaddr, EE_READ(sa_offset + i)));

		((__be16 *)dev->dev_addr)[i] =

			cpu_to_be16(eeprom_op(ioaddr, EE_READ(sa_offset + i)));



	write_reg(ioaddr, CMR2, CMR2_NULL);

}

drivers/net/defxx.c

+2 −1
Original line number Diff line number Diff line
@@ -971,7 +971,8 @@ static int __devinit dfx_driver_init(struct net_device *dev, 
	int alloc_size;			/* total buffer size needed */

	char *top_v, *curr_v;		/* virtual addrs into memory block */

	dma_addr_t top_p, curr_p;	/* physical addrs into memory block */

	u32 data, le32;			/* host data register value */

	u32 data;			/* host data register value */

	__le32 le32;

	char *board_name = NULL;



	DBG_printk("In dfx_driver_init...\n");

drivers/net/natsemi.c

+5 −5
Original line number Diff line number Diff line
@@ -511,10 +511,10 @@ enum PhyCtrl_bits { 
/* Note that using only 32 bit fields simplifies conversion to big-endian

   architectures. */

struct netdev_desc {

	u32 next_desc;

	s32 cmd_status;

	u32 addr;

	u32 software_use;

	__le32 next_desc;

	__le32 cmd_status;

	__le32 addr;

	__le32 software_use;

};



/* Bits in network_desc.status */
@@ -2018,7 +2018,7 @@ static void drain_rx(struct net_device *dev) 
	/* Free all the skbuffs in the Rx queue. */

	for (i = 0; i < RX_RING_SIZE; i++) {

		np->rx_ring[i].cmd_status = 0;

		np->rx_ring[i].addr = 0xBADF00D0; /* An invalid address. */

		np->rx_ring[i].addr = cpu_to_le32(0xBADF00D0); /* An invalid address. */

		if (np->rx_skbuff[i]) {

			pci_unmap_single(np->pci_dev,

				np->rx_dma[i], buflen,

drivers/net/usb/dm9601.c

+5 −5
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ static void dm_write_reg_async(struct usbnet *dev, u8 reg, u8 value) 
	dm_write_async_helper(dev, reg, value, 0, NULL);

}



static int dm_read_shared_word(struct usbnet *dev, int phy, u8 reg, u16 *value)

static int dm_read_shared_word(struct usbnet *dev, int phy, u8 reg, __le16 *value)

{

	int ret, i;
@@ -194,7 +194,7 @@ static int dm_read_shared_word(struct usbnet *dev, int phy, u8 reg, u16 *value) 
	return ret;

}



static int dm_write_shared_word(struct usbnet *dev, int phy, u8 reg, u16 value)

static int dm_write_shared_word(struct usbnet *dev, int phy, u8 reg, __le16 value)

{

	int ret, i;
@@ -249,7 +249,7 @@ static int dm9601_get_eeprom(struct net_device *net, 
			     struct ethtool_eeprom *eeprom, u8 * data)

{

	struct usbnet *dev = netdev_priv(net);

	u16 *ebuf = (u16 *) data;

	__le16 *ebuf = (__le16 *) data;

	int i;



	/* access is 16bit */
@@ -268,7 +268,7 @@ static int dm9601_mdio_read(struct net_device *netdev, int phy_id, int loc) 
{

	struct usbnet *dev = netdev_priv(netdev);



	u16 res;

	__le16 res;



	if (phy_id) {

		devdbg(dev, "Only internal phy supported");
@@ -288,7 +288,7 @@ static void dm9601_mdio_write(struct net_device *netdev, int phy_id, int loc, 
			      int val)

{

	struct usbnet *dev = netdev_priv(netdev);

	u16 res = cpu_to_le16(val);

	__le16 res = cpu_to_le16(val);



	if (phy_id) {

		devdbg(dev, "Only internal phy supported");