summaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-02-19 14:56:34 -0500
committerJohn W. Linville <linville@tuxdriver.com>2013-02-19 14:56:34 -0500
commit0b7164458fc184455239ea3676af1b362df1ce1d (patch)
tree6b968c6ec46e7a949e930de85f75afc337128b97 /net/wireless
parent303c07db487be59ae9fda10600ea65ca11c21497 (diff)
parentb53cf458ea20dd7f5e32611366f63728e40c9021 (diff)
downloadop-kernel-dev-0b7164458fc184455239ea3676af1b362df1ce1d.zip
op-kernel-dev-0b7164458fc184455239ea3676af1b362df1ce1d.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/nl80211.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 580ffea..35545cc 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -3418,19 +3418,10 @@ nl80211_sta_wme_policy[NL80211_STA_WME_MAX + 1] __read_mostly = {
static int nl80211_set_station_tdls(struct genl_info *info,
struct station_parameters *params)
{
- struct cfg80211_registered_device *rdev = info->user_ptr[0];
struct nlattr *tb[NL80211_STA_WME_MAX + 1];
struct nlattr *nla;
int err;
- /* Can only set if TDLS ... */
- if (!(rdev->wiphy.flags & WIPHY_FLAG_SUPPORTS_TDLS))
- return -EOPNOTSUPP;
-
- /* ... with external setup is supported */
- if (!(rdev->wiphy.flags & WIPHY_FLAG_TDLS_EXTERNAL_SETUP))
- return -EOPNOTSUPP;
-
/* Dummy STA entry gets updated once the peer capabilities are known */
if (info->attrs[NL80211_ATTR_HT_CAPABILITY])
params->ht_capa =
OpenPOWER on IntegriCloud