From 0121e0dc4e4fe36b5c10ad8641d59ae1d402a6c6 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Mon, 15 Apr 2013 23:18:01 +0200
Subject: [PATCH] backports: declare struct inet6_dev in netdevice.h

This allows us to get rid of the mac80211.h patch to
include net/if_inet6.h to get that declaration. Newer
kernels implicitly declare the struct by using it for
a pointer in struct net_device.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 backport/backport-include/linux/netdevice.h            |  7 +++++++
 .../06-header-changes/include_net_mac80211.patch       | 10 ----------
 2 files changed, 7 insertions(+), 10 deletions(-)
 delete mode 100644 patches/collateral-evolutions/network/06-header-changes/include_net_mac80211.patch

diff --git a/backport/backport-include/linux/netdevice.h b/backport/backport-include/linux/netdevice.h
index b90899a1a8a4..815c8b473bdc 100644
--- a/backport/backport-include/linux/netdevice.h
+++ b/backport/backport-include/linux/netdevice.h
@@ -4,6 +4,13 @@
 #include <linux/netdev_features.h>
 #include <linux/version.h>
 
+/*
+ * This is declared implicitly in newer kernels by netdevice.h using
+ * this pointer in struct net_device, but declare it here anyway so
+ * pointers to it are accepted as function arguments without warning.
+ */
+struct inet6_dev;
+
 /* older kernels don't include this here, we need it */
 #include <linux/ethtool.h>
 #include <linux/rculist.h>
diff --git a/patches/collateral-evolutions/network/06-header-changes/include_net_mac80211.patch b/patches/collateral-evolutions/network/06-header-changes/include_net_mac80211.patch
deleted file mode 100644
index 2ba84707ecfd..000000000000
--- a/patches/collateral-evolutions/network/06-header-changes/include_net_mac80211.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/include/net/mac80211.h
-+++ b/include/net/mac80211.h
-@@ -20,6 +20,7 @@
- #include <linux/ieee80211.h>
- #include <net/cfg80211.h>
- #include <asm/unaligned.h>
-+#include <net/if_inet6.h>
- 
- /**
-  * DOC: Introduction
-- 
2.30.2