Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-09 14:43:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

p54: Use SKB list handling helpers instead of by-hand code.

Browse Source 
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2009-05-28 00:48:16 -07:00
parent ae71fabbe5
commit a1091aae19
1 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/net/wireless/p54/p54common.c
View File

@ -823,30 +823,30 @@ void p54_free_skb(struct ieee80211_hw *dev, struct sk_buff *skb)
struct p54_tx_info *range; struct p54_tx_info *range;
unsigned long flags; unsigned long flags;
if (unlikely(!skb || !dev || !skb_queue_len(&priv->tx_queue))) if (unlikely(!skb || !dev || skb_queue_empty(&priv->tx_queue)))
return; return;
/* /* There used to be a check here to see if the SKB was on the
* don't try to free an already unlinked skb * TX queue or not. This can never happen because all SKBs we
* see here successfully went through p54_assign_address()
* which means the SKB is on the ->tx_queue.
*/ */
if (unlikely((!skb->next) || (!skb->prev)))
return;
spin_lock_irqsave(&priv->tx_queue.lock, flags); spin_lock_irqsave(&priv->tx_queue.lock, flags);
info = IEEE80211_SKB_CB(skb); info = IEEE80211_SKB_CB(skb);
range = (void *)info->rate_driver_data; range = (void *)info->rate_driver_data;
if (skb->prev != (struct sk_buff *)&priv->tx_queue) { if (!skb_queue_is_first(&priv->tx_queue, skb)) {
struct ieee80211_tx_info *ni; struct ieee80211_tx_info *ni;
struct p54_tx_info *mr; struct p54_tx_info *mr;
ni = IEEE80211_SKB_CB(skb->prev); ni = IEEE80211_SKB_CB(skb_queue_prev(&priv->tx_queue, skb));
mr = (struct p54_tx_info *)ni->rate_driver_data; mr = (struct p54_tx_info *)ni->rate_driver_data;
} }
if (skb->next != (struct sk_buff *)&priv->tx_queue) { if (!skb_queue_is_last(&priv->tx_queue, skb)) {
struct ieee80211_tx_info *ni; struct ieee80211_tx_info *ni;
struct p54_tx_info *mr; struct p54_tx_info *mr;
ni = IEEE80211_SKB_CB(skb->next); ni = IEEE80211_SKB_CB(skb_queue_next(&priv->tx_queue, skb));
mr = (struct p54_tx_info *)ni->rate_driver_data; mr = (struct p54_tx_info *)ni->rate_driver_data;
} }
__skb_unlink(skb, &priv->tx_queue); __skb_unlink(skb, &priv->tx_queue);
@ -864,15 +864,13 @@ static struct sk_buff *p54_find_tx_entry(struct ieee80211_hw *dev,
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&priv->tx_queue.lock, flags); spin_lock_irqsave(&priv->tx_queue.lock, flags);
entry = priv->tx_queue.next; skb_queue_walk(&priv->tx_queue, entry) {
while (entry != (struct sk_buff *)&priv->tx_queue) {
struct p54_hdr *hdr = (struct p54_hdr *) entry->data; struct p54_hdr *hdr = (struct p54_hdr *) entry->data;
if (hdr->req_id == req_id) { if (hdr->req_id == req_id) {
spin_unlock_irqrestore(&priv->tx_queue.lock, flags); spin_unlock_irqrestore(&priv->tx_queue.lock, flags);
return entry; return entry;
} }
entry = entry->next;
} }
spin_unlock_irqrestore(&priv->tx_queue.lock, flags); spin_unlock_irqrestore(&priv->tx_queue.lock, flags);
return NULL; return NULL;
@ -890,24 +888,22 @@ static void p54_rx_frame_sent(struct ieee80211_hw *dev, struct sk_buff *skb)
int count, idx; int count, idx;
spin_lock_irqsave(&priv->tx_queue.lock, flags); spin_lock_irqsave(&priv->tx_queue.lock, flags);
entry = (struct sk_buff *) priv->tx_queue.next; skb_queue_walk(&priv->tx_queue, entry) {
while (entry != (struct sk_buff *)&priv->tx_queue) {
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(entry); struct ieee80211_tx_info *info = IEEE80211_SKB_CB(entry);
struct p54_hdr *entry_hdr; struct p54_hdr *entry_hdr;
struct p54_tx_data *entry_data; struct p54_tx_data *entry_data;
unsigned int pad = 0, frame_len; unsigned int pad = 0, frame_len;
range = (void *)info->rate_driver_data; range = (void *)info->rate_driver_data;
if (range->start_addr != addr) { if (range->start_addr != addr)
entry = entry->next;
continue; continue;
}
if (entry->next != (struct sk_buff *)&priv->tx_queue) { if (!skb_queue_is_last(&priv->tx_queue, entry)) {
struct ieee80211_tx_info *ni; struct ieee80211_tx_info *ni;
struct p54_tx_info *mr; struct p54_tx_info *mr;
ni = IEEE80211_SKB_CB(entry->next); ni = IEEE80211_SKB_CB(skb_queue_next(&priv->tx_queue,
entry));
mr = (struct p54_tx_info *)ni->rate_driver_data; mr = (struct p54_tx_info *)ni->rate_driver_data;
} }
@ -1168,23 +1164,21 @@ static int p54_assign_address(struct ieee80211_hw *dev, struct sk_buff *skb,
} }
} }
entry = priv->tx_queue.next; skb_queue_walk(&priv->tx_queue, entry) {
while (left--) {
u32 hole_size; u32 hole_size;
info = IEEE80211_SKB_CB(entry); info = IEEE80211_SKB_CB(entry);
range = (void *)info->rate_driver_data; range = (void *)info->rate_driver_data;
hole_size = range->start_addr - last_addr; hole_size = range->start_addr - last_addr;
if (!target_skb && hole_size >= len) { if (!target_skb && hole_size >= len) {
target_skb = entry->prev; target_skb = skb_queue_prev(&priv->tx_queue, entry);
hole_size -= len; hole_size -= len;
target_addr = last_addr; target_addr = last_addr;
} }
largest_hole = max(largest_hole, hole_size); largest_hole = max(largest_hole, hole_size);
last_addr = range->end_addr; last_addr = range->end_addr;
entry = entry->next;
} }
if (!target_skb && priv->rx_end - last_addr >= len) { if (!target_skb && priv->rx_end - last_addr >= len) {
target_skb = priv->tx_queue.prev; target_skb = skb_peek_tail(&priv->tx_queue);
largest_hole = max(largest_hole, priv->rx_end - last_addr - len); largest_hole = max(largest_hole, priv->rx_end - last_addr - len);
if (!skb_queue_empty(&priv->tx_queue)) { if (!skb_queue_empty(&priv->tx_queue)) {
info = IEEE80211_SKB_CB(target_skb); info = IEEE80211_SKB_CB(target_skb);
@ -2090,7 +2084,6 @@ out:
static void p54_stop(struct ieee80211_hw *dev) static void p54_stop(struct ieee80211_hw *dev)
{ {
struct p54_common *priv = dev->priv; struct p54_common *priv = dev->priv;
struct sk_buff *skb;
mutex_lock(&priv->conf_mutex); mutex_lock(&priv->conf_mutex);
priv->mode = NL80211_IFTYPE_UNSPECIFIED; priv->mode = NL80211_IFTYPE_UNSPECIFIED;
@ -2105,8 +2098,7 @@ static void p54_stop(struct ieee80211_hw *dev)
p54_tx_cancel(dev, priv->cached_beacon); p54_tx_cancel(dev, priv->cached_beacon);
priv->stop(dev); priv->stop(dev);
while ((skb = skb_dequeue(&priv->tx_queue))) skb_queue_purge(&priv->tx_queue);
kfree_skb(skb);
priv->cached_beacon = NULL; priv->cached_beacon = NULL;
priv->tsf_high32 = priv->tsf_low32 = 0; priv->tsf_high32 = priv->tsf_low32 = 0;
mutex_unlock(&priv->conf_mutex); mutex_unlock(&priv->conf_mutex);