From def81511de116cea01768ab70f3be63eec5978f8 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 12 Aug 2010 14:49:58 +0200
Subject: [PATCH] --- yaml --- r: 214015 b: refs/heads/master c:
 633adf1ad1c92c02bd3f10bbd73737a969179378 h: refs/heads/master i:   214013:
 a2e537684dd4a5381468e8c1db0d4a4835490978   214011:
 807518b4806e707b07694490d450a957d055012d   214007:
 c156359dc4967844b2bcf822e126d664b927d592   213999:
 c9bf570837af24790fc317bbafaf6dc2b709cba7   213983:
 3e67985290b054bcda27c8d20aed72f0a1eaeeb6   213951:
 5c12cf696494032c0473b4bf2b243dce8c6d7b50   213887:
 24e2dda4bfe43b95137ddfa0cb2a496dc6b27308   213759:
 63195d22733190b098815a12e7d9bd25340af21e   213503:
 7e408932e72e7fc78d37324b327ebb744403e02f   212991:
 0c478d4f5473aabada2e4f738739d42a1a13a2eb v: v3

---
 [refs]                       | 2 +-
 trunk/include/net/cfg80211.h | 2 +-
 trunk/net/wireless/util.c    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9e0398081f63..7f43262aceef 100644
--- 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
index 2fd06c60ffbb..2b403c7ee32e 100644
--- 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
index 0c8a1e8b7690..1eb24162be61 100644
--- 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;