Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 150832
b: refs/heads/master
c: 88c55e3
h: refs/heads/master
v: v3
  • Loading branch information
Ron Mercer authored and David S. Miller committed Jun 11, 2009
1 parent 92c946c commit e7f9273
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0ed586d075ef65c0268982e5b7f36d0ffaa95547
refs/heads/master: 88c55e3cbd1bd4e8f52dcda67456763710a025a5
2 changes: 2 additions & 0 deletions trunk/drivers/net/qlge/qlge.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/qlge/qlge_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit e7f9273

Please sign in to comment.