diff options
Diffstat (limited to 'recipes-extended')
-rw-r--r-- | recipes-extended/dpdk/dpdk.inc | 1 | ||||
-rw-r--r-- | recipes-extended/dpdk/dpdk/dpdk-16.04-Fix-for-misleading-indentation-error.patch | 54 |
2 files changed, 0 insertions, 55 deletions
diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc index 69259d3..7476118 100644 --- a/recipes-extended/dpdk/dpdk.inc +++ b/recipes-extended/dpdk/dpdk.inc | |||
@@ -4,7 +4,6 @@ HOMEPAGE = "http://dpdk.org" | |||
4 | SRC_URI = "http://fast.dpdk.org/rel/${BP}.tar.gz;name=dpdk \ | 4 | SRC_URI = "http://fast.dpdk.org/rel/${BP}.tar.gz;name=dpdk \ |
5 | file://dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \ | 5 | file://dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \ |
6 | file://dpdk-16.07-add-sysroot-option-within-app-makefile.patch \ | 6 | file://dpdk-16.07-add-sysroot-option-within-app-makefile.patch \ |
7 | file://dpdk-16.04-Fix-for-misleading-indentation-error.patch \ | ||
8 | file://dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch \ | 7 | file://dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch \ |
9 | file://dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch \ | 8 | file://dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch \ |
10 | " | 9 | " |
diff --git a/recipes-extended/dpdk/dpdk/dpdk-16.04-Fix-for-misleading-indentation-error.patch b/recipes-extended/dpdk/dpdk/dpdk-16.04-Fix-for-misleading-indentation-error.patch deleted file mode 100644 index 7828333..0000000 --- a/recipes-extended/dpdk/dpdk/dpdk-16.04-Fix-for-misleading-indentation-error.patch +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | From e7df50cd214e30741a4594c1fb969baa7574c303 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 | --- | ||
12 | lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c | 8 ++++---- | ||
13 | lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c | 2 +- | ||
14 | 2 files changed, 5 insertions(+), 5 deletions(-) | ||
15 | |||
16 | diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c | ||
17 | index 1934a309cda4..58ed65f062ae 100644 | ||
18 | --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c | ||
19 | +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c | ||
20 | @@ -3287,8 +3287,8 @@ s32 e1000_read_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 *data) | ||
21 | /* Disable access to mPHY if it was originally disabled */ | ||
22 | if (locked) { | ||
23 | ready = e1000_is_mphy_ready(hw); | ||
24 | - if (!ready) | ||
25 | - return -E1000_ERR_PHY; | ||
26 | + if (!ready) | ||
27 | + return -E1000_ERR_PHY; | ||
28 | E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, | ||
29 | E1000_MPHY_DIS_ACCESS); | ||
30 | } | ||
31 | @@ -3353,8 +3353,8 @@ s32 e1000_write_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 data, | ||
32 | /* Disable access to mPHY if it was originally disabled */ | ||
33 | if (locked) { | ||
34 | ready = e1000_is_mphy_ready(hw); | ||
35 | - if (!ready) | ||
36 | - return -E1000_ERR_PHY; | ||
37 | + if (!ready) | ||
38 | + return -E1000_ERR_PHY; | ||
39 | E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, | ||
40 | E1000_MPHY_DIS_ACCESS); | ||
41 | } | ||
42 | diff --git a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c | ||
43 | index 3f15912307ce..90635fc60520 100644 | ||
44 | --- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c | ||
45 | +++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c | ||
46 | @@ -855,7 +855,7 @@ s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw, | ||
47 | if (speed & IXGBE_LINK_SPEED_10GB_FULL) { | ||
48 | if (orig_autoc & IXGBE_AUTOC_KX4_SUPP) | ||
49 | autoc |= IXGBE_AUTOC_KX4_SUPP; | ||
50 | - if ((orig_autoc & IXGBE_AUTOC_KR_SUPP) && | ||
51 | + if ((orig_autoc & IXGBE_AUTOC_KR_SUPP) && | ||
52 | (hw->phy.smart_speed_active == false)) | ||
53 | autoc |= IXGBE_AUTOC_KR_SUPP; | ||
54 | } | ||