From 3bb26046ff2fa5303fdcc1e3ef9c2806c14e00f5 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Tue, 30 Aug 2011 03:46:40 +0000 Subject: [PATCH] --- yaml --- r: 265723 b: refs/heads/master c: aec9db355ce2b930358ade5a71cc00ac258e1b3f h: refs/heads/master i: 265721: a9f84c0bbda71fe38588a05e1bce191de40ff76d 265719: 083fcd7582c31526af9ef69d5ba7f3daf1665995 v: v3 --- [refs] | 2 +- trunk/net/ieee802154/6lowpan.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 145ee2e8563c..fa47d8a7acfd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 90d0963d17c11188d1d986a235b8aa775c2fb8f2 +refs/heads/master: aec9db355ce2b930358ade5a71cc00ac258e1b3f diff --git a/trunk/net/ieee802154/6lowpan.c b/trunk/net/ieee802154/6lowpan.c index 8a9dbaa0434f..5dc04890e0c5 100644 --- a/trunk/net/ieee802154/6lowpan.c +++ b/trunk/net/ieee802154/6lowpan.c @@ -813,15 +813,17 @@ static void lowpan_dellink(struct net_device *dev, struct list_head *head) struct lowpan_dev_info *lowpan_dev = lowpan_dev_info(dev); struct net_device *real_dev = lowpan_dev->real_dev; struct lowpan_dev_record *entry; + struct lowpan_dev_record *tmp; ASSERT_RTNL(); mutex_lock(&lowpan_dev_info(dev)->dev_list_mtx); - list_for_each_entry(entry, &lowpan_devices, list) + list_for_each_entry_safe(entry, tmp, &lowpan_devices, list) { if (entry->ldev == dev) { list_del(&entry->list); kfree(entry); } + } mutex_unlock(&lowpan_dev_info(dev)->dev_list_mtx); mutex_destroy(&lowpan_dev_info(dev)->dev_list_mtx);