diff options
| author | Michael Forney <mforney@mforney.org> | 2017-02-22 18:47:08 -0800 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2017-02-22 18:47:49 -0800 |
| commit | 8434bed129884ee0a39fce2a193454bea25e696d (patch) | |
| tree | d61163137931746df405bbdbcdc62ff7390efdc3 /pkg/iproute2/patch | |
| parent | 54764afed3b6499e8c37efebdea5ee36af2841aa (diff) | |
iproute2: Update to 4.10.0
Diffstat (limited to 'pkg/iproute2/patch')
| -rw-r--r-- | pkg/iproute2/patch/0001-Remove-redundant-linux-in-6-.h-includes.patch | 22 | ||||
| -rw-r--r-- | pkg/iproute2/patch/0002-Add-forward-declaration-of-sockaddr_un.patch | 25 |
2 files changed, 43 insertions, 4 deletions
diff --git a/pkg/iproute2/patch/0001-Remove-redundant-linux-in-6-.h-includes.patch b/pkg/iproute2/patch/0001-Remove-redundant-linux-in-6-.h-includes.patch index d753bb1d..0ce4bbf1 100644 --- a/pkg/iproute2/patch/0001-Remove-redundant-linux-in-6-.h-includes.patch +++ b/pkg/iproute2/patch/0001-Remove-redundant-linux-in-6-.h-includes.patch @@ -1,4 +1,4 @@ -From bcadf970c7f63973b5a765dcf817da932f29301a Mon Sep 17 00:00:00 2001 +From f502f9dfabf67e118d4d799b09afbddb74f8ab2a Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Sat, 25 Apr 2015 17:37:46 +0000 Subject: [PATCH] Remove redundant linux/in{,6}.h includes @@ -6,9 +6,10 @@ Subject: [PATCH] Remove redundant linux/in{,6}.h includes --- include/linux/if_bridge.h | 1 - include/linux/if_tunnel.h | 2 -- + include/linux/l2tp.h | 2 -- include/linux/netfilter.h | 2 -- include/linux/xfrm.h | 1 - - 4 files changed, 6 deletions(-) + 5 files changed, 8 deletions(-) diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h index b7393dd..a7028ab 100644 @@ -36,8 +37,21 @@ index 4f975f5..2680646 100644 #include <asm/byteorder.h> +diff --git a/include/linux/l2tp.h b/include/linux/l2tp.h +index 8a80007..c1c8546 100644 +--- a/include/linux/l2tp.h ++++ b/include/linux/l2tp.h +@@ -9,8 +9,6 @@ + + #include <linux/types.h> + #include <linux/socket.h> +-#include <linux/in.h> +-#include <linux/in6.h> + + #define IPPROTO_L2TP 115 + diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h -index b71b4c9..3e4e6ae 100644 +index d8bc1e6..f8b48e0 100644 --- a/include/linux/netfilter.h +++ b/include/linux/netfilter.h @@ -4,8 +4,6 @@ @@ -62,5 +76,5 @@ index d2dd1fd..8c72966 100644 /* All of the structures in this file may not change size as they are -- -2.11.0 +2.11.1 diff --git a/pkg/iproute2/patch/0002-Add-forward-declaration-of-sockaddr_un.patch b/pkg/iproute2/patch/0002-Add-forward-declaration-of-sockaddr_un.patch new file mode 100644 index 00000000..c8c54381 --- /dev/null +++ b/pkg/iproute2/patch/0002-Add-forward-declaration-of-sockaddr_un.patch @@ -0,0 +1,25 @@ +From de53ffffbdbaeaaf8b70b4930e067e367de644ef Mon Sep 17 00:00:00 2001 +From: Michael Forney <mforney@mforney.org> +Date: Wed, 22 Feb 2017 18:45:48 -0800 +Subject: [PATCH] Add forward declaration of sockaddr_un + +--- + include/bpf_scm.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/bpf_scm.h b/include/bpf_scm.h +index 35117d1..612d17d 100644 +--- a/include/bpf_scm.h ++++ b/include/bpf_scm.h +@@ -11,6 +11,8 @@ + #define BPF_SCM_MAX_FDS ELF_MAX_MAPS + #define BPF_SCM_MSG_SIZE 1024 + ++struct sockaddr_un; ++ + struct bpf_elf_st { + dev_t st_dev; + ino_t st_ino; +-- +2.11.1 + |