[dpdk-stable] [PATCH] net/fm10k: fix pointer cast

[dpdk-stable] [PATCH] net/fm10k: fix pointer cast

[Xiao Wang]

The device specific data is located at dev->data->dev_private.

Fixes: 162f32290a99 ("fm10k: move parameters initialization")
Fixes: 039991bc28ff ("fm10k: add vector pre-condition check")
Fixes: 77a8ab47eb38 ("fm10k: select best Rx function")
Cc: stable@dpdk.org

Signed-off-by: Xiao Wang <xiao.w.wang@intel.com>
---
 drivers/net/fm10k/fm10k_ethdev.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c
index c4fe746..388f929 100644
--- a/drivers/net/fm10k/fm10k_ethdev.c
+++ b/drivers/net/fm10k/fm10k_ethdev.c
@@ -1803,7 +1803,8 @@ static void fm10k_MAC_filter_set(struct rte_eth_dev *dev,
 	const struct rte_eth_rxconf *conf, struct rte_mempool *mp)
 {
 	struct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);
-	struct fm10k_dev_info *dev_info = FM10K_DEV_PRIVATE_TO_INFO(dev);
+	struct fm10k_dev_info *dev_info =
+		FM10K_DEV_PRIVATE_TO_INFO(dev->data->dev_private);
 	struct fm10k_rx_queue *q;
 	const struct rte_memzone *mz;
 
@@ -2778,7 +2779,8 @@ static void __attribute__((cold))
 static void __attribute__((cold))
 fm10k_set_rx_function(struct rte_eth_dev *dev)
 {
-	struct fm10k_dev_info *dev_info = FM10K_DEV_PRIVATE_TO_INFO(dev);
+	struct fm10k_dev_info *dev_info =
+		FM10K_DEV_PRIVATE_TO_INFO(dev->data->dev_private);
 	uint16_t i, rx_using_sse;
 	uint16_t rx_ftag_en = 0;
 
@@ -2820,7 +2822,8 @@ static void __attribute__((cold))
 fm10k_params_init(struct rte_eth_dev *dev)
 {
 	struct fm10k_hw *hw = FM10K_DEV_PRIVATE_TO_HW(dev->data->dev_private);
-	struct fm10k_dev_info *info = FM10K_DEV_PRIVATE_TO_INFO(dev);
+	struct fm10k_dev_info *info =
+		FM10K_DEV_PRIVATE_TO_INFO(dev->data->dev_private);
 
 	/* Inialize bus info. Normally we would call fm10k_get_bus_info(), but
 	 * there is no way to get link status without reading BAR4.  Until this
-- 
1.8.3.1

Re: [dpdk-stable] [PATCH] net/fm10k: fix pointer cast

[Ferruh Yigit]

On 3/28/2017 4:57 AM, Xiao Wang wrote:
> The device specific data is located at dev->data->dev_private.
> 
> Fixes: 162f32290a99 ("fm10k: move parameters initialization")
> Fixes: 039991bc28ff ("fm10k: add vector pre-condition check")
> Fixes: 77a8ab47eb38 ("fm10k: select best Rx function")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Xiao Wang <xiao.w.wang@intel.com>

Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>


Thanks Xiao for fixing this, so we were corrupting eth_dev struct
before,  I wonder how this was working ...

Thanks,
ferruh

Re: [dpdk-stable] [PATCH] net/fm10k: fix pointer cast

[Ferruh Yigit]

On 3/29/2017 12:18 PM, Ferruh Yigit wrote:
> On 3/28/2017 4:57 AM, Xiao Wang wrote:
>> The device specific data is located at dev->data->dev_private.
>>
>> Fixes: 162f32290a99 ("fm10k: move parameters initialization")
>> Fixes: 039991bc28ff ("fm10k: add vector pre-condition check")
>> Fixes: 77a8ab47eb38 ("fm10k: select best Rx function")
>> Cc: stable@dpdk.org
>>
>> Signed-off-by: Xiao Wang <xiao.w.wang@intel.com>
> 
> Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>

Applied to dpdk-next-net/master, thanks.