diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-01-23 14:26:05 -0500 |
---|---|---|
committer | Jon Mason <jon.mason@intel.com> | 2013-05-15 13:57:29 -0400 |
commit | cc0f868d8adef7bdc12cda132654870086d766bc (patch) | |
tree | 71d616e0d61851f6fa8d8a22b9ecea76c0acc1f1 /drivers/ntb | |
parent | ad3e2751e7c546ae678be1f8d86e898506b42cef (diff) |
NTB: fix pointer math issues
->remote_rx_info and ->rx_info are struct ntb_rx_info pointers. If we
add sizeof(struct ntb_rx_info) then it goes too far.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jon Mason <jon.mason@intel.com>
Diffstat (limited to 'drivers/ntb')
-rw-r--r-- | drivers/ntb/ntb_transport.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ntb/ntb_transport.c b/drivers/ntb/ntb_transport.c index 74c58125acfc..00f5e80dee35 100644 --- a/drivers/ntb/ntb_transport.c +++ b/drivers/ntb/ntb_transport.c | |||
@@ -486,7 +486,7 @@ static void ntb_transport_setup_qp_mw(struct ntb_transport *nt, | |||
486 | (qp_num / NTB_NUM_MW * rx_size); | 486 | (qp_num / NTB_NUM_MW * rx_size); |
487 | rx_size -= sizeof(struct ntb_rx_info); | 487 | rx_size -= sizeof(struct ntb_rx_info); |
488 | 488 | ||
489 | qp->rx_buff = qp->remote_rx_info + sizeof(struct ntb_rx_info); | 489 | qp->rx_buff = qp->remote_rx_info + 1; |
490 | qp->rx_max_frame = min(transport_mtu, rx_size); | 490 | qp->rx_max_frame = min(transport_mtu, rx_size); |
491 | qp->rx_max_entry = rx_size / qp->rx_max_frame; | 491 | qp->rx_max_entry = rx_size / qp->rx_max_frame; |
492 | qp->rx_index = 0; | 492 | qp->rx_index = 0; |
@@ -780,7 +780,7 @@ static void ntb_transport_init_queue(struct ntb_transport *nt, | |||
780 | (qp_num / NTB_NUM_MW * tx_size); | 780 | (qp_num / NTB_NUM_MW * tx_size); |
781 | tx_size -= sizeof(struct ntb_rx_info); | 781 | tx_size -= sizeof(struct ntb_rx_info); |
782 | 782 | ||
783 | qp->tx_mw = qp->rx_info + sizeof(struct ntb_rx_info); | 783 | qp->tx_mw = qp->rx_info + 1; |
784 | qp->tx_max_frame = min(transport_mtu, tx_size); | 784 | qp->tx_max_frame = min(transport_mtu, tx_size); |
785 | qp->tx_max_entry = tx_size / qp->tx_max_frame; | 785 | qp->tx_max_entry = tx_size / qp->tx_max_frame; |
786 | qp->tx_index = 0; | 786 | qp->tx_index = 0; |