diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-10-29 14:14:48 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-10-29 14:14:48 -0400 |
| commit | efec22b4689bbfdbed26367219e981fcc946b9a6 (patch) | |
| tree | eee6bb1c6109dd52e4bb6113ab61ad8d5dfa8047 /include | |
| parent | f89ff6441df06abc2d95f3ef67525923032d6283 (diff) | |
| parent | 6dbda2d00d466225f9db1dc695ff852443f28832 (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/cfg80211.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index f8cd4cf3fad8..7d5b6000378b 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h | |||
| @@ -2652,6 +2652,15 @@ unsigned int ieee80211_get_hdrlen_from_skb(const struct sk_buff *skb); | |||
| 2652 | unsigned int __attribute_const__ ieee80211_hdrlen(__le16 fc); | 2652 | unsigned int __attribute_const__ ieee80211_hdrlen(__le16 fc); |
| 2653 | 2653 | ||
| 2654 | /** | 2654 | /** |
| 2655 | * ieee80211_get_mesh_hdrlen - get mesh extension header length | ||
| 2656 | * @meshhdr: the mesh extension header, only the flags field | ||
| 2657 | * (first byte) will be accessed | ||
| 2658 | * Returns the length of the extension header, which is always at | ||
| 2659 | * least 6 bytes and at most 18 if address 5 and 6 are present. | ||
| 2660 | */ | ||
| 2661 | unsigned int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr); | ||
| 2662 | |||
| 2663 | /** | ||
| 2655 | * DOC: Data path helpers | 2664 | * DOC: Data path helpers |
| 2656 | * | 2665 | * |
| 2657 | * In addition to generic utilities, cfg80211 also offers | 2666 | * In addition to generic utilities, cfg80211 also offers |