From 0728aed30446ef64730594345f0c6898aeda9da2 Mon Sep 17 00:00:00 2001
From: Joyce Yu <joyce.yu@sun.com>
Date: Wed, 21 Oct 2009 17:21:10 -0700
Subject: [PATCH] --- yaml --- r: 167712 b: refs/heads/master c:
 845de8afa66550331dca164ab77fa49de930b699 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/niu.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index abd7f0fcb62d..faf2e0c5cdae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6a71bfa00eb110c8a2e38f85572ed361f8bf3a5
+refs/heads/master: 845de8afa66550331dca164ab77fa49de930b699
diff --git a/trunk/drivers/net/niu.c b/trunk/drivers/net/niu.c
index f9364d0678f2..d6c7ac68f6ea 100644
--- a/trunk/drivers/net/niu.c
+++ b/trunk/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;