git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
net
/
declance.c
diff --git
a/drivers/net/declance.c
b/drivers/net/declance.c
index
6ad5796
..
f130bda
100644
(file)
--- a/
drivers/net/declance.c
+++ b/
drivers/net/declance.c
@@
-42,6
+42,7
@@
* bits. macro
*/
* bits. macro
*/
+#include <linux/config.h>
#include <linux/crc32.h>
#include <linux/delay.h>
#include <linux/errno.h>
#include <linux/crc32.h>
#include <linux/delay.h>
#include <linux/errno.h>
@@
-703,8
+704,8
@@
static irqreturn_t lance_dma_merr_int(const int irq, void *dev_id,
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}
-static irqreturn_t
lance_interrupt(const int irq, void *dev_id,
-
struct pt_regs *regs)
+static irqreturn_t
+
lance_interrupt(const int irq, void *dev_id,
struct pt_regs *regs)
{
struct net_device *dev = (struct net_device *) dev_id;
struct lance_private *lp = netdev_priv(dev);
{
struct net_device *dev = (struct net_device *) dev_id;
struct lance_private *lp = netdev_priv(dev);
@@
-884,7
+885,8
@@
static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev)
len = skblen;
if (len < ETH_ZLEN) {
len = skblen;
if (len < ETH_ZLEN) {
- if (skb_padto(skb, ETH_ZLEN))
+ skb = skb_padto(skb, ETH_ZLEN);
+ if (skb == NULL)
return 0;
len = ETH_ZLEN;
}
return 0;
len = ETH_ZLEN;
}
@@
-1253,7
+1255,7
@@
static int __init dec_lance_init(const int type, const int slot)
return 0;
err_out_free_dev:
return 0;
err_out_free_dev:
-
free_netdev
(dev);
+
kfree
(dev);
err_out:
return ret;
err_out:
return ret;
@@
-1299,7
+1301,6
@@
static void __exit dec_lance_cleanup(void)
while (root_lance_dev) {
struct net_device *dev = root_lance_dev;
struct lance_private *lp = netdev_priv(dev);
while (root_lance_dev) {
struct net_device *dev = root_lance_dev;
struct lance_private *lp = netdev_priv(dev);
-
unregister_netdev(dev);
#ifdef CONFIG_TC
if (lp->slot >= 0)
unregister_netdev(dev);
#ifdef CONFIG_TC
if (lp->slot >= 0)