Commit 8a3cac62 authored by Rupesh Gujare's avatar Rupesh Gujare Committed by Greg Kroah-Hartman

staging: ozwpan: Use kernel list function for managing interface list.

Managing interface list, is easier if we use kernel list_* API
than managing it on our own.
Signed-off-by: default avatarRupesh Gujare <rupesh.gujare@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 64cb7ce9
......@@ -37,7 +37,7 @@
struct oz_binding {
struct packet_type ptype;
char name[OZ_MAX_BINDING_LEN];
struct oz_binding *next;
struct list_head link;
};
/*------------------------------------------------------------------------------
......@@ -45,7 +45,7 @@ struct oz_binding {
*/
static DEFINE_SPINLOCK(g_polling_lock);
static LIST_HEAD(g_pd_list);
static struct oz_binding *g_binding ;
static LIST_HEAD(g_binding);
static DEFINE_SPINLOCK(g_binding_lock);
static struct sk_buff_head g_rx_queue;
static u8 g_session_id;
......@@ -437,12 +437,13 @@ static void oz_rx_frame(struct sk_buff *skb)
*/
void oz_protocol_term(void)
{
struct oz_binding *b, *t;
/* Walk the list of bindings and remove each one.
*/
spin_lock_bh(&g_binding_lock);
while (g_binding) {
struct oz_binding *b = g_binding;
g_binding = b->next;
list_for_each_entry_safe(b, t, &g_binding, link) {
list_del(&b->link);
spin_unlock_bh(&g_binding_lock);
dev_remove_pack(&b->ptype);
if (b->ptype.dev)
......@@ -660,8 +661,7 @@ void oz_binding_add(char *net_dev)
if (binding) {
dev_add_pack(&binding->ptype);
spin_lock_bh(&g_binding_lock);
binding->next = g_binding;
g_binding = binding;
list_add_tail(&binding->link, &g_binding);
spin_unlock_bh(&g_binding_lock);
}
}
......@@ -710,28 +710,25 @@ static void pd_stop_all_for_device(struct net_device *net_dev)
void oz_binding_remove(char *net_dev)
{
struct oz_binding *binding;
struct oz_binding **link;
int found = 0;
oz_dbg(ON, "Removing binding: %s\n", net_dev);
spin_lock_bh(&g_binding_lock);
binding = g_binding;
link = &g_binding;
while (binding) {
list_for_each_entry(binding, &g_binding, link) {
if (compare_binding_name(binding->name, net_dev)) {
oz_dbg(ON, "Binding '%s' found\n", net_dev);
*link = binding->next;
found = 1;
break;
} else {
link = &binding;
binding = binding->next;
}
}
spin_unlock_bh(&g_binding_lock);
if (binding) {
if (found) {
dev_remove_pack(&binding->ptype);
if (binding->ptype.dev) {
dev_put(binding->ptype.dev);
pd_stop_all_for_device(binding->ptype.dev);
}
list_del(&binding->link);
kfree(binding);
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment