| Index: chromeos/compat-wireless/include/net/cfg80211.h | 
| diff --git a/chromeos/compat-wireless/include/net/cfg80211.h b/chromeos/compat-wireless/include/net/cfg80211.h | 
| index 3550865a9d703d64c4dbb4fd0d38f25f7b91e681..e25955df5cdd48c44db8c63d7fd3c390dd18a98b 100644 | 
| --- a/chromeos/compat-wireless/include/net/cfg80211.h | 
| +++ b/chromeos/compat-wireless/include/net/cfg80211.h | 
| @@ -1207,13 +1207,14 @@ struct cfg80211_ops { | 
| * 	initiator is %REGDOM_SET_BY_CORE). | 
| * @WIPHY_FLAG_STRICT_REGULATORY: tells us the driver for this device will | 
| *	ignore regulatory domain settings until it gets its own regulatory | 
| - *	domain via its regulatory_hint(). After its gets its own regulatory | 
| - *	domain it will only allow further regulatory domain settings to | 
| - *	further enhance compliance. For example if channel 13 and 14 are | 
| - *	disabled by this regulatory domain no user regulatory domain can | 
| - *	enable these channels at a later time. This can be used for devices | 
| - *	which do not have calibration information gauranteed for frequencies | 
| - *	or settings outside of its regulatory domain. | 
| + *	domain via its regulatory_hint() unless the regulatory hint is | 
| + *	from a country IE. After its gets its own regulatory domain it will | 
| + *	only allow further regulatory domain settings to further enhance | 
| + *	compliance. For example if channel 13 and 14 are disabled by this | 
| + *	regulatory domain no user regulatory domain can enable these channels | 
| + *	at a later time. This can be used for devices which do not have | 
| + *	calibration information gauranteed for frequencies or settings | 
| + *	outside of its regulatory domain. | 
| * @WIPHY_FLAG_DISABLE_BEACON_HINTS: enable this if your driver needs to ensure | 
| *	that passive scan flags and beaconing flags may not be lifted by | 
| *	cfg80211 due to regulatory beacon hints. For more information on beacon | 
| @@ -2426,6 +2427,8 @@ void cfg80211_cqm_rssi_notify(struct net_device *dev, | 
| enum nl80211_cqm_rssi_threshold_event rssi_event, | 
| gfp_t gfp); | 
|  | 
| +#ifdef __KERNEL__ | 
| + | 
| /** | 
| * cfg80211_cqm_bitrate_notify - connection quality monitoring bitrate event | 
| * @dev: network device | 
| @@ -2439,8 +2442,6 @@ void cfg80211_cqm_bitrate_notify(struct net_device *dev, | 
| u32 bitrate, | 
| gfp_t gfp); | 
|  | 
| -#ifdef __KERNEL__ | 
| - | 
| /* Logging, debugging and troubleshooting/diagnostic helpers. */ | 
|  | 
| /* wiphy_printk helpers, similar to dev_printk */ | 
|  |