diff options
| author | Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> | 2047-10-04 04:14:31 +0800 |
|---|---|---|
| committer | Tom Zanussi <tom.zanussi@linux.intel.com> | 2016-07-06 12:26:30 -0500 |
| commit | e50f5ab8293ad428345178e2102861f59611e8fd (patch) | |
| tree | 5ecb8cbba60ed4cffb5455827cc14d743f2c6dad /meta-isg/common | |
| parent | 0fc6bcfa82773a288a924019289f5ab637b61b6d (diff) | |
| download | meta-intel-e50f5ab8293ad428345178e2102861f59611e8fd.tar.gz | |
meta-isg: dpdk : Fix for misleading indentation error
Corrected the identation of code to match the block structure to avoid
error/warning for build.
Since yocto is using -Wall and -Werror flags so this warning is treated
as error.
Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Diffstat (limited to 'meta-isg/common')
| -rw-r--r-- | meta-isg/common/recipes-extended/dpdk/dpdk.inc | 1 | ||||
| -rw-r--r-- | meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-Fix-for-misleading-indentation-error.patch | 56 |
2 files changed, 57 insertions, 0 deletions
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk.inc b/meta-isg/common/recipes-extended/dpdk/dpdk.inc index a3131964..b92710ae 100644 --- a/meta-isg/common/recipes-extended/dpdk/dpdk.inc +++ b/meta-isg/common/recipes-extended/dpdk/dpdk.inc | |||
| @@ -7,6 +7,7 @@ SRC_URI = "http://dpdk.org/browse/dpdk/snapshot/dpdk-${PV}.tar.gz;name=dpdk \ | |||
| 7 | file://dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \ | 7 | file://dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \ |
| 8 | file://dpdk-16.04-add-sysroot-option-within-app-makefile.patch \ | 8 | file://dpdk-16.04-add-sysroot-option-within-app-makefile.patch \ |
| 9 | file://dpdk-16.04-point-to-the-right-include-and-lib-path.patch \ | 9 | file://dpdk-16.04-point-to-the-right-include-and-lib-path.patch \ |
| 10 | file://dpdk-16.04-Fix-for-misleading-indentation-error.patch \ | ||
| 10 | " | 11 | " |
| 11 | 12 | ||
| 12 | COMPATIBLE_MACHINE = "crystalforest|intel-corei7-64" | 13 | COMPATIBLE_MACHINE = "crystalforest|intel-corei7-64" |
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-Fix-for-misleading-indentation-error.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-Fix-for-misleading-indentation-error.patch new file mode 100644 index 00000000..8786af7c --- /dev/null +++ b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-16.04-Fix-for-misleading-indentation-error.patch | |||
| @@ -0,0 +1,56 @@ | |||
| 1 | From 8cd0a16af531cca0af6b4f9b729c252b8bdbf8e2 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> | ||
| 3 | Date: Tue, 5 Jul 2016 00:05:25 +0800 | ||
| 4 | Subject: [PATCH] Fix for misleading indentation error | ||
| 5 | |||
| 6 | fix the indentation of the code to match the block structure. This may cause | ||
| 7 | build errors if you have -Wall -Werror in your project. | ||
| 8 | |||
| 9 | Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> | ||
| 10 | --- | ||
| 11 | lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c | 8 ++++---- | ||
| 12 | lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c | 2 +- | ||
| 13 | 2 files changed, 5 insertions(+), 5 deletions(-) | ||
| 14 | |||
| 15 | diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c | ||
| 16 | index df22470..ba28eba 100644 | ||
| 17 | --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c | ||
| 18 | +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c | ||
| 19 | @@ -3302,8 +3302,8 @@ s32 e1000_read_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 *data) | ||
| 20 | /* Disable access to mPHY if it was originally disabled */ | ||
| 21 | if (locked) | ||
| 22 | ready = e1000_is_mphy_ready(hw); | ||
| 23 | - if (!ready) | ||
| 24 | - return -E1000_ERR_PHY; | ||
| 25 | + if (!ready) | ||
| 26 | + return -E1000_ERR_PHY; | ||
| 27 | E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, | ||
| 28 | E1000_MPHY_DIS_ACCESS); | ||
| 29 | |||
| 30 | @@ -3367,8 +3367,8 @@ s32 e1000_write_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 data, | ||
| 31 | /* Disable access to mPHY if it was originally disabled */ | ||
| 32 | if (locked) | ||
| 33 | ready = e1000_is_mphy_ready(hw); | ||
| 34 | - if (!ready) | ||
| 35 | - return -E1000_ERR_PHY; | ||
| 36 | + if (!ready) | ||
| 37 | + return -E1000_ERR_PHY; | ||
| 38 | E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, | ||
| 39 | E1000_MPHY_DIS_ACCESS); | ||
| 40 | |||
| 41 | diff --git a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c | ||
| 42 | index 017dfe1..7248a7e 100644 | ||
| 43 | --- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c | ||
| 44 | +++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c | ||
| 45 | @@ -870,7 +870,7 @@ s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw, | ||
| 46 | if (speed & IXGBE_LINK_SPEED_10GB_FULL) | ||
| 47 | if (orig_autoc & IXGBE_AUTOC_KX4_SUPP) | ||
| 48 | autoc |= IXGBE_AUTOC_KX4_SUPP; | ||
| 49 | - if ((orig_autoc & IXGBE_AUTOC_KR_SUPP) && | ||
| 50 | + if ((orig_autoc & IXGBE_AUTOC_KR_SUPP) && | ||
| 51 | (hw->phy.smart_speed_active == false)) | ||
| 52 | autoc |= IXGBE_AUTOC_KR_SUPP; | ||
| 53 | if (speed & IXGBE_LINK_SPEED_1GB_FULL) | ||
| 54 | -- | ||
| 55 | 1.9.1 | ||
| 56 | |||
