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

Commit d4a4aba6 authored by Ron Mercer's avatar Ron Mercer Committed by David S. Miller
Browse files

qlge: bugfix: Fix endian issue related to rx buffers. 



This was introduced in an earlier net-next patch.

Signed-off-by: default avatarRon Mercer <ron.mercer@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 74c50b4b

drivers/net/qlge/qlge_main.c

+6 −3
Original line number Diff line number Diff line
@@ -2526,6 +2526,7 @@ static int ql_start_rx_ring(struct ql_adapter *qdev, struct rx_ring *rx_ring) 
	    qdev->doorbell_area + (DB_PAGE_SIZE * (128 + rx_ring->cq_id));

	int err = 0;

	u16 bq_len;

	u64 tmp;



	/* Set up the shadow registers for this ring. */

	rx_ring->prod_idx_sh_reg = shadow_reg;
@@ -2571,7 +2572,8 @@ static int ql_start_rx_ring(struct ql_adapter *qdev, struct rx_ring *rx_ring) 
	    FLAGS_LI;		/* Load irq delay values */

	if (rx_ring->lbq_len) {

		cqicb->flags |= FLAGS_LL;	/* Load lbq values */

		*((u64 *) rx_ring->lbq_base_indirect) = rx_ring->lbq_base_dma;

		tmp = (u64)rx_ring->lbq_base_dma;;

		*((__le64 *) rx_ring->lbq_base_indirect) = cpu_to_le64(tmp);

		cqicb->lbq_addr =

		    cpu_to_le64(rx_ring->lbq_base_indirect_dma);

		bq_len = (rx_ring->lbq_buf_size == 65536) ? 0 :
@@ -2587,11 +2589,12 @@ static int ql_start_rx_ring(struct ql_adapter *qdev, struct rx_ring *rx_ring) 
	}

	if (rx_ring->sbq_len) {

		cqicb->flags |= FLAGS_LS;	/* Load sbq values */

		*((u64 *) rx_ring->sbq_base_indirect) = rx_ring->sbq_base_dma;

		tmp = (u64)rx_ring->sbq_base_dma;;

		*((__le64 *) rx_ring->sbq_base_indirect) = cpu_to_le64(tmp);

		cqicb->sbq_addr =

		    cpu_to_le64(rx_ring->sbq_base_indirect_dma);

		cqicb->sbq_buf_size =

		    cpu_to_le16(((rx_ring->sbq_buf_size / 2) + 8) & 0xfffffff8);

		    cpu_to_le16((u16)(rx_ring->sbq_buf_size/2));

		bq_len = (rx_ring->sbq_len == 65536) ? 0 :

			(u16) rx_ring->sbq_len;

		cqicb->sbq_len = cpu_to_le16(bq_len);