The following commit has been merged in the linux branch: commit 845de8afa66550331dca164ab77fa49de930b699 Author: Joyce Yu joyce.yu@sun.com Date: Wed Oct 21 17:21:10 2009 -0700

niu: VLAN_ETH_HLEN should be used to make sure that the whole MAC header was copied to the head buffer in the Vlan packets case

Signed-off-by: Joyce Yu joyce.yu@sun.com Signed-off-by: David S. Miller davem@davemloft.net

diff --git a/drivers/net/niu.c b/drivers/net/niu.c index f9364d0..d6c7ac6 100644 --- 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;