From f93400b446d6582c67ac60332a8ff729f01be977 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Mon, 15 Apr 2013 23:30:10 +0200
Subject: [PATCH] backports: include asm/unaligned.h into etherdevice.h

New kernels do this, and some users rely on it.
This allows getting rid of the cfg80211 and ath6kl
patches to include it directly.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 backport/backport-include/linux/etherdevice.h       |  5 +++++
 .../drivers_net_wireless_ath_ath6kl_cfg80211.patch  | 10 ----------
 .../drivers_net_wireless_ath_ath6kl_htc_pipe.patch  | 13 -------------
 .../06-header-changes/net_wireless_util.patch       | 10 ----------
 4 files changed, 5 insertions(+), 33 deletions(-)
 delete mode 100644 patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_ath_ath6kl_cfg80211.patch
 delete mode 100644 patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_ath_ath6kl_htc_pipe.patch
 delete mode 100644 patches/collateral-evolutions/network/06-header-changes/net_wireless_util.patch

diff --git a/backport/backport-include/linux/etherdevice.h b/backport/backport-include/linux/etherdevice.h
index fc6803fe04ca..9baa19741e74 100644
--- a/backport/backport-include/linux/etherdevice.h
+++ b/backport/backport-include/linux/etherdevice.h
@@ -2,6 +2,11 @@
 #define _BACKPORT_LINUX_ETHERDEVICE_H
 #include_next <linux/etherdevice.h>
 #include <linux/version.h>
+/*
+ * newer kernels include this already and some
+ * users rely on getting this indirectly
+ */
+#include <asm/unaligned.h>
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
 #define eth_hw_addr_random LINUX_BACKPORT(eth_hw_addr_random)
diff --git a/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_ath_ath6kl_cfg80211.patch b/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_ath_ath6kl_cfg80211.patch
deleted file mode 100644
index 193faac33650..000000000000
--- a/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_ath_ath6kl_cfg80211.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
-+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
-@@ -20,6 +20,7 @@
- #include <linux/moduleparam.h>
- #include <linux/inetdevice.h>
- #include <linux/export.h>
-+#include <asm/unaligned.h>
- 
- #include "core.h"
- #include "cfg80211.h"
diff --git a/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_ath_ath6kl_htc_pipe.patch b/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_ath_ath6kl_htc_pipe.patch
deleted file mode 100644
index ef7769147f68..000000000000
--- a/patches/collateral-evolutions/network/06-header-changes/drivers_net_wireless_ath_ath6kl_htc_pipe.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/drivers/net/wireless/ath/ath6kl/htc_pipe.c
-+++ b/drivers/net/wireless/ath/ath6kl/htc_pipe.c
-@@ -18,6 +18,10 @@
- #include "debug.h"
- #include "hif-ops.h"
- 
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29))
-+#include <asm/unaligned.h>
-+#endif
-+
- #define HTC_PACKET_CONTAINER_ALLOCATION 32
- #define HTC_CONTROL_BUFFER_SIZE (HTC_MAX_CTRL_MSG_LEN + HTC_HDR_LENGTH)
- 
diff --git a/patches/collateral-evolutions/network/06-header-changes/net_wireless_util.patch b/patches/collateral-evolutions/network/06-header-changes/net_wireless_util.patch
deleted file mode 100644
index ab9b61a58a45..000000000000
--- a/patches/collateral-evolutions/network/06-header-changes/net_wireless_util.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/net/wireless/util.c
-+++ b/net/wireless/util.c
-@@ -10,6 +10,7 @@
- #include <net/cfg80211.h>
- #include <net/ip.h>
- #include <net/dsfield.h>
-+#include <asm/unaligned.h>
- #include "core.h"
- #include "rdev-ops.h"
- 
-- 
2.30.2