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
/
niu.c
diff --git
a/drivers/net/niu.c
b/drivers/net/niu.c
index
f9364d0
..
d6c7ac6
100644
(file)
--- a/
drivers/net/niu.c
+++ b/
drivers/net/niu.c
@@
-3545,7
+3545,7
@@
static int niu_process_rx_pkt(struct napi_struct *napi, struct niu *np,
rp->rcr_index = index;
skb_reserve(skb, NET_IP_ALIGN);
- __pskb_pull_tail(skb, min(len,
NIU_RXPULL_MAX
));
+ __pskb_pull_tail(skb, min(len,
VLAN_ETH_HLEN
));
rp->rx_packets++;
rp->rx_bytes += skb->len;