From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 17 May 2009 12:47:40 +0000 (+0200)
Subject: compat-2.6: update compat.diff
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9f97616b73ac0b9b33491f970d847d92e4ed195d;p=openwrt%2Fstaging%2Fblogic.git

compat-2.6: update compat.diff

In kernel versions > 2.9.28 linux/etherdevice.h includes asm/unaligned.h.
This is needed by net/mac80211/key.c.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

diff --git a/compat/compat.diff b/compat/compat.diff
index 725aadfdff8c..3ee9e8670ad1 100644
--- a/compat/compat.diff
+++ b/compat/compat.diff
@@ -542,6 +542,18 @@
  	if (ieee80211_vif_is_mesh(&sdata->vif) &&
  	    params && params->mesh_id_len)
  		ieee80211_sdata_set_mesh_id(sdata,
+--- 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/main.c	2009-04-28 15:34:50.000000000 -0700
 +++ b/net/mac80211/main.c	2009-04-28 15:35:06.000000000 -0700
 @@ -469,6 +469,7 @@