32 lines
996 B
Diff
32 lines
996 B
Diff
Don't redefine in6_addr due to including linux/in6.h; use netinet/in.h instead.
|
|
|
|
--- include/linux/if_bridge.h.orig 2014-12-28 06:08:02.569567949 +0100
|
|
+++ include/linux/if_bridge.h 2014-12-28 06:08:34.736569384 +0100
|
|
@@ -15,7 +15,6 @@
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/if_ether.h>
|
|
-#include <linux/in6.h>
|
|
|
|
#define SYSFS_BRIDGE_ATTR "bridge"
|
|
#define SYSFS_BRIDGE_FDB "brforward"
|
|
--- include/utils.h.orig 2015-03-17 16:22:53.526187290 +0100
|
|
+++ include/utils.h 2015-03-17 16:23:57.390030763 +0100
|
|
@@ -1,6 +1,7 @@
|
|
#ifndef __UTILS_H__
|
|
#define __UTILS_H__ 1
|
|
|
|
+#include <sys/param.h> /* MAXPATHLEN */
|
|
#include <sys/types.h>
|
|
#include <asm/types.h>
|
|
#include <resolv.h>
|
|
--- include/linux/xfrm.h.orig 2015-06-28 07:46:32.607697856 +0200
|
|
+++ include/linux/xfrm.h 2015-06-28 07:46:37.263753313 +0200
|
|
@@ -1,7 +1,6 @@
|
|
#ifndef _LINUX_XFRM_H
|
|
#define _LINUX_XFRM_H
|
|
|
|
-#include <linux/in6.h>
|
|
#include <linux/types.h>
|
|
|
|
/* All of the structures in this file may not change size as they are
|