diff options
Diffstat (limited to 'drivers/staging/wlan-ng/p80211conv.h')
| -rw-r--r-- | drivers/staging/wlan-ng/p80211conv.h | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/drivers/staging/wlan-ng/p80211conv.h b/drivers/staging/wlan-ng/p80211conv.h index 28459dcea4b1..827002ca9930 100644 --- a/drivers/staging/wlan-ng/p80211conv.h +++ b/drivers/staging/wlan-ng/p80211conv.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1) +/* SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1) */ /* p80211conv.h * * Ether/802.11 conversions and packet buffer routines @@ -63,16 +63,6 @@ #define P80211_FRMMETA_MAGIC 0x802110 -#define P80211SKB_FRMMETA(s) \ - (((((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))) - struct p80211_rxmeta { struct wlandevice *wlandev; @@ -98,6 +88,20 @@ void p80211skb_free(struct wlandevice *wlandev, struct sk_buff *skb); int p80211skb_rxmeta_attach(struct wlandevice *wlandev, struct sk_buff *skb); void p80211skb_rxmeta_detach(struct sk_buff *skb); +static inline struct p80211_frmmeta *p80211skb_frmmeta(struct sk_buff *skb) +{ + struct p80211_frmmeta *frmmeta = (struct p80211_frmmeta *)skb->cb; + + return frmmeta->magic == P80211_FRMMETA_MAGIC ? frmmeta : NULL; +} + +static inline struct p80211_rxmeta *p80211skb_rxmeta(struct sk_buff *skb) +{ + struct p80211_frmmeta *frmmeta = p80211skb_frmmeta(skb); + + return frmmeta ? frmmeta->rx : NULL; +} + /* * Frame capture header. (See doc/capturefrm.txt) */ |