---

yaml --- r: 214015 b: refs/heads/master c: 633adf1 h: refs/heads/master i: 214013: a2e5376 214011: 807518b 214007: c156359 213999: c9bf570 213983: 3e67985 213951: 5c12cf6 213887: 24e2dda 213759: 63195d2 213503: 7e40893 212991: 0c478d4 v: v3
git-mirror · Aug 24, 2010 · def8151 · def8151
1 parent 636e1ba
commit def8151
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b68b3c4d92ff2440414137763477648e6db6c96f
+refs/heads/master: 633adf1ad1c92c02bd3f10bbd73737a969179378
diff --git a/trunk/include/net/cfg80211.h b/trunk/include/net/cfg80211.h
@@ -1715,7 +1715,7 @@ unsigned int ieee80211_get_hdrlen_from_skb(const struct sk_buff *skb);
  * ieee80211_hdrlen - get header length in bytes from frame control
  * @fc: frame control field in little-endian format
  */
-unsigned int ieee80211_hdrlen(__le16 fc);
+unsigned int __attribute_const__ ieee80211_hdrlen(__le16 fc);
 
 /**
  * ieee80211_data_to_8023 - convert an 802.11 data frame to 802.3

diff --git a/trunk/net/wireless/util.c b/trunk/net/wireless/util.c
@@ -221,7 +221,7 @@ const unsigned char bridge_tunnel_header[] __aligned(2) =
 	{ 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 };
 EXPORT_SYMBOL(bridge_tunnel_header);
 
-unsigned int ieee80211_hdrlen(__le16 fc)
+unsigned int __attribute_const__ ieee80211_hdrlen(__le16 fc)
 {
 	unsigned int hdrlen = 24;