diff options
author | Johannes Berg <johannes.berg@intel.com> | 2011-04-05 12:42:10 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-04-07 15:51:40 -0400 |
commit | 0e5884458eeadbb48ab3eb1d5f63b4a53a044a95 (patch) | |
tree | 75e286229bffd409481864e4c7aac1323aa73e16 | |
parent | c2974a1d18832a9fffb2eb389c3878f5c4ed92f1 (diff) |
iwlagn: remove rxb page bookkeeping
We never use the value in alloc_rxb_page,
so there's no point in keeping it either.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-dev.h | 3 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-rx.c | 1 |
3 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c index 9a3d69d9b8a4..9e47be6a7393 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c | |||
@@ -912,7 +912,6 @@ void iwlagn_rx_allocate(struct iwl_priv *priv, gfp_t priority) | |||
912 | 912 | ||
913 | list_add_tail(&rxb->list, &rxq->rx_free); | 913 | list_add_tail(&rxb->list, &rxq->rx_free); |
914 | rxq->free_count++; | 914 | rxq->free_count++; |
915 | priv->alloc_rxb_page++; | ||
916 | 915 | ||
917 | spin_unlock_irqrestore(&rxq->lock, flags); | 916 | spin_unlock_irqrestore(&rxq->lock, flags); |
918 | } | 917 | } |
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index 54b20d8ac93f..72133368c1f5 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h | |||
@@ -1191,7 +1191,6 @@ struct iwl_priv { | |||
1191 | int frames_count; | 1191 | int frames_count; |
1192 | 1192 | ||
1193 | enum ieee80211_band band; | 1193 | enum ieee80211_band band; |
1194 | int alloc_rxb_page; | ||
1195 | 1194 | ||
1196 | void (*rx_handlers[REPLY_MAX])(struct iwl_priv *priv, | 1195 | void (*rx_handlers[REPLY_MAX])(struct iwl_priv *priv, |
1197 | struct iwl_rx_mem_buffer *rxb); | 1196 | struct iwl_rx_mem_buffer *rxb); |
@@ -1609,12 +1608,10 @@ static inline int is_channel_ibss(const struct iwl_channel_info *ch) | |||
1609 | static inline void __iwl_free_pages(struct iwl_priv *priv, struct page *page) | 1608 | static inline void __iwl_free_pages(struct iwl_priv *priv, struct page *page) |
1610 | { | 1609 | { |
1611 | __free_pages(page, priv->hw_params.rx_page_order); | 1610 | __free_pages(page, priv->hw_params.rx_page_order); |
1612 | priv->alloc_rxb_page--; | ||
1613 | } | 1611 | } |
1614 | 1612 | ||
1615 | static inline void iwl_free_pages(struct iwl_priv *priv, unsigned long page) | 1613 | static inline void iwl_free_pages(struct iwl_priv *priv, unsigned long page) |
1616 | { | 1614 | { |
1617 | free_pages(page, priv->hw_params.rx_page_order); | 1615 | free_pages(page, priv->hw_params.rx_page_order); |
1618 | priv->alloc_rxb_page--; | ||
1619 | } | 1616 | } |
1620 | #endif /* __iwl_dev_h__ */ | 1617 | #endif /* __iwl_dev_h__ */ |
diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c index b5124de99624..c421f566982f 100644 --- a/drivers/net/wireless/iwlwifi/iwl-rx.c +++ b/drivers/net/wireless/iwlwifi/iwl-rx.c | |||
@@ -898,7 +898,6 @@ static void iwl_pass_packet_to_mac80211(struct iwl_priv *priv, | |||
898 | memcpy(IEEE80211_SKB_RXCB(skb), stats, sizeof(*stats)); | 898 | memcpy(IEEE80211_SKB_RXCB(skb), stats, sizeof(*stats)); |
899 | 899 | ||
900 | ieee80211_rx(priv->hw, skb); | 900 | ieee80211_rx(priv->hw, skb); |
901 | priv->alloc_rxb_page--; | ||
902 | rxb->page = NULL; | 901 | rxb->page = NULL; |
903 | } | 902 | } |
904 | 903 | ||