projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[cascardo/linux.git]
/
net
/
wireless
/
core.c
diff --git
a/net/wireless/core.c
b/net/wireless/core.c
index
a3bf18d
..
086cddd
100644
(file)
--- a/
net/wireless/core.c
+++ b/
net/wireless/core.c
@@
-737,7
+737,7
@@
void cfg80211_unregister_wdev(struct wireless_dev *wdev)
}
EXPORT_SYMBOL(cfg80211_unregister_wdev);
}
EXPORT_SYMBOL(cfg80211_unregister_wdev);
-static struct device_type wiphy_type = {
+static
const
struct device_type wiphy_type = {
.name = "wlan",
};
.name = "wlan",
};
@@
-783,7
+783,7
@@
void cfg80211_leave(struct cfg80211_registered_device *rdev,
break;
case NL80211_IFTYPE_AP:
case NL80211_IFTYPE_P2P_GO:
break;
case NL80211_IFTYPE_AP:
case NL80211_IFTYPE_P2P_GO:
- cfg80211_stop_ap(rdev, dev);
+ cfg80211_stop_ap(rdev, dev
, true
);
break;
default:
break;
break;
default:
break;