mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
cfg80211: combine IWESSID handlers
Since we now have handlers IWESSID for all modes, we can combine them into one. Signed-off-by: Johannes Berg <[email protected]> Signed-off-by: John W. Linville <[email protected]>
This commit is contained in:
parent
562e482265
commit
1f9298f960
7 changed files with 56 additions and 89 deletions
|
|
@ -381,8 +381,6 @@ int cfg80211_ibss_wext_siwessid(struct net_device *dev,
|
|||
|
||||
return err;
|
||||
}
|
||||
/* temporary symbol - mark GPL - in the future the handler won't be */
|
||||
EXPORT_SYMBOL_GPL(cfg80211_ibss_wext_siwessid);
|
||||
|
||||
int cfg80211_ibss_wext_giwessid(struct net_device *dev,
|
||||
struct iw_request_info *info,
|
||||
|
|
@ -410,8 +408,6 @@ int cfg80211_ibss_wext_giwessid(struct net_device *dev,
|
|||
|
||||
return 0;
|
||||
}
|
||||
/* temporary symbol - mark GPL - in the future the handler won't be */
|
||||
EXPORT_SYMBOL_GPL(cfg80211_ibss_wext_giwessid);
|
||||
|
||||
int cfg80211_ibss_wext_siwap(struct net_device *dev,
|
||||
struct iw_request_info *info,
|
||||
|
|
|
|||
|
|
@ -1363,3 +1363,37 @@ int cfg80211_wext_giwap(struct net_device *dev,
|
|||
}
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(cfg80211_wext_giwap);
|
||||
|
||||
int cfg80211_wext_siwessid(struct net_device *dev,
|
||||
struct iw_request_info *info,
|
||||
struct iw_point *data, char *ssid)
|
||||
{
|
||||
struct wireless_dev *wdev = dev->ieee80211_ptr;
|
||||
|
||||
switch (wdev->iftype) {
|
||||
case NL80211_IFTYPE_ADHOC:
|
||||
return cfg80211_ibss_wext_siwessid(dev, info, data, ssid);
|
||||
case NL80211_IFTYPE_STATION:
|
||||
return cfg80211_mgd_wext_siwessid(dev, info, data, ssid);
|
||||
default:
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(cfg80211_wext_siwessid);
|
||||
|
||||
int cfg80211_wext_giwessid(struct net_device *dev,
|
||||
struct iw_request_info *info,
|
||||
struct iw_point *data, char *ssid)
|
||||
{
|
||||
struct wireless_dev *wdev = dev->ieee80211_ptr;
|
||||
|
||||
switch (wdev->iftype) {
|
||||
case NL80211_IFTYPE_ADHOC:
|
||||
return cfg80211_ibss_wext_giwessid(dev, info, data, ssid);
|
||||
case NL80211_IFTYPE_STATION:
|
||||
return cfg80211_mgd_wext_giwessid(dev, info, data, ssid);
|
||||
default:
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(cfg80211_wext_giwessid);
|
||||
|
|
|
|||
|
|
@ -13,6 +13,12 @@ int cfg80211_ibss_wext_siwap(struct net_device *dev,
|
|||
int cfg80211_ibss_wext_giwap(struct net_device *dev,
|
||||
struct iw_request_info *info,
|
||||
struct sockaddr *ap_addr, char *extra);
|
||||
int cfg80211_ibss_wext_siwessid(struct net_device *dev,
|
||||
struct iw_request_info *info,
|
||||
struct iw_point *data, char *ssid);
|
||||
int cfg80211_ibss_wext_giwessid(struct net_device *dev,
|
||||
struct iw_request_info *info,
|
||||
struct iw_point *data, char *ssid);
|
||||
|
||||
int cfg80211_mgd_wext_siwfreq(struct net_device *dev,
|
||||
struct iw_request_info *info,
|
||||
|
|
@ -26,6 +32,12 @@ int cfg80211_mgd_wext_siwap(struct net_device *dev,
|
|||
int cfg80211_mgd_wext_giwap(struct net_device *dev,
|
||||
struct iw_request_info *info,
|
||||
struct sockaddr *ap_addr, char *extra);
|
||||
int cfg80211_mgd_wext_siwessid(struct net_device *dev,
|
||||
struct iw_request_info *info,
|
||||
struct iw_point *data, char *ssid);
|
||||
int cfg80211_mgd_wext_giwessid(struct net_device *dev,
|
||||
struct iw_request_info *info,
|
||||
struct iw_point *data, char *ssid);
|
||||
|
||||
struct ieee80211_channel *cfg80211_wext_freq(struct wiphy *wiphy,
|
||||
struct iw_freq *freq);
|
||||
|
|
|
|||
|
|
@ -192,8 +192,6 @@ int cfg80211_mgd_wext_siwessid(struct net_device *dev,
|
|||
cfg80211_unlock_rdev(wiphy_to_dev(wdev->wiphy));
|
||||
return err;
|
||||
}
|
||||
/* temporary symbol - mark GPL - in the future the handler won't be */
|
||||
EXPORT_SYMBOL_GPL(cfg80211_mgd_wext_siwessid);
|
||||
|
||||
int cfg80211_mgd_wext_giwessid(struct net_device *dev,
|
||||
struct iw_request_info *info,
|
||||
|
|
@ -218,8 +216,6 @@ int cfg80211_mgd_wext_giwessid(struct net_device *dev,
|
|||
|
||||
return 0;
|
||||
}
|
||||
/* temporary symbol - mark GPL - in the future the handler won't be */
|
||||
EXPORT_SYMBOL_GPL(cfg80211_mgd_wext_giwessid);
|
||||
|
||||
int cfg80211_mgd_wext_siwap(struct net_device *dev,
|
||||
struct iw_request_info *info,
|
||||
|
|
|
|||
Loading…
Reference in a new issue