git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
net
/
ks8842.c
diff --git
a/drivers/net/ks8842.c
b/drivers/net/ks8842.c
index
4d40626
..
fc12ac0
100644
(file)
--- a/
drivers/net/ks8842.c
+++ b/
drivers/net/ks8842.c
@@
-661,7
+661,7
@@
static void ks8842_rx_frame(struct net_device *netdev,
/* check the status */
if ((status & RXSR_VALID) && !(status & RXSR_ERROR)) {
- struct sk_buff *skb = netdev_alloc_skb_ip_align(netdev, len);
+ struct sk_buff *skb = netdev_alloc_skb_ip_align(netdev, len
+ 3
);
if (skb) {