Commit 11a2a357 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent fd67a728

net/wireless/util.c

+11 −11
Original line number Diff line number Diff line
@@ -238,17 +238,6 @@ int cfg80211_validate_key_settings(struct cfg80211_registered_device *rdev, 
	return 0;

}



/* See IEEE 802.1H for LLC/SNAP encapsulation/decapsulation */

/* Ethernet-II snap header (RFC1042 for most EtherTypes) */

const unsigned char rfc1042_header[] __aligned(2) =

	{ 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };

EXPORT_SYMBOL(rfc1042_header);



/* Bridge-Tunnel header (for EtherTypes ETH_P_AARP and ETH_P_IPX) */

const unsigned char bridge_tunnel_header[] __aligned(2) =

	{ 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 };

EXPORT_SYMBOL(bridge_tunnel_header);



unsigned int __attribute_const__ ieee80211_hdrlen(__le16 fc)

{

	unsigned int hdrlen = 24;
@@ -1048,3 +1037,14 @@ int ieee80211_get_ratemask(struct ieee80211_supported_band *sband, 


	return 0;

}



/* See IEEE 802.1H for LLC/SNAP encapsulation/decapsulation */

/* Ethernet-II snap header (RFC1042 for most EtherTypes) */

const unsigned char rfc1042_header[] __aligned(2) =

	{ 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };

EXPORT_SYMBOL(rfc1042_header);



/* Bridge-Tunnel header (for EtherTypes ETH_P_AARP and ETH_P_IPX) */

const unsigned char bridge_tunnel_header[] __aligned(2) =

	{ 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 };

EXPORT_SYMBOL(bridge_tunnel_header);

CRA Git | Maintained and supported by SUSTech CRA and CCSE