From: Luis R. Rodriguez <lrodriguez@atheros.com>
Date: Tue, 4 Aug 2009 20:37:41 +0000 (-0700)
Subject: Move mac80211 key.c changes to 07-header-changes.patch
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6c2f29db978d4847c1414c489487bca030425451;p=openwrt%2Fstaging%2Fblogic.git

Move mac80211 key.c changes to 07-header-changes.patch

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---

diff --git a/compat/compat.diff b/compat/compat.diff
index 6fe3b16eb63e..65ebc4e0ec83 100644
--- a/compat/compat.diff
+++ b/compat/compat.diff
@@ -57,18 +57,6 @@
  
  
  /*
---- a/net/mac80211/key.c
-+++ b/net/mac80211/key.c
-@@ -21,6 +21,9 @@
- #include "aes_ccm.h"
- #include "aes_cmac.h"
- 
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29))
-+#include <asm/unaligned.h>
-+#endif
- 
- /**
-  * DOC: Key handling basics
 --- a/net/mac80211/rate.c
 +++ b/net/mac80211/rate.c
 @@ -22,7 +22,7 @@ struct rate_control_alg {
diff --git a/compat/diffs/07-header-changes.patch b/compat/diffs/07-header-changes.patch
index 3a6f295726a3..76e95d9b87e5 100644
--- a/compat/diffs/07-header-changes.patch
+++ b/compat/diffs/07-header-changes.patch
@@ -53,3 +53,15 @@
 +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30))
  #include <trace/define_trace.h>
 +#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30)) */
+--- a/net/mac80211/key.c
++++ b/net/mac80211/key.c
+@@ -21,6 +21,9 @@
+ #include "aes_ccm.h"
+ #include "aes_cmac.h"
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29))
++#include <asm/unaligned.h>
++#endif
+ 
+ /**
+  * DOC: Key handling basics