Merge remote-tracking branch 'wireless-next/master' into mac80211-next

[mirror_ubuntu-zesty-kernel.git] / net / wireless / core.h

diff --git a/net/wireless/core.h b/net/wireless/core.h
index 453c6ed880f194cbeb3119f1efec3512a0c49ea2..37ec16d7bb1ab6bf6e4948259aad19eb6e5a58cf 100644 (file)
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -232,10 +232,10 @@ struct cfg80211_beacon_registration {
 };
 
 /* free object */
-extern void cfg80211_dev_free(struct cfg80211_registered_device *rdev);
+void cfg80211_dev_free(struct cfg80211_registered_device *rdev);
 
-extern int cfg80211_dev_rename(struct cfg80211_registered_device *rdev,
-                              char *newname);
+int cfg80211_dev_rename(struct cfg80211_registered_device *rdev,
+                       char *newname);
 
 void ieee80211_set_bitrate_flags(struct wiphy *wiphy);