diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-12-16 05:23:45 -0500 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-12-16 05:23:45 -0500 |
| commit | c4de673b775e4db48cd2db6277e0c6714332ca0c (patch) | |
| tree | 84f9e4728e6ccf257236d2ba063b6e784ec8b65d /net/wireless/core.h | |
| parent | bafdc614a1f4f8be8cde41b8ab10ac17e67c1837 (diff) | |
| parent | 55957fb7a0b61d8ab6ff3f04e279b8fc22b738fa (diff) | |
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
Diffstat (limited to 'net/wireless/core.h')
| -rw-r--r-- | net/wireless/core.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/wireless/core.h b/net/wireless/core.h index 453c6ed880f1..37ec16d7bb1a 100644 --- a/net/wireless/core.h +++ b/net/wireless/core.h | |||
| @@ -232,10 +232,10 @@ struct cfg80211_beacon_registration { | |||
| 232 | }; | 232 | }; |
| 233 | 233 | ||
| 234 | /* free object */ | 234 | /* free object */ |
| 235 | extern void cfg80211_dev_free(struct cfg80211_registered_device *rdev); | 235 | void cfg80211_dev_free(struct cfg80211_registered_device *rdev); |
| 236 | 236 | ||
| 237 | extern int cfg80211_dev_rename(struct cfg80211_registered_device *rdev, | 237 | int cfg80211_dev_rename(struct cfg80211_registered_device *rdev, |
| 238 | char *newname); | 238 | char *newname); |
| 239 | 239 | ||
| 240 | void ieee80211_set_bitrate_flags(struct wiphy *wiphy); | 240 | void ieee80211_set_bitrate_flags(struct wiphy *wiphy); |
| 241 | 241 | ||