mirror of
git://git.yoctoproject.org/meta-dpdk.git
synced 2025-07-19 12:59:03 +02:00
bac5c4c129
Using the following commands to refresh the patches in order to suppress the fuzz warnings. devtool modify dpdk devtool finish --force-patch-refresh dpdk meta-dpdk-dir No code change. Signed-off-by: Kevin Hao <kexin.hao@windriver.com> Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
55 lines
2.2 KiB
Diff
55 lines
2.2 KiB
Diff
From e7df50cd214e30741a4594c1fb969baa7574c303 Mon Sep 17 00:00:00 2001
|
|
From: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
|
|
Date: Tue, 5 Jul 2016 00:05:25 +0800
|
|
Subject: [PATCH] Fix for misleading indentation error
|
|
|
|
fix the indentation of the code to match the block structure. This may cause
|
|
build errors if you have -Wall -Werror in your project.
|
|
|
|
Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
|
|
|
|
---
|
|
lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c | 8 ++++----
|
|
lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c | 2 +-
|
|
2 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c
|
|
index 1934a309cda4..58ed65f062ae 100644
|
|
--- a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c
|
|
+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c
|
|
@@ -3287,8 +3287,8 @@ s32 e1000_read_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 *data)
|
|
/* Disable access to mPHY if it was originally disabled */
|
|
if (locked) {
|
|
ready = e1000_is_mphy_ready(hw);
|
|
- if (!ready)
|
|
- return -E1000_ERR_PHY;
|
|
+ if (!ready)
|
|
+ return -E1000_ERR_PHY;
|
|
E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL,
|
|
E1000_MPHY_DIS_ACCESS);
|
|
}
|
|
@@ -3353,8 +3353,8 @@ s32 e1000_write_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 data,
|
|
/* Disable access to mPHY if it was originally disabled */
|
|
if (locked) {
|
|
ready = e1000_is_mphy_ready(hw);
|
|
- if (!ready)
|
|
- return -E1000_ERR_PHY;
|
|
+ if (!ready)
|
|
+ return -E1000_ERR_PHY;
|
|
E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL,
|
|
E1000_MPHY_DIS_ACCESS);
|
|
}
|
|
diff --git a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c
|
|
index 3f15912307ce..90635fc60520 100644
|
|
--- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c
|
|
+++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c
|
|
@@ -855,7 +855,7 @@ s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw,
|
|
if (speed & IXGBE_LINK_SPEED_10GB_FULL) {
|
|
if (orig_autoc & IXGBE_AUTOC_KX4_SUPP)
|
|
autoc |= IXGBE_AUTOC_KX4_SUPP;
|
|
- if ((orig_autoc & IXGBE_AUTOC_KR_SUPP) &&
|
|
+ if ((orig_autoc & IXGBE_AUTOC_KR_SUPP) &&
|
|
(hw->phy.smart_speed_active == false))
|
|
autoc |= IXGBE_AUTOC_KR_SUPP;
|
|
}
|