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

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

b44 endian annotations 



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

drivers/net/b44.c

+4 −4
Original line number Diff line number Diff line
@@ -721,7 +721,7 @@ static void b44_recycle_rx(struct b44 *bp, int src_idx, u32 dest_idx_unmasked) 
	struct ring_info *src_map, *dest_map;

	struct rx_header *rh;

	int dest_idx;

	u32 ctrl;

	__le32 ctrl;



	dest_idx = dest_idx_unmasked & (B44_RX_RING_SIZE - 1);

	dest_desc = &bp->rx_ring[dest_idx];
@@ -783,7 +783,7 @@ static int b44_rx(struct b44 *bp, int budget) 
					    RX_PKT_BUF_SZ,

					    PCI_DMA_FROMDEVICE);

		rh = (struct rx_header *) skb->data;

		len = cpu_to_le16(rh->len);

		len = le16_to_cpu(rh->len);

		if ((len > (RX_PKT_BUF_SZ - bp->rx_offset)) ||

		    (rh->flags & cpu_to_le16(RX_FLAG_ERRORS))) {

		drop_it:
@@ -799,7 +799,7 @@ static int b44_rx(struct b44 *bp, int budget) 
			do {

				udelay(2);

				barrier();

				len = cpu_to_le16(rh->len);

				len = le16_to_cpu(rh->len);

			} while (len == 0 && i++ < 5);

			if (len == 0)

				goto drop_it;
@@ -2061,7 +2061,7 @@ out: 
static int b44_read_eeprom(struct b44 *bp, u8 *data)

{

	long i;

	u16 *ptr = (u16 *) data;

	__le16 *ptr = (__le16 *) data;



	for (i = 0; i < 128; i += 2)

		ptr[i / 2] = cpu_to_le16(readw(bp->regs + 4096 + i));

drivers/net/b44.h

+5 −5
Original line number Diff line number Diff line
@@ -308,8 +308,8 @@ 
#define  MII_TLEDCTRL_ENABLE	0x0040



struct dma_desc {

	u32	ctrl;

	u32	addr;

	__le32	ctrl;

	__le32	addr;

};



/* There are only 12 bits in the DMA engine for descriptor offsetting
@@ -327,9 +327,9 @@ struct dma_desc { 
#define RX_COPY_THRESHOLD  	256



struct rx_header {

	u16	len;

	u16	flags;

	u16	pad[12];

	__le16	len;

	__le16	flags;

	__le16	pad[12];

};

#define RX_HEADER_LEN	28