From 413ac6007b61dc3f37338726a41b6b4b2f1dd2e8 Mon Sep 17 00:00:00 2001
From: Johan Meiring <johanmeiring@gmail.com>
Date: Sat, 6 Nov 2010 15:59:50 +0200
Subject: [PATCH] --- yaml --- r: 228061 b: refs/heads/master c:
 869c4b4a715af94a14ec074c0a5528a562e3322b h: refs/heads/master i:   228059:
 5ce0740d23b5eb646d1ad6a3ccd3c6d8de4257b9 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/staging/wlan-ng/p80211conv.h | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index de14d8f7634d..3ccdc593ad80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f027eb6871335f6e16633df796263f983f08844
+refs/heads/master: 869c4b4a715af94a14ec074c0a5528a562e3322b
diff --git a/trunk/drivers/staging/wlan-ng/p80211conv.h b/trunk/drivers/staging/wlan-ng/p80211conv.h
index eca0391c676f..ea493aa74f00 100644
--- a/trunk/drivers/staging/wlan-ng/p80211conv.h
+++ b/trunk/drivers/staging/wlan-ng/p80211conv.h
@@ -66,12 +66,14 @@
 #define	P80211_FRMMETA_MAGIC	0x802110
 
 #define P80211SKB_FRMMETA(s) \
-	(((((struct p80211_frmmeta *)((s)->cb))->magic) == P80211_FRMMETA_MAGIC) ? \
+	(((((struct p80211_frmmeta *)((s)->cb))->magic) == \
+		P80211_FRMMETA_MAGIC) ? \
 		((struct p80211_frmmeta *)((s)->cb)) : \
 		(NULL))
 
 #define P80211SKB_RXMETA(s) \
-	(P80211SKB_FRMMETA((s)) ?  P80211SKB_FRMMETA((s))->rx : ((struct p80211_rxmeta *)(NULL)))
+	(P80211SKB_FRMMETA((s)) ?  P80211SKB_FRMMETA((s))->rx : \
+		((struct p80211_rxmeta *)(NULL)))
 
 struct p80211_rxmeta {
 	struct wlandevice *wlandev;