brcm-2.4: fix conntrack structure inconsistency with iptables, which can cause proble...

[openwrt.git] / target / linux / cavium-octeon / patches / 007-export_cvmx_sysinfo.patch

diff --git a/target/linux/cavium-octeon/patches/007-export_cvmx_sysinfo.patch b/target/linux/cavium-octeon/patches/007-export_cvmx_sysinfo.patch
index 7397def..318916d 100644 (file)
--- a/target/linux/cavium-octeon/patches/007-export_cvmx_sysinfo.patch
+++ b/target/linux/cavium-octeon/patches/007-export_cvmx_sysinfo.patch
@@ -3,8 +3,6 @@ Signed-off-by: David Daney <ddaney@caviumnetworks.com>
  arch/mips/cavium-octeon/executive/cvmx-sysinfo.c |    2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)
 
-diff --git a/arch/mips/cavium-octeon/executive/cvmx-sysinfo.c b/arch/mips/cavium-octeon/executive/cvmx-sysinfo.c
-index 4812370..e583889 100644
 --- a/arch/mips/cavium-octeon/executive/cvmx-sysinfo.c
 +++ b/arch/mips/cavium-octeon/executive/cvmx-sysinfo.c
 @@ -29,6 +29,7 @@
@@ -15,7 +13,7 @@ index 4812370..e583889 100644
  
  #include <asm/octeon/cvmx.h>
  #include <asm/octeon/cvmx-spinlock.h>
-@@ -69,6 +70,7 @@ struct cvmx_sysinfo *cvmx_sysinfo_get(void)
+@@ -69,6 +70,7 @@ struct cvmx_sysinfo *cvmx_sysinfo_get(vo
  {
        return &(state.sysinfo);
  }
@@ -23,6 +21,3 @@ index 4812370..e583889 100644
  
  /**
   * This function is used in non-simple executive environments (such as
--- 
-1.6.0.6
-