]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
6lowpan: clean up fragments list if module unloaded
authoralex.bluesman.smirnov@gmail.com <alex.bluesman.smirnov@gmail.com>
Wed, 25 Apr 2012 23:24:57 +0000 (23:24 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 26 Apr 2012 09:32:55 +0000 (05:32 -0400)
Clean all the pending fragments and relative timers if 6lowpan link
is going to be deleted.

Signed-off-by: Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ieee802154/6lowpan.c

index f6b169439b5b2c56fe949b7d11ca888de5c840ea..b3021f7652041d78c551bdfb4ed223729015279c 100644 (file)
@@ -1177,11 +1177,20 @@ 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;
+       struct lowpan_dev_record *entry, *tmp;
+       struct lowpan_fragment *frame, *tframe;
 
        ASSERT_RTNL();
 
+       spin_lock(&flist_lock);
+       list_for_each_entry_safe(frame, tframe, &lowpan_fragments, list) {
+               del_timer(&frame->timer);
+               list_del(&frame->list);
+               dev_kfree_skb(frame->skb);
+               kfree(frame);
+       }
+       spin_unlock(&flist_lock);
+
        mutex_lock(&lowpan_dev_info(dev)->dev_list_mtx);
        list_for_each_entry_safe(entry, tmp, &lowpan_devices, list) {
                if (entry->ldev == dev) {