diff options
| author | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 09:48:20 +0200 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 14:02:16 +0200 |
| commit | 2489007e7d740ccbc3e0a202914e243ad5178787 (patch) | |
| tree | b8e6380ea7b1da63474ad68a5dba997e01146043 /include/compat | |
| parent | 5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff) | |
| download | kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2 | |
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'include/compat')
| -rwxr-xr-x | include/compat/linux/nl80211.h | 4 | ||||
| -rwxr-xr-x | include/compat/net/cfg80211.h | 10 |
2 files changed, 14 insertions, 0 deletions
diff --git a/include/compat/linux/nl80211.h b/include/compat/linux/nl80211.h index c1ba388..3ebdc10 100755 --- a/include/compat/linux/nl80211.h +++ b/include/compat/linux/nl80211.h @@ -720,6 +720,8 @@ enum nl80211_commands { NL80211_CMD_PRIV, + NL80211_CMD_PRIV_EVENT, + NL80211_CMD_P2P_FLUSH, NL80211_CMD_BTCOEX_INQ, @@ -1519,6 +1521,8 @@ enum nl80211_attrs { NL80211_ATTR_PRIV_CMD, + NL80211_ATTR_PRIV_EVENT, + NL80211_ATTR_BTCOEX_INQ_STATUS, NL80211_ATTR_BTCOEX_SCO_STATUS, NL80211_ATTR_BTCOEX_TYPE_ESCO, diff --git a/include/compat/net/cfg80211.h b/include/compat/net/cfg80211.h index 881a0d9..a5ac8ff 100755 --- a/include/compat/net/cfg80211.h +++ b/include/compat/net/cfg80211.h @@ -3358,6 +3358,16 @@ void cfg80211_report_obss_beacon(struct wiphy *wiphy, const u8 *frame, size_t len, int freq, gfp_t gfp); +/** + * cfg80211_priv_event - notify userspace about priv event + * @dev: the device the priv event was sent on + * @priv_event: event string + * @gfp: allocation flags + */ +void cfg80211_priv_event(struct net_device *dev, const char *priv_event, + gfp_t gfp); + + /* Logging, debugging and troubleshooting/diagnostic helpers. */ /* wiphy_printk helpers, similar to dev_printk */ |