diff options
author | David S. Miller <davem@davemloft.net> | 2008-04-14 02:30:23 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-04-14 02:30:23 -0700 |
commit | df39e8ba56a788733d369068c7319e04b1da3cd5 (patch) | |
tree | 1e9be853bdb455e341cdbf957656f342cfa2eb9e /net/ax25 | |
parent | f5572855ec492334d8c3ec0e0e86c31865d5cf07 (diff) | |
parent | 159d83363b629c91d020734207c1bc788b96af5a (diff) | |
download | kernel_samsung_tuna-df39e8ba56a788733d369068c7319e04b1da3cd5.zip kernel_samsung_tuna-df39e8ba56a788733d369068c7319e04b1da3cd5.tar.gz kernel_samsung_tuna-df39e8ba56a788733d369068c7319e04b1da3cd5.tar.bz2 |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ehea/ehea_main.c
drivers/net/wireless/iwlwifi/Kconfig
drivers/net/wireless/rt2x00/rt61pci.c
net/ipv4/inet_timewait_sock.c
net/ipv6/raw.c
net/mac80211/ieee80211_sta.c
Diffstat (limited to 'net/ax25')
-rw-r--r-- | net/ax25/ax25_uid.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ax25/ax25_uid.c b/net/ax25/ax25_uid.c index 5f4eb73..57aeba7 100644 --- a/net/ax25/ax25_uid.c +++ b/net/ax25/ax25_uid.c @@ -218,9 +218,11 @@ void __exit ax25_uid_free(void) struct hlist_node *node; write_lock(&ax25_uid_lock); +again: ax25_uid_for_each(ax25_uid, node, &ax25_uid_list) { hlist_del_init(&ax25_uid->uid_node); ax25_uid_put(ax25_uid); + goto again; } write_unlock(&ax25_uid_lock); } |