summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/3c523.c2
-rw-r--r--drivers/net/3c527.c2
-rw-r--r--drivers/net/aironet4500_card.c16
-rw-r--r--drivers/net/appletalk/cops.c2
-rw-r--r--drivers/net/appletalk/ipddp.c2
-rw-r--r--drivers/net/defxx.c1
-rw-r--r--drivers/net/depca.c2
-rw-r--r--drivers/net/eepro.c2
-rw-r--r--drivers/net/fc/iph5526.c2
-rw-r--r--drivers/net/hamradio/dmascc.c4
-rw-r--r--drivers/net/hamradio/soundmodem/sm_sbc.c4
-rw-r--r--drivers/net/hamradio/soundmodem/sm_wss.c4
-rw-r--r--drivers/net/hp100.c8
-rw-r--r--drivers/net/ibmlana.c2
-rw-r--r--drivers/net/pcmcia/aironet4500_cs.c8
-rw-r--r--drivers/net/pcmcia/com20020_cs.c4
-rw-r--r--drivers/net/pcmcia/ray_cs.c6
-rw-r--r--drivers/net/sb1000.c2
-rw-r--r--drivers/net/sk_mca.c2
-rw-r--r--drivers/net/skeleton.c2
-rw-r--r--drivers/net/smc9194.c2
-rw-r--r--drivers/net/tokenring/ibmtr.c14
-rw-r--r--drivers/net/tokenring/lanstreamer.c12
-rw-r--r--drivers/net/tokenring/olympic.c6
-rw-r--r--drivers/net/tokenring/smctr.c9
-rw-r--r--drivers/net/wavelan.c6
26 files changed, 61 insertions, 65 deletions
diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c
index 9be7f31a8..7703e1415 100644
--- a/drivers/net/3c523.c
+++ b/drivers/net/3c523.c
@@ -1269,7 +1269,7 @@ void cleanup_module(void)
mca_set_adapter_procfn(((struct priv *) (dev->priv))->slot,
NULL, NULL);
- kfree_s(dev->priv, sizeof(struct priv));
+ kfree(dev->priv);
dev->priv = NULL;
}
}
diff --git a/drivers/net/3c527.c b/drivers/net/3c527.c
index 6e3910172..94a268e01 100644
--- a/drivers/net/3c527.c
+++ b/drivers/net/3c527.c
@@ -1510,7 +1510,7 @@ void cleanup_module(void)
slot = lp->slot;
mca_mark_as_unused(slot);
mca_set_adapter_name(slot, NULL);
- kfree_s(this_device.priv, sizeof(struct mc32_local));
+ kfree(this_device.priv);
}
free_irq(this_device.irq, &this_device);
}
diff --git a/drivers/net/aironet4500_card.c b/drivers/net/aironet4500_card.c
index ea256f789..d6a9c505d 100644
--- a/drivers/net/aironet4500_card.c
+++ b/drivers/net/aironet4500_card.c
@@ -244,8 +244,8 @@ static void awc_pci_release(void) {
unregister_netdev(aironet4500_devices[i]);
free_irq(aironet4500_devices[i]->irq,aironet4500_devices[i]);
- kfree_s(aironet4500_devices[i]->priv, sizeof(struct awc_private));
- kfree_s(aironet4500_devices[i], sizeof(struct net_device));
+ kfree(aironet4500_devices[i]->priv);
+ kfree(aironet4500_devices[i]);
aironet4500_devices[i]=0;
@@ -457,8 +457,8 @@ static void awc_pnp_release(void) {
unregister_netdev(aironet4500_devices[i]);
free_irq(aironet4500_devices[i]->irq,aironet4500_devices[i]);
- kfree_s(aironet4500_devices[i]->priv, sizeof(struct awc_private));
- kfree_s(aironet4500_devices[i], sizeof(struct net_device));
+ kfree(aironet4500_devices[i]->priv);
+ kfree(aironet4500_devices[i]);
aironet4500_devices[i]=0;
@@ -595,8 +595,8 @@ static void awc_isa_release(void) {
unregister_netdev(aironet4500_devices[i]);
free_irq(aironet4500_devices[i]->irq,aironet4500_devices[i]);
- kfree_s(aironet4500_devices[i]->priv, sizeof(struct awc_private));
- kfree_s(aironet4500_devices[i], sizeof(struct net_device));
+ kfree(aironet4500_devices[i]->priv);
+ kfree(aironet4500_devices[i]);
aironet4500_devices[i]=0;
@@ -865,8 +865,8 @@ static void awc_i365_release(void) {
unregister_netdev(aironet4500_devices[i]);
- //kfree_s(aironet4500_devices[i]->priv, sizeof(struct awc_private));
- kfree_s(aironet4500_devices[i], sizeof(struct net_device));
+ //kfree(aironet4500_devices[i]->priv);
+ kfree(aironet4500_devices[i]);
aironet4500_devices[i]=0;
diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c
index 76cbf0f89..950bd016c 100644
--- a/drivers/net/appletalk/cops.c
+++ b/drivers/net/appletalk/cops.c
@@ -1048,7 +1048,7 @@ void cleanup_module(void)
/* No need to check MOD_IN_USE, as sys_delete_module() checks. */
unregister_netdev(&cops0_dev);
if(cops0_dev.priv)
- kfree_s(cops0_dev.priv, sizeof(struct cops_local));
+ kfree(cops0_dev.priv);
if(cops0_dev.irq)
free_irq(cops0_dev.irq, &cops0_dev);
release_region(cops0_dev.base_addr, COPS_IO_EXTENT);
diff --git a/drivers/net/appletalk/ipddp.c b/drivers/net/appletalk/ipddp.c
index d334df665..df5acebde 100644
--- a/drivers/net/appletalk/ipddp.c
+++ b/drivers/net/appletalk/ipddp.c
@@ -270,7 +270,7 @@ static int ipddp_delete(struct ipddp_route *rt)
&& tmp->at.s_node == rt->at.s_node)
{
*r = tmp->next;
- kfree_s(tmp, sizeof(struct ipddp_route));
+ kfree(tmp);
return 0;
}
r = &tmp->next;
diff --git a/drivers/net/defxx.c b/drivers/net/defxx.c
index 48cf43deb..14646b686 100644
--- a/drivers/net/defxx.c
+++ b/drivers/net/defxx.c
@@ -216,7 +216,6 @@
#include <asm/bitops.h>
#include <asm/io.h>
-#include <linux/netdevice.h>
#include <linux/fddidevice.h>
#include <linux/skbuff.h>
diff --git a/drivers/net/depca.c b/drivers/net/depca.c
index b62dc591a..196c81126 100644
--- a/drivers/net/depca.c
+++ b/drivers/net/depca.c
@@ -717,7 +717,7 @@ depca_hw_init(struct net_device *dev, u_long ioaddr, int mca_slot)
ether_setup(dev);
} else { /* Incorrectly initialised hardware */
if (dev->priv) {
- kfree_s(dev->priv, sizeof(struct depca_private));
+ kfree(dev->priv);
dev->priv = NULL;
}
}
diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c
index 2a5488a81..882ed0744 100644
--- a/drivers/net/eepro.c
+++ b/drivers/net/eepro.c
@@ -1798,7 +1798,7 @@ cleanup_module(void)
struct net_device *d = &dev_eepro[i];
unregister_netdev(d);
- kfree_s(d->priv,sizeof(struct eepro_local));
+ kfree(d->priv);
d->priv=NULL;
/* If we don't do this, we can't re-insmod it later. */
diff --git a/drivers/net/fc/iph5526.c b/drivers/net/fc/iph5526.c
index 83a87a635..309a2c42d 100644
--- a/drivers/net/fc/iph5526.c
+++ b/drivers/net/fc/iph5526.c
@@ -4554,7 +4554,7 @@ int i = 0;
dev_fc[i]->priv = fc[i];
fc[i]->dev = dev_fc[i];
if (register_fcdev(dev_fc[i]) != 0) {
- kfree_s(dev_fc[i], sizeof(struct net_device));
+ kfree(dev_fc[i]);
dev_fc[i] = NULL;
if (i == 0) {
printk("iph5526.c: IP registeration failed!!!\n");
diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c
index 7ed3785ff..44abcd416 100644
--- a/drivers/net/hamradio/dmascc.c
+++ b/drivers/net/hamradio/dmascc.c
@@ -337,7 +337,7 @@ void cleanup_module(void) {
/* Free memory */
first = info->next;
- kfree_s(info, sizeof(struct scc_info));
+ kfree(info);
}
}
@@ -545,7 +545,7 @@ int __init setup_adapter(int card_base, int type, int n) {
if (irq <= 0) {
printk("dmascc: could not find irq of %s at %#3x (irq=%d)\n",
hw[type].name, card_base, irq);
- kfree_s(info, sizeof(struct scc_info));
+ kfree(info);
return -1;
}
diff --git a/drivers/net/hamradio/soundmodem/sm_sbc.c b/drivers/net/hamradio/soundmodem/sm_sbc.c
index 772940049..85ae47588 100644
--- a/drivers/net/hamradio/soundmodem/sm_sbc.c
+++ b/drivers/net/hamradio/soundmodem/sm_sbc.c
@@ -433,13 +433,13 @@ static int sbc_open(struct net_device *dev, struct sm_state *sm)
sm->mode_rx->init(sm);
if (request_dma(dev->dma, sm->hwdrv->hw_name)) {
- kfree_s(sm->dma.obuf, dmasz);
+ kfree(sm->dma.obuf);
return -EBUSY;
}
if (request_irq(dev->irq, sbc_interrupt, SA_INTERRUPT,
sm->hwdrv->hw_name, dev)) {
free_dma(dev->dma);
- kfree_s(sm->dma.obuf, dmasz);
+ kfree(sm->dma.obuf);
return -EBUSY;
}
request_region(dev->base_addr, SBC_EXTENT, sm->hwdrv->hw_name);
diff --git a/drivers/net/hamradio/soundmodem/sm_wss.c b/drivers/net/hamradio/soundmodem/sm_wss.c
index 23abd970a..19840c491 100644
--- a/drivers/net/hamradio/soundmodem/sm_wss.c
+++ b/drivers/net/hamradio/soundmodem/sm_wss.c
@@ -468,13 +468,13 @@ static int wss_open(struct net_device *dev, struct sm_state *sm)
sm->mode_rx->init(sm);
if (request_dma(dev->dma, sm->hwdrv->hw_name)) {
- kfree_s(sm->dma.obuf, dmasz);
+ kfree(sm->dma.obuf);
return -EBUSY;
}
if (request_irq(dev->irq, wss_interrupt, SA_INTERRUPT,
sm->hwdrv->hw_name, dev)) {
free_dma(dev->dma);
- kfree_s(sm->dma.obuf, dmasz);
+ kfree(sm->dma.obuf);
return -EBUSY;
}
request_region(dev->base_addr, WSS_EXTENT, sm->hwdrv->hw_name);
diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c
index a328fde65..d54857bb6 100644
--- a/drivers/net/hp100.c
+++ b/drivers/net/hp100.c
@@ -3040,7 +3040,7 @@ int init_module( void )
{
/* DeAllocate everything */
/* Note: if dev->priv is mallocated, there is no way to fail */
- kfree_s(hp100_devlist[i], sizeof(struct net_device));
+ kfree(hp100_devlist[i]);
hp100_devlist[i] = (struct net_device *) NULL;
}
else
@@ -3061,12 +3061,12 @@ void cleanup_module( void )
unregister_netdev( hp100_devlist[i] );
release_region( hp100_devlist[i]->base_addr, HP100_REGION_SIZE );
if( ((struct hp100_private *)hp100_devlist[i]->priv)->mode==1 ) /* busmaster */
- kfree_s( ((struct hp100_private *)hp100_devlist[i]->priv)->page_vaddr, MAX_RINGSIZE+0x0f);
+ kfree( ((struct hp100_private *)hp100_devlist[i]->priv)->page_vaddr );
if ( ((struct hp100_private *)hp100_devlist[i]->priv) -> mem_ptr_virt )
iounmap( ((struct hp100_private *)hp100_devlist[i]->priv) -> mem_ptr_virt );
- kfree_s( hp100_devlist[i]->priv, sizeof( struct hp100_private ) );
+ kfree( hp100_devlist[i]->priv );
hp100_devlist[i]->priv = NULL;
- kfree_s(hp100_devlist[i], sizeof(struct net_device));
+ kfree(hp100_devlist[i]);
hp100_devlist[i] = (struct net_device *) NULL;
}
}
diff --git a/drivers/net/ibmlana.c b/drivers/net/ibmlana.c
index 7be66ce89..776169ae9 100644
--- a/drivers/net/ibmlana.c
+++ b/drivers/net/ibmlana.c
@@ -1252,7 +1252,7 @@ void cleanup_module(void)
#endif
mca_set_adapter_name(priv->slot, "");
mca_set_adapter_procfn(priv->slot, NULL, NULL);
- kfree_s(dev->priv, sizeof(ibmlana_priv));
+ kfree(dev->priv);
dev->priv = NULL;
}
}
diff --git a/drivers/net/pcmcia/aironet4500_cs.c b/drivers/net/pcmcia/aironet4500_cs.c
index d623828b9..45a411a21 100644
--- a/drivers/net/pcmcia/aironet4500_cs.c
+++ b/drivers/net/pcmcia/aironet4500_cs.c
@@ -321,11 +321,11 @@ static void awc_detach(dev_link_t *link)
if (link->priv) {
//struct net_device *dev = link->priv;
// dam dam damn mif (dev->priv)
- // kfree_s(dev->priv, sizeof(struct awc_private));
- kfree_s(link->priv, sizeof(struct net_device));
+ // kfree(dev->priv);
+ kfree(link->priv);
}
- kfree_s(link->dev, sizeof(struct dev_node_t));
- kfree_s(link, sizeof(struct dev_link_t));
+ kfree(link->dev);
+ kfree(link);
} /* awc_detach */
diff --git a/drivers/net/pcmcia/com20020_cs.c b/drivers/net/pcmcia/com20020_cs.c
index 85d5c86eb..0c914aec2 100644
--- a/drivers/net/pcmcia/com20020_cs.c
+++ b/drivers/net/pcmcia/com20020_cs.c
@@ -333,10 +333,10 @@ static void com20020_detach(dev_link_t *link)
kfree(dev);
}
DEBUG(1,"kfree2...\n");
- kfree_s(info, sizeof(struct com20020_dev_t));
+ kfree(info);
}
DEBUG(1,"kfree3...\n");
- kfree_s(link, sizeof(struct dev_link_t));
+ kfree(link);
} /* com20020_detach */
diff --git a/drivers/net/pcmcia/ray_cs.c b/drivers/net/pcmcia/ray_cs.c
index 0408612e6..aeee5e561 100644
--- a/drivers/net/pcmcia/ray_cs.c
+++ b/drivers/net/pcmcia/ray_cs.c
@@ -468,11 +468,11 @@ static void ray_detach(dev_link_t *link)
if (link->priv) {
dev = link->priv;
if (dev->priv)
- kfree_s(dev->priv, sizeof(ray_dev_t));
+ kfree(dev->priv);
- kfree_s(link->priv, sizeof(struct net_device));
+ kfree(link->priv);
}
- kfree_s(link, sizeof(struct dev_link_t));
+ kfree(link);
DEBUG(2,"ray_cs ray_detach ending\n");
} /* ray_detach */
/*=============================================================================
diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c
index 97dfb6bd4..793af1577 100644
--- a/drivers/net/sb1000.c
+++ b/drivers/net/sb1000.c
@@ -1243,7 +1243,7 @@ void cleanup_module(void)
unregister_netdev(&dev_sb1000);
release_region(dev_sb1000.base_addr, 16);
release_region(dev_sb1000.rmem_end, 16);
- kfree_s(dev_sb1000.priv, sizeof(struct sb1000_private));
+ kfree(dev_sb1000.priv);
dev_sb1000.priv = NULL;
}
#endif /* MODULE */
diff --git a/drivers/net/sk_mca.c b/drivers/net/sk_mca.c
index a98da4115..51688271a 100644
--- a/drivers/net/sk_mca.c
+++ b/drivers/net/sk_mca.c
@@ -1290,7 +1290,7 @@ void cleanup_module(void)
mca_mark_as_unused(priv->slot);
#endif
mca_set_adapter_procfn(priv->slot, NULL, NULL);
- kfree_s(dev->priv, sizeof(skmca_priv));
+ kfree(dev->priv);
dev->priv = NULL;
}
}
diff --git a/drivers/net/skeleton.c b/drivers/net/skeleton.c
index 776b7a6a6..8d6b193a2 100644
--- a/drivers/net/skeleton.c
+++ b/drivers/net/skeleton.c
@@ -703,7 +703,7 @@ cleanup_module(void)
release_region(this_device.base_addr, NETCARD_IO_EXTENT);
if (this_device.priv)
- kfree_s(this_device.priv, sizeof(struct net_local));
+ kfree(this_device.priv);
}
#endif /* MODULE */
diff --git a/drivers/net/smc9194.c b/drivers/net/smc9194.c
index 084fd4120..31521cfde 100644
--- a/drivers/net/smc9194.c
+++ b/drivers/net/smc9194.c
@@ -1632,7 +1632,7 @@ void cleanup_module(void)
release_region(devSMC9194.base_addr, SMC_IO_EXTENT);
if (devSMC9194.priv)
- kfree_s(devSMC9194.priv, sizeof(struct smc_local));
+ kfree(devSMC9194.priv);
}
#endif /* MODULE */
diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c
index b59414255..fb6d438d0 100644
--- a/drivers/net/tokenring/ibmtr.c
+++ b/drivers/net/tokenring/ibmtr.c
@@ -456,7 +456,7 @@ static int __init ibmtr_probe1(struct net_device *dev, int PIOaddr)
while(!isa_readb(ti->mmio + ACA_OFFSET + ACA_RW + RRR_EVEN))
if (time_after(jiffies, timeout)) {
DPRINTK("Hardware timeout during initialization.\n");
- kfree_s(ti, sizeof(struct tok_info));
+ kfree(ti);
return -ENODEV;
}
@@ -607,7 +607,7 @@ static int __init ibmtr_probe1(struct net_device *dev, int PIOaddr)
break;
default:
DPRINTK("Unknown shared ram paging info %01X\n",ti->shared_ram_paging);
- kfree_s(ti, sizeof(struct tok_info));
+ kfree(ti);
return -ENODEV;
break;
}
@@ -642,7 +642,7 @@ static int __init ibmtr_probe1(struct net_device *dev, int PIOaddr)
DPRINTK("Shared RAM for this adapter (%05x) exceeds driver"
" limit (%05x), adapter not started.\n",
chk_base, ibmtr_mem_base + IBMTR_SHARED_RAM_SIZE);
- kfree_s(ti, sizeof(struct tok_info));
+ kfree(ti);
return -ENODEV;
} else { /* seems cool, record what we have figured out */
ti->sram_base = new_base >> 12;
@@ -660,7 +660,7 @@ static int __init ibmtr_probe1(struct net_device *dev, int PIOaddr)
#ifndef PCMCIA
if (request_irq (dev->irq = irq, &tok_interrupt,0,"ibmtr", dev) != 0) {
DPRINTK("Could not grab irq %d. Halting Token Ring driver.\n",irq);
- kfree_s(ti, sizeof(struct tok_info));
+ kfree(ti);
return -ENODEV;
}
@@ -1885,7 +1885,7 @@ int init_module(void)
dev_ibmtr[i]->init = &ibmtr_probe;
if (register_trdev(dev_ibmtr[i]) != 0) {
- kfree_s(dev_ibmtr[i], sizeof(struct net_device));
+ kfree(dev_ibmtr[i]);
dev_ibmtr[i] = NULL;
if (i == 0) {
printk("ibmtr: register_trdev() returned non-zero.\n");
@@ -1907,8 +1907,8 @@ void cleanup_module(void)
unregister_trdev(dev_ibmtr[i]);
free_irq(dev_ibmtr[i]->irq, dev_ibmtr[i]);
release_region(dev_ibmtr[i]->base_addr, IBMTR_IO_EXTENT);
- kfree_s(dev_ibmtr[i]->priv, sizeof(struct tok_info));
- kfree_s(dev_ibmtr[i], sizeof(struct net_device));
+ kfree(dev_ibmtr[i]->priv);
+ kfree(dev_ibmtr[i]);
dev_ibmtr[i] = NULL;
}
}
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c
index 2ef7ec903..1f2c7035a 100644
--- a/drivers/net/tokenring/lanstreamer.c
+++ b/drivers/net/tokenring/lanstreamer.c
@@ -1764,7 +1764,7 @@ int init_module(void)
dev_streamer[i]->init = &streamer_probe;
if (register_trdev(dev_streamer[i]) != 0) {
- kfree_s(dev_streamer[i], sizeof(struct net_device));
+ kfree(dev_streamer[i]);
dev_streamer[i] = NULL;
if (i == 0)
{
@@ -1790,12 +1790,10 @@ void cleanup_module(void)
unregister_trdev(dev_streamer[i]);
release_region(dev_streamer[i]->base_addr, STREAMER_IO_SPACE);
streamer_priv=(struct streamer_private *)dev_streamer[i]->priv;
- kfree_s(streamer_priv->streamer_rx_ring,
- sizeof(struct streamer_rx_desc)*STREAMER_RX_RING_SIZE);
- kfree_s(streamer_priv->streamer_tx_ring,
- sizeof(struct streamer_tx_desc)*STREAMER_TX_RING_SIZE);
- kfree_s(dev_streamer[i]->priv, sizeof(struct streamer_private));
- kfree_s(dev_streamer[i], sizeof(struct net_device));
+ kfree(streamer_priv->streamer_rx_ring);
+ kfree(streamer_priv->streamer_tx_ring);
+ kfree(dev_streamer[i]->priv);
+ kfree(dev_streamer[i]);
dev_streamer[i] = NULL;
}
#if STREAMER_NETWORK_MONITOR
diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c
index 73cd6a194..b8784bb29 100644
--- a/drivers/net/tokenring/olympic.c
+++ b/drivers/net/tokenring/olympic.c
@@ -1628,7 +1628,7 @@ int init_module(void)
dev_olympic[i]->init = &olympic_probe;
if (register_trdev(dev_olympic[i]) != 0) {
- kfree_s(dev_olympic[i], sizeof(struct net_device));
+ kfree(dev_olympic[i]);
dev_olympic[i] = NULL;
if (i == 0) {
printk("Olympic: No IBM PCI Token Ring cards found in system.\n");
@@ -1651,8 +1651,8 @@ void cleanup_module(void)
if (dev_olympic[i]) {
unregister_trdev(dev_olympic[i]);
release_region(dev_olympic[i]->base_addr, OLYMPIC_IO_SPACE);
- kfree_s(dev_olympic[i]->priv, sizeof(struct olympic_private));
- kfree_s(dev_olympic[i], sizeof(struct net_device));
+ kfree(dev_olympic[i]->priv);
+ kfree(dev_olympic[i]);
dev_olympic[i] = NULL;
}
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c
index e9481039d..83024732a 100644
--- a/drivers/net/tokenring/smctr.c
+++ b/drivers/net/tokenring/smctr.c
@@ -3719,7 +3719,7 @@ static int __init smctr_probe1(struct net_device *dev, int ioaddr)
err = smctr_chk_mca(dev);
if(err < 0)
{
- kfree_s(tp, sizeof(struct net_local));
+ kfree(tp);
return (-ENODEV);
}
}
@@ -5830,7 +5830,7 @@ int init_module(void)
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 @@ void cleanup_module(void)
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;
}
}
diff --git a/drivers/net/wavelan.c b/drivers/net/wavelan.c
index fdfab3edb..1a11b1bd9 100644
--- a/drivers/net/wavelan.c
+++ b/drivers/net/wavelan.c
@@ -4221,7 +4221,7 @@ int init_module(void)
if (register_netdev(dev) != 0) {
/* Deallocate everything. */
/* Note: if dev->priv is mallocated, there is no way to fail. */
- kfree_s(dev, sizeof(struct net_device));
+ kfree(dev);
} else {
/* If at least one device OK, we do not fail */
ret = 0;
@@ -4271,8 +4271,8 @@ void cleanup_module(void)
wavelan_list = wavelan_list->next;
/* Free pieces. */
- kfree_s(dev->priv, sizeof(struct net_local));
- kfree_s(dev, sizeof(struct net_device));
+ kfree(dev->priv);
+ kfree(dev);
}
#ifdef DEBUG_MODULE_TRACE
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 07:06:47 +0000