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
/
atarilance.c
diff --git
a/drivers/net/atarilance.c
b/drivers/net/atarilance.c
index
91783a8
..
e01b6a7
100644
(file)
--- a/
drivers/net/atarilance.c
+++ b/
drivers/net/atarilance.c
@@
-78,7
+78,7
@@
static int lance_debug = LANCE_DEBUG;
#else
static int lance_debug = 1;
#endif
#else
static int lance_debug = 1;
#endif
-
module_param(lance_debug, int, 0
);
+
MODULE_PARM(lance_debug, "i"
);
MODULE_PARM_DESC(lance_debug, "atarilance debug level (0-3)");
MODULE_LICENSE("GPL");
MODULE_PARM_DESC(lance_debug, "atarilance debug level (0-3)");
MODULE_LICENSE("GPL");
@@
-804,7
+804,8
@@
static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev )
++len;
if (len > skb->len) {
++len;
if (len > skb->len) {
- if (skb_padto(skb, len))
+ skb = skb_padto(skb, len);
+ if (skb == NULL)
return 0;
}
return 0;
}