aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/net/cfg80211.h2
-rw-r--r--net/wireless/util.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 2fd06c60ffbb..2b403c7ee32e 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1715,7 +1715,7 @@ unsigned int ieee80211_get_hdrlen_from_skb(const struct sk_buff *skb);
1715 * ieee80211_hdrlen - get header length in bytes from frame control 1715 * ieee80211_hdrlen - get header length in bytes from frame control
1716 * @fc: frame control field in little-endian format 1716 * @fc: frame control field in little-endian format
1717 */ 1717 */
1718unsigned int ieee80211_hdrlen(__le16 fc); 1718unsigned int __attribute_const__ ieee80211_hdrlen(__le16 fc);
1719 1719
1720/** 1720/**
1721 * ieee80211_data_to_8023 - convert an 802.11 data frame to 802.3 1721 * ieee80211_data_to_8023 - convert an 802.11 data frame to 802.3
diff --git a/net/wireless/util.c b/net/wireless/util.c
index 0c8a1e8b7690..1eb24162be61 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -221,7 +221,7 @@ const unsigned char bridge_tunnel_header[] __aligned(2) =
221 { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 }; 221 { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 };
222EXPORT_SYMBOL(bridge_tunnel_header); 222EXPORT_SYMBOL(bridge_tunnel_header);
223 223
224unsigned int ieee80211_hdrlen(__le16 fc) 224unsigned int __attribute_const__ ieee80211_hdrlen(__le16 fc)
225{ 225{
226 unsigned int hdrlen = 24; 226 unsigned int hdrlen = 24;
227 227