[PATCH for stable/back-port] staging: vt6656: fix headers - key.c only

Malcolm Priestley tvboxspy at gmail.com
Sat Dec 29 13:10:03 UTC 2012


shorted back-ported version of upstream commit
11d404cb56ecd53bb23499897fbe7be1a9ac4827
staging: vt6656: fix headers and add cfg80211.
key.c only

This patch fixes the deadlock of 64 bit systems
on successful association.

In key.h void pointer pvKeyTable in SKeyItem is out of alignment
on 64 bit kernel.

The upstream arrangement of headers fixes this.

Tested on 32/64 bit to check the pointer is correct.

This is a replacement of patches;
upstream for stable 2/8 staging: vt6656: 64 bit- Correctly address void structure.
upstream for stable 3/8 staging: vt6656: 64bit fixes: dpc.c incorrect addressing of void structure.

Cc stable at vger.kernel.org # 2.6.35+
Signed-off-by: Malcolm Priestley <tvboxspy at gmail.com>
---
 drivers/staging/vt6656/key.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/vt6656/key.c b/drivers/staging/vt6656/key.c
index a61fcb9..ea29bda 100644
--- a/drivers/staging/vt6656/key.c
+++ b/drivers/staging/vt6656/key.c
@@ -36,9 +36,9 @@
  *
  */
 
+#include "mac.h"
 #include "tmacro.h"
 #include "key.h"
-#include "mac.h"
 #include "rndis.h"
 #include "control.h"
 
-- 
1.8.0









More information about the kernel-team mailing list