diff options
author | Johannes Berg <johannes.berg@intel.com> | 2010-09-16 08:58:22 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-09-16 15:46:06 -0400 |
commit | 074ac8df9f93f2a35a356d92fd7f16cd846f0a03 (patch) | |
tree | b6a77291a1eea9a11862ad78e965c1df29e62d43 /net/wireless/core.c | |
parent | f799a301abf77b87133d624164d28dc2b521e99d (diff) |
cfg80211/nl80211: introduce p2p device types
This adds P2P-STA and P2P-GO as device types so
we can distinguish between those and normal STA
or AP (respectively) type interfaces.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless/core.c')
-rw-r--r-- | net/wireless/core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index b8191cf8622..ff9615a7ee7 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c | |||
@@ -726,6 +726,7 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb, | |||
726 | dev->ethtool_ops = &cfg80211_ethtool_ops; | 726 | dev->ethtool_ops = &cfg80211_ethtool_ops; |
727 | 727 | ||
728 | if ((wdev->iftype == NL80211_IFTYPE_STATION || | 728 | if ((wdev->iftype == NL80211_IFTYPE_STATION || |
729 | wdev->iftype == NL80211_IFTYPE_P2P_CLIENT || | ||
729 | wdev->iftype == NL80211_IFTYPE_ADHOC) && !wdev->use_4addr) | 730 | wdev->iftype == NL80211_IFTYPE_ADHOC) && !wdev->use_4addr) |
730 | dev->priv_flags |= IFF_DONT_BRIDGE; | 731 | dev->priv_flags |= IFF_DONT_BRIDGE; |
731 | break; | 732 | break; |
@@ -734,6 +735,7 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb, | |||
734 | case NL80211_IFTYPE_ADHOC: | 735 | case NL80211_IFTYPE_ADHOC: |
735 | cfg80211_leave_ibss(rdev, dev, true); | 736 | cfg80211_leave_ibss(rdev, dev, true); |
736 | break; | 737 | break; |
738 | case NL80211_IFTYPE_P2P_CLIENT: | ||
737 | case NL80211_IFTYPE_STATION: | 739 | case NL80211_IFTYPE_STATION: |
738 | wdev_lock(wdev); | 740 | wdev_lock(wdev); |
739 | #ifdef CONFIG_CFG80211_WEXT | 741 | #ifdef CONFIG_CFG80211_WEXT |