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

qlge: Relax alignment on TX harware queue. 



The alignment was on size of queue boundary, but the hardware
only requires 4-byte alignment.

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

drivers/net/qlge/qlge.h

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
			   "%s: " fmt, __func__, ##args);  \

       } while (0)



#define WQ_ADDR_ALIGN	0x3	/* 4 byte alignment */



#define QLGE_VENDOR_ID    0x1077

#define QLGE_DEVICE_ID_8012	0x8012

#define QLGE_DEVICE_ID_8000	0x8000

drivers/net/qlge/qlge_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2237,7 +2237,7 @@ static int ql_alloc_tx_resources(struct ql_adapter *qdev, 
				 &tx_ring->wq_base_dma);



	if ((tx_ring->wq_base == NULL)

	    || tx_ring->wq_base_dma & (tx_ring->wq_size - 1)) {

		|| tx_ring->wq_base_dma & WQ_ADDR_ALIGN) {

		QPRINTK(qdev, IFUP, ERR, "tx_ring alloc failed.\n");

		return -ENOMEM;

	}