compat-2.6: update compat.diff
authorHauke Mehrtens <hauke@hauke-m.de>
Sun, 17 May 2009 12:47:40 +0000 (14:47 +0200)
committerLuis R. Rodriguez <lrodriguez@atheros.com>
Sun, 17 May 2009 21:44:45 +0000 (14:44 -0700)
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>
compat/compat.diff

index 725aadfdff8c41d681a34a7dc936b70d06f09072..3ee9e8670ad1bbbe5e9758a7a12b5755981cd398 100644 (file)
        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 @@