diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-10-29 16:05:51 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-10-29 16:05:51 -0400 |
| commit | ab3d59d265e772e734c36fe738809cb1a910f566 (patch) | |
| tree | b6d29908d3d45b078d025341b1cc272ba4c0a6d0 /include | |
| parent | 42d36074e53eadfd79e6db518b5caf8fba914f8b (diff) | |
| parent | 8c6e30936a7893a85f6222084f0f26aceb81137a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/mwifiex/cfg80211.c
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 86583ce97b1b..c6964572890f 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h | |||
| @@ -2666,6 +2666,15 @@ unsigned int ieee80211_get_hdrlen_from_skb(const struct sk_buff *skb); | |||
| 2666 | unsigned int __attribute_const__ ieee80211_hdrlen(__le16 fc); | 2666 | unsigned int __attribute_const__ ieee80211_hdrlen(__le16 fc); |
| 2667 | 2667 | ||
| 2668 | /** | 2668 | /** |
| 2669 | * ieee80211_get_mesh_hdrlen - get mesh extension header length | ||
| 2670 | * @meshhdr: the mesh extension header, only the flags field | ||
| 2671 | * (first byte) will be accessed | ||
| 2672 | * Returns the length of the extension header, which is always at | ||
| 2673 | * least 6 bytes and at most 18 if address 5 and 6 are present. | ||
| 2674 | */ | ||
| 2675 | unsigned int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr); | ||
| 2676 | |||
| 2677 | /** | ||
| 2669 | * DOC: Data path helpers | 2678 | * DOC: Data path helpers |
| 2670 | * | 2679 | * |
| 2671 | * In addition to generic utilities, cfg80211 also offers | 2680 | * In addition to generic utilities, cfg80211 also offers |