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

This commit is contained in:
Johannes Berg
2013-12-16 11:23:45 +01:00
9168 changed files with 385152 additions and 219748 deletions

View File

@@ -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);