diff options
| author |   Eric Sesterhenn <snakebyte@gmx.de> | 2006-10-23 22:20:15 +0200 |
|---|---|---|
| committer |   Jeff Garzik <jeff@garzik.org> | 2006-12-02 00:12:01 -0500 |
| commit | c3a9392e4f3b9d97803b067871d66bc143369dbf (patch) | |
| tree | 1558190c7a9c0325f5be90f4b9dd375cd74e5b51 /drivers/net | |
| parent | r8169: perform a PHY reset before any other operation at boot time (diff) | |
| download | linux-dev-c3a9392e4f3b9d97803b067871d66bc143369dbf.tar.xz linux-dev-c3a9392e4f3b9d97803b067871d66bc143369dbf.zip | |
[PATCH] kmemdup() cleanup in drivers/net
hi,
replace open coded kmemdup() to save some screen space,
and allow inlining/not inlining to be triggered by gcc.
Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/tulip/de2104x.c | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/ipw2100.c | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c index f6b3a94e97bf..9d67f11422ec 100644 --- a/drivers/net/tulip/de2104x.c +++ b/drivers/net/tulip/de2104x.c @@ -1906,9 +1906,7 @@ fill_defaults: de->media[i].csr15 = t21041_csr15[i]; } - de->ee_data = kmalloc(DE_EEPROM_SIZE, GFP_KERNEL); - if (de->ee_data) - memcpy(de->ee_data, &ee_data[0], DE_EEPROM_SIZE); + de->ee_data = kmemdup(&ee_data[0], DE_EEPROM_SIZE, GFP_KERNEL); return; diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c index 4e4eaa2a99ca..5bf4d4119c3d 100644 --- a/drivers/net/wireless/ipw2100.c +++ b/drivers/net/wireless/ipw2100.c @@ -7568,11 +7568,10 @@ static int ipw2100_wx_set_genie(struct net_device *dev, return -EINVAL; if (wrqu->data.length) { - buf = kmalloc(wrqu->data.length, GFP_KERNEL); + buf = kmemdup(extra, wrqu->data.length, GFP_KERNEL); if (buf == NULL) return -ENOMEM; - memcpy(buf, extra, wrqu->data.length); kfree(ieee->wpa_ie); ieee->wpa_ie = buf; ieee->wpa_ie_len = wrqu->data.length; |