diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-10-31 13:10:01 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-10-31 13:10:01 -0400 |
| commit | 06272911485850b4a336122958c50af0f8ea7c13 (patch) | |
| tree | ce1e4ada8e6adc9cb9235cd0b50ed1350604a02a /include | |
| parent | e657e078d3dfa9f96976db7a2b5fd7d7c9f1f1a6 (diff) | |
| parent | 6fe7cc71bbf3a0bc28c9cec3c00bc11e81344412 (diff) | |
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.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); 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 |