From eff812eeba5cbcc409a30b343956858171146103 Mon Sep 17 00:00:00 2001 From: California Sullivan Date: Mon, 9 Apr 2018 16:47:22 -0700 Subject: dpdk: remove dpdk-16.04-Fix-for-misleading-indentation-error.patch Upstream fixed the misleading indentation so this patch is no longer necessary. Signed-off-by: California Sullivan --- recipes-extended/dpdk/dpdk.inc | 1 - ...6.04-Fix-for-misleading-indentation-error.patch | 54 ---------------------- 2 files changed, 55 deletions(-) delete mode 100644 recipes-extended/dpdk/dpdk/dpdk-16.04-Fix-for-misleading-indentation-error.patch 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" SRC_URI = "http://fast.dpdk.org/rel/${BP}.tar.gz;name=dpdk \ file://dpdk-16.04-add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \ file://dpdk-16.07-add-sysroot-option-within-app-makefile.patch \ - file://dpdk-16.04-Fix-for-misleading-indentation-error.patch \ file://dpdk-16.07-dpdk-fix-for-parellel-make-issue.patch \ file://dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch \ " 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 @@ -From e7df50cd214e30741a4594c1fb969baa7574c303 Mon Sep 17 00:00:00 2001 -From: Rahul Kumar Gupta -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 - ---- - 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; - } -- cgit v1.2.3-54-g00ecf