diff options
Diffstat (limited to 'net/mac80211/ieee80211.c')
-rw-r--r-- | net/mac80211/ieee80211.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c index 3d7b4341914e..c0dbf77547f7 100644 --- a/net/mac80211/ieee80211.c +++ b/net/mac80211/ieee80211.c | |||
@@ -1312,13 +1312,13 @@ static int __init ieee80211_init(void) | |||
1312 | 1312 | ||
1313 | BUILD_BUG_ON(sizeof(struct ieee80211_tx_packet_data) > sizeof(skb->cb)); | 1313 | BUILD_BUG_ON(sizeof(struct ieee80211_tx_packet_data) > sizeof(skb->cb)); |
1314 | 1314 | ||
1315 | #ifdef CONFIG_MAC80211_RCSIMPLE | 1315 | #ifdef CONFIG_MAC80211_RC_SIMPLE |
1316 | ret = ieee80211_rate_control_register(&mac80211_rcsimple); | 1316 | ret = ieee80211_rate_control_register(&mac80211_rcsimple); |
1317 | if (ret) | 1317 | if (ret) |
1318 | goto fail; | 1318 | goto fail; |
1319 | #endif | 1319 | #endif |
1320 | 1320 | ||
1321 | #ifdef CONFIG_MAC80211_RCPID | 1321 | #ifdef CONFIG_MAC80211_RC_PID |
1322 | ret = ieee80211_rate_control_register(&mac80211_rcpid); | 1322 | ret = ieee80211_rate_control_register(&mac80211_rcpid); |
1323 | if (ret) | 1323 | if (ret) |
1324 | goto fail; | 1324 | goto fail; |
@@ -1338,10 +1338,10 @@ static int __init ieee80211_init(void) | |||
1338 | 1338 | ||
1339 | fail: | 1339 | fail: |
1340 | 1340 | ||
1341 | #ifdef CONFIG_MAC80211_RCSIMPLE | 1341 | #ifdef CONFIG_MAC80211_RC_SIMPLE |
1342 | ieee80211_rate_control_unregister(&mac80211_rcsimple); | 1342 | ieee80211_rate_control_unregister(&mac80211_rcsimple); |
1343 | #endif | 1343 | #endif |
1344 | #ifdef CONFIG_MAC80211_RCPID | 1344 | #ifdef CONFIG_MAC80211_RC_PID |
1345 | ieee80211_rate_control_unregister(&mac80211_rcpid); | 1345 | ieee80211_rate_control_unregister(&mac80211_rcpid); |
1346 | #endif | 1346 | #endif |
1347 | 1347 | ||
@@ -1350,10 +1350,10 @@ fail: | |||
1350 | 1350 | ||
1351 | static void __exit ieee80211_exit(void) | 1351 | static void __exit ieee80211_exit(void) |
1352 | { | 1352 | { |
1353 | #ifdef CONFIG_MAC80211_RCSIMPLE | 1353 | #ifdef CONFIG_MAC80211_RC_SIMPLE |
1354 | ieee80211_rate_control_unregister(&mac80211_rcsimple); | 1354 | ieee80211_rate_control_unregister(&mac80211_rcsimple); |
1355 | #endif | 1355 | #endif |
1356 | #ifdef CONFIG_MAC80211_RCPID | 1356 | #ifdef CONFIG_MAC80211_RC_PID |
1357 | ieee80211_rate_control_unregister(&mac80211_rcpid); | 1357 | ieee80211_rate_control_unregister(&mac80211_rcpid); |
1358 | #endif | 1358 | #endif |
1359 | 1359 | ||