Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 228061
b: refs/heads/master
c: 869c4b4
h: refs/heads/master
i:
  228059: 5ce0740
v: v3
  • Loading branch information
Johan Meiring authored and Greg Kroah-Hartman committed Nov 10, 2010
1 parent ce56745 commit 413ac60
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9f027eb6871335f6e16633df796263f983f08844
refs/heads/master: 869c4b4a715af94a14ec074c0a5528a562e3322b
6 changes: 4 additions & 2 deletions trunk/drivers/staging/wlan-ng/p80211conv.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 413ac60

Please sign in to comment.