patch-2.4.0-test5 linux/drivers/net/tokenring/smctr.c

• Lines: 30
• Date: Tue Jul 18 16:52:35 2000
• Orig file: v2.4.0-test4/linux/drivers/net/tokenring/smctr.c
• Orig date: Fri Jul 14 12:12:11 2000

diff -u --recursive --new-file v2.4.0-test4/linux/drivers/net/tokenring/smctr.c linux/drivers/net/tokenring/smctr.c
@@ -3719,7 +3719,7 @@
 		err = smctr_chk_mca(dev);
 		if(err < 0)
 		{
-                	kfree_s(tp, sizeof(struct net_local));
+                	kfree(tp);
                 	return (-ENODEV);
 		}
         }
@@ -5830,7 +5830,7 @@
 
                 if(register_trdev(dev_smctr[i]) != 0)
                 {
-                        kfree_s(dev_smctr[i], sizeof(struct net_device));
+                        kfree(dev_smctr[i]);
                         dev_smctr[i] = NULL;
                         if(i == 0)
                         {
@@ -5866,9 +5866,8 @@
                         if(dev_smctr[i]->irq)
                                 free_irq(dev_smctr[i]->irq, dev_smctr[i]);
                         if(dev_smctr[i]->priv)
-                                kfree_s(dev_smctr[i]->priv,
-                                        sizeof(struct net_local));
-                        kfree_s(dev_smctr[i], sizeof(struct net_device));
+                                kfree(dev_smctr[i]->priv);
+                        kfree(dev_smctr[i]);
                         dev_smctr[i] = NULL;
                 }
         }