upgrade iproute2 to 2.6.29-1 - includes support for the skbedit scheduler action

[openwrt/svn-archive/archive.git] / package / iproute2 / patches / 004-darwin_fixes.patch

diff --git a/package/iproute2/patches/004-darwin_fixes.patch b/package/iproute2/patches/004-darwin_fixes.patch
index bb2ca3fd1949d2935aafd4a568092bffa8116eb8..e1a5e975685aa216ec096998902f3fbef3b679d0 100644 (file)
--- a/package/iproute2/patches/004-darwin_fixes.patch
+++ b/package/iproute2/patches/004-darwin_fixes.patch
@@ -1,26 +1,22 @@
-Index: iproute2-2.6.15-060110/netem/maketable.c
-===================================================================
---- iproute2-2.6.15-060110.orig/netem/maketable.c      2007-06-04 13:22:33.339786864 +0200
-+++ iproute2-2.6.15-060110/netem/maketable.c   2007-06-04 13:22:34.476614040 +0200
+--- a/netem/maketable.c
++++ b/netem/maketable.c
 @@ -10,7 +10,9 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <math.h>
-+#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__)
  #include <malloc.h>
 +#endif
  #include <string.h>
  #include <sys/types.h>
  #include <sys/stat.h>
-Index: iproute2-2.6.15-060110/netem/normal.c
-===================================================================
---- iproute2-2.6.15-060110.orig/netem/normal.c 2007-06-04 13:22:33.344786104 +0200
-+++ iproute2-2.6.15-060110/netem/normal.c      2007-06-04 13:22:34.476614040 +0200
+--- a/netem/normal.c
++++ b/netem/normal.c
 @@ -8,8 +8,12 @@
  #include <string.h>
  #include <limits.h>
  
-+#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__)
  #include <linux/types.h>
  #include <linux/pkt_sched.h>
 +#else
@@ -29,15 +25,13 @@ Index: iproute2-2.6.15-060110/netem/normal.c
  
  #define TABLESIZE 16384
  #define TABLEFACTOR NETEM_DIST_SCALE
-Index: iproute2-2.6.15-060110/netem/pareto.c
-===================================================================
---- iproute2-2.6.15-060110.orig/netem/pareto.c 2007-06-04 13:22:33.349785344 +0200
-+++ iproute2-2.6.15-060110/netem/pareto.c      2007-06-04 13:22:34.476614040 +0200
+--- a/netem/pareto.c
++++ b/netem/pareto.c
 @@ -7,8 +7,12 @@
  #include <math.h>
  #include <limits.h>
  
-+#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__)
  #include <linux/types.h>
  #include <linux/pkt_sched.h>
 +#else
@@ -46,15 +40,13 @@ Index: iproute2-2.6.15-060110/netem/pareto.c
  
  static const double a=3.0;
  #define TABLESIZE     16384
-Index: iproute2-2.6.15-060110/netem/paretonormal.c
-===================================================================
---- iproute2-2.6.15-060110.orig/netem/paretonormal.c   2007-06-04 13:22:33.356784280 +0200
-+++ iproute2-2.6.15-060110/netem/paretonormal.c        2007-06-04 13:22:34.476614040 +0200
+--- a/netem/paretonormal.c
++++ b/netem/paretonormal.c
 @@ -15,10 +15,13 @@
  #include <string.h>
  #include <math.h>
  #include <limits.h>
-+#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__)
  #include <malloc.h>
 -
  #include <linux/types.h>