diff options
author | Stanislaw Gruszka <sgruszka@redhat.com> | 2013-02-28 03:49:11 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-03-06 10:35:54 -0500 |
commit | 30c97120c6c7893e5c6857a16229699b2b79dfbe (patch) | |
tree | 934946545b5e0570181f0d664eee6a899db4b1d0 /net/mac80211/main.c | |
parent | 098b8afbf23502041c091463aea10a91b735c4cf (diff) |
mac80211: remove napi
Since two years no mac80211 driver implement support for NAPI. Looks
this feature is unneeded, so remove it from generic mac80211 code.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/main.c')
-rw-r--r-- | net/mac80211/main.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 78554724f815..a55a7075dd8c 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c | |||
@@ -399,30 +399,6 @@ static int ieee80211_ifa6_changed(struct notifier_block *nb, | |||
399 | } | 399 | } |
400 | #endif | 400 | #endif |
401 | 401 | ||
402 | static int ieee80211_napi_poll(struct napi_struct *napi, int budget) | ||
403 | { | ||
404 | struct ieee80211_local *local = | ||
405 | container_of(napi, struct ieee80211_local, napi); | ||
406 | |||
407 | return local->ops->napi_poll(&local->hw, budget); | ||
408 | } | ||
409 | |||
410 | void ieee80211_napi_schedule(struct ieee80211_hw *hw) | ||
411 | { | ||
412 | struct ieee80211_local *local = hw_to_local(hw); | ||
413 | |||
414 | napi_schedule(&local->napi); | ||
415 | } | ||
416 | EXPORT_SYMBOL(ieee80211_napi_schedule); | ||
417 | |||
418 | void ieee80211_napi_complete(struct ieee80211_hw *hw) | ||
419 | { | ||
420 | struct ieee80211_local *local = hw_to_local(hw); | ||
421 | |||
422 | napi_complete(&local->napi); | ||
423 | } | ||
424 | EXPORT_SYMBOL(ieee80211_napi_complete); | ||
425 | |||
426 | /* There isn't a lot of sense in it, but you can transmit anything you like */ | 402 | /* There isn't a lot of sense in it, but you can transmit anything you like */ |
427 | static const struct ieee80211_txrx_stypes | 403 | static const struct ieee80211_txrx_stypes |
428 | ieee80211_default_mgmt_stypes[NUM_NL80211_IFTYPES] = { | 404 | ieee80211_default_mgmt_stypes[NUM_NL80211_IFTYPES] = { |
@@ -686,9 +662,6 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len, | |||
686 | skb_queue_head_init(&local->skb_queue); | 662 | skb_queue_head_init(&local->skb_queue); |
687 | skb_queue_head_init(&local->skb_queue_unreliable); | 663 | skb_queue_head_init(&local->skb_queue_unreliable); |
688 | 664 | ||
689 | /* init dummy netdev for use w/ NAPI */ | ||
690 | init_dummy_netdev(&local->napi_dev); | ||
691 | |||
692 | ieee80211_led_names(local); | 665 | ieee80211_led_names(local); |
693 | 666 | ||
694 | ieee80211_roc_setup(local); | 667 | ieee80211_roc_setup(local); |
@@ -1043,9 +1016,6 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) | |||
1043 | goto fail_ifa6; | 1016 | goto fail_ifa6; |
1044 | #endif | 1017 | #endif |
1045 | 1018 | ||
1046 | netif_napi_add(&local->napi_dev, &local->napi, ieee80211_napi_poll, | ||
1047 | local->hw.napi_weight); | ||
1048 | |||
1049 | return 0; | 1019 | return 0; |
1050 | 1020 | ||
1051 | #if IS_ENABLED(CONFIG_IPV6) | 1021 | #if IS_ENABLED(CONFIG_IPV6) |