aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2011-11-21 05:09:22 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-11-21 16:22:10 -0500
commit11a2a357a9d8e058db032883ffd535bf4ad6a899 (patch)
treedaf8b7805b5ecadee495134c60ce5289101f8ec5 /net/wireless
parentfd67a728a97c171e54319833adaf8d2641954781 (diff)
cfg80211: work around a sparse issue
sparse reports: net/wireless/util.c:499:30: error: cannot size expression net/wireless/util.c:503:30: error: cannot size expression This is evidently due to the EXPORT_SYMBOL() of the bridge_tunnel_header and rfc1042 header variables. Move them to the end of the file to work around the sparse issue. The error itself from sparse can be ignored safely, but since sparse stops parsing at errors, other issues after this would go undetected. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/util.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c
index a21dd3ad2b3a..b50e60e4485e 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -238,17 +238,6 @@ int cfg80211_validate_key_settings(struct cfg80211_registered_device *rdev,
238 return 0; 238 return 0;
239} 239}
240 240
241/* See IEEE 802.1H for LLC/SNAP encapsulation/decapsulation */
242/* Ethernet-II snap header (RFC1042 for most EtherTypes) */
243const unsigned char rfc1042_header[] __aligned(2) =
244 { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
245EXPORT_SYMBOL(rfc1042_header);
246
247/* Bridge-Tunnel header (for EtherTypes ETH_P_AARP and ETH_P_IPX) */
248const unsigned char bridge_tunnel_header[] __aligned(2) =
249 { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 };
250EXPORT_SYMBOL(bridge_tunnel_header);
251
252unsigned int __attribute_const__ ieee80211_hdrlen(__le16 fc) 241unsigned int __attribute_const__ ieee80211_hdrlen(__le16 fc)
253{ 242{
254 unsigned int hdrlen = 24; 243 unsigned int hdrlen = 24;
@@ -1048,3 +1037,14 @@ int ieee80211_get_ratemask(struct ieee80211_supported_band *sband,
1048 1037
1049 return 0; 1038 return 0;
1050} 1039}
1040
1041/* See IEEE 802.1H for LLC/SNAP encapsulation/decapsulation */
1042/* Ethernet-II snap header (RFC1042 for most EtherTypes) */
1043const unsigned char rfc1042_header[] __aligned(2) =
1044 { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
1045EXPORT_SYMBOL(rfc1042_header);
1046
1047/* Bridge-Tunnel header (for EtherTypes ETH_P_AARP and ETH_P_IPX) */
1048const unsigned char bridge_tunnel_header[] __aligned(2) =
1049 { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 };
1050EXPORT_SYMBOL(bridge_tunnel_header);