Remove things like "for (;;)" or "for (; condition ;)".
Ever heard of while loops?
Also clean up a bunch of things that list.h offers. No need to code it
here.
Signed-off-by: Johannes Berg <[EMAIL PROTECTED]>
---
This is just insane. Can't we just rewrite the whole thing? :)
I'm not really sure we need list_for_each_entry_safe in the first hunk
but it doesn't hurt either.
--- wireless-dev.orig/net/d80211/ieee80211_sta.c 2006-11-16
23:44:12.624935990 +0100
+++ wireless-dev/net/d80211/ieee80211_sta.c 2006-11-16 23:44:15.944935990
+0100
@@ -1314,16 +1314,10 @@ void ieee80211_rx_bss_list_init(struct n
void ieee80211_rx_bss_list_deinit(struct net_device *dev)
{
struct ieee80211_local *local = dev->ieee80211_ptr;
- struct ieee80211_sta_bss *bss;
- struct list_head *ptr;
+ struct ieee80211_sta_bss *bss, *tmp;
- for (;;) {
- ptr = local->sta_bss_list.next;
- if (!ptr || ptr == &local->sta_bss_list)
- break;
- bss = list_entry(ptr, struct ieee80211_sta_bss, list);
+ list_for_each_entry_safe(bss, tmp, &local->sta_bss_list, list)
ieee80211_rx_bss_put(dev, bss);
- }
}
--- wireless-dev.orig/net/d80211/sta_info.c 2006-11-16 23:40:48.164935990
+0100
+++ wireless-dev/net/d80211/sta_info.c 2006-11-16 23:55:34.634935990 +0100
@@ -299,7 +299,7 @@ static void sta_info_cleanup_expire_buff
if (skb_queue_empty(&sta->ps_tx_buf))
return;
- for (;;) {
+ while (1) {
spin_lock_irqsave(&sta->ps_tx_buf.lock, flags);
skb = skb_peek(&sta->ps_tx_buf);
if (sta_info_buffer_expired(local, sta, skb)) {
@@ -324,16 +324,13 @@ static void sta_info_cleanup_expire_buff
static void sta_info_cleanup(unsigned long data)
{
struct ieee80211_local *local = (struct ieee80211_local *) data;
- struct list_head *ptr;
+ struct sta_info *sta, *tmp;
spin_lock_bh(&local->sta_lock);
- ptr = local->sta_list.next;
- while (ptr && ptr != &local->sta_list) {
- struct sta_info *sta = (struct sta_info *) ptr;
+ list_for_each_entry_safe(sta, tmp, &local->sta_list, list) {
__sta_info_get(sta);
sta_info_cleanup_expire_buffered(local, sta);
sta_info_put(sta);
- ptr = ptr->next;
}
spin_unlock_bh(&local->sta_lock);
@@ -411,14 +408,11 @@ int sta_info_start(struct ieee80211_loca
void sta_info_stop(struct ieee80211_local *local)
{
- struct list_head *ptr;
+ struct sta_info *sta, *tmp;
del_timer(&local->sta_cleanup);
- ptr = local->sta_list.next;
- while (ptr && ptr != &local->sta_list) {
- struct sta_info *sta = (struct sta_info *) ptr;
- ptr = ptr->next;
+ list_for_each_entry_safe(sta, tmp, &local->sta_list, list) {
/* sta_info_free must be called with 0 as the last
* parameter to ensure all sysfs sta entries are
* unregistered. We don't need locking at this
--- wireless-dev.orig/net/d80211/wme.c 2006-11-16 23:40:37.134935990 +0100
+++ wireless-dev/net/d80211/wme.c 2006-11-16 23:40:40.764935990 +0100
@@ -211,8 +211,7 @@ static inline int classify80211(struct s
skb->priority = classify_1d(skb, qd);
/* incase we are a client verify acm is not set for this ac */
- for (; unlikely(local->wmm_acm & BIT(skb->priority)); )
- {
+ while (unlikely(local->wmm_acm & BIT(skb->priority))) {
if (wme_downgrade_ac(skb)) {
/* No AC with lower priority has acm=0,
* drop packet. */
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
