diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 18:34:26 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 18:34:26 -0500 |
commit | f0e2dcffae8701f00b34bce90e762eb798dea5b1 (patch) | |
tree | f648533a633a2d065b3c9c569c4e9e3c6b2c2ea8 /drivers/infiniband/ulp/ipoib/ipoib.h | |
parent | 04a94babd68952a4e3cdd54ebf8ce8891f9b0f2e (diff) | |
parent | 5128bdc97a1018aacac2550cf73bda61041cc3b8 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IB/core: Remove unused struct ib_device.flags member
IB/core: Add IP checksum offload support
IPoIB: Add send gather support
IPoIB: Add high DMA feature flag
IB/mlx4: Use multiple WQ blocks to post smaller send WQEs
mlx4_core: Clean up struct mlx4_buf
mlx4_core: For 64-bit systems, vmap() kernel queue buffers
IB/mlx4: Consolidate code to get an entry from a struct mlx4_buf
Diffstat (limited to 'drivers/infiniband/ulp/ipoib/ipoib.h')
-rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h index fe250c60607d..f9b7caa54143 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib.h +++ b/drivers/infiniband/ulp/ipoib/ipoib.h | |||
@@ -143,7 +143,7 @@ struct ipoib_rx_buf { | |||
143 | 143 | ||
144 | struct ipoib_tx_buf { | 144 | struct ipoib_tx_buf { |
145 | struct sk_buff *skb; | 145 | struct sk_buff *skb; |
146 | u64 mapping; | 146 | u64 mapping[MAX_SKB_FRAGS + 1]; |
147 | }; | 147 | }; |
148 | 148 | ||
149 | struct ib_cm_id; | 149 | struct ib_cm_id; |
@@ -296,7 +296,7 @@ struct ipoib_dev_priv { | |||
296 | struct ipoib_tx_buf *tx_ring; | 296 | struct ipoib_tx_buf *tx_ring; |
297 | unsigned tx_head; | 297 | unsigned tx_head; |
298 | unsigned tx_tail; | 298 | unsigned tx_tail; |
299 | struct ib_sge tx_sge; | 299 | struct ib_sge tx_sge[MAX_SKB_FRAGS + 1]; |
300 | struct ib_send_wr tx_wr; | 300 | struct ib_send_wr tx_wr; |
301 | unsigned tx_outstanding; | 301 | unsigned tx_outstanding; |
302 | 302 | ||