Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / staging / wlan-ng / p80211conv.h

diff --git a/drivers/staging/wlan-ng/p80211conv.h b/drivers/staging/wlan-ng/p80211conv.h
index eca0391c676fe537756cc12c67845d742bb2ab1e..ea493aa74f005110b315a8322ffcba707fc9365b 100644 (file)
--- a/drivers/staging/wlan-ng/p80211conv.h
+++ b/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;