mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2024-12-11 17:34:57 +00:00
7e82418372
Update to the latest version of iproute2; see https://lwn.net/Articles/756991/ for a full overview of the changes in 4.17. Remove upstream patch 002-json_print-fix-hidden-64-bit-type-promotion. Backport upstream patch 001-rdma-sync-some-IP-headers-with-glibc fixing rdma compile issue. At the same time re-organize patch numbering so the OpenWRT specific patches start at 100. Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
60 lines
1.3 KiB
Diff
60 lines
1.3 KiB
Diff
--- a/netem/maketable.c
|
|
+++ b/netem/maketable.c
|
|
@@ -10,7 +10,9 @@
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <math.h>
|
|
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
|
|
#include <malloc.h>
|
|
+#endif
|
|
#include <string.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
--- a/netem/normal.c
|
|
+++ b/netem/normal.c
|
|
@@ -8,8 +8,12 @@
|
|
#include <string.h>
|
|
#include <limits.h>
|
|
|
|
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
|
|
#include <linux/types.h>
|
|
#include <linux/pkt_sched.h>
|
|
+#else
|
|
+#define NETEM_DIST_SCALE 8192
|
|
+#endif
|
|
|
|
#define TABLESIZE 16384
|
|
#define TABLEFACTOR NETEM_DIST_SCALE
|
|
--- a/netem/pareto.c
|
|
+++ b/netem/pareto.c
|
|
@@ -7,8 +7,12 @@
|
|
#include <math.h>
|
|
#include <limits.h>
|
|
|
|
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
|
|
#include <linux/types.h>
|
|
#include <linux/pkt_sched.h>
|
|
+#else
|
|
+#define NETEM_DIST_SCALE 8192
|
|
+#endif
|
|
|
|
static const double a=3.0;
|
|
#define TABLESIZE 16384
|
|
--- a/netem/paretonormal.c
|
|
+++ b/netem/paretonormal.c
|
|
@@ -14,10 +14,13 @@
|
|
#include <string.h>
|
|
#include <math.h>
|
|
#include <limits.h>
|
|
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
|
|
#include <malloc.h>
|
|
-
|
|
#include <linux/types.h>
|
|
#include <linux/pkt_sched.h>
|
|
+#else
|
|
+#define NETEM_DIST_SCALE 8192
|
|
+#endif
|
|
|
|
#define TABLESIZE 16384
|
|
#define TABLEFACTOR NETEM_DIST_SCALE
|