summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-10-31 18:10:01 +0100
committerJohn W. Linville <linville@tuxdriver.com>2012-10-31 18:10:01 +0100
commit06272911485850b4a336122958c50af0f8ea7c13 (patch)
treece1e4ada8e6adc9cb9235cd0b50ed1350604a02a /include
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
parentath9k: Test for TID only in BlockAcks while checking tx status (diff)
downloadlinux-06272911485850b4a336122958c50af0f8ea7c13.tar.xz
linux-06272911485850b4a336122958c50af0f8ea7c13.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'include')
-rw-r--r--include/net/cfg80211.h9
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);
unsigned int __attribute_const__ ieee80211_hdrlen(__le16 fc);
/**
+ * ieee80211_get_mesh_hdrlen - get mesh extension header length
+ * @meshhdr: the mesh extension header, only the flags field
+ * (first byte) will be accessed
+ * Returns the length of the extension header, which is always at
+ * least 6 bytes and at most 18 if address 5 and 6 are present.
+ */
+unsigned int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr);
+
+/**
* DOC: Data path helpers
*
* In addition to generic utilities, cfg80211 also offers