From patchwork Fri Oct 16 16:21:46 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joyce Yu X-Patchwork-Id: 36245 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id A07ECB7BF5 for ; Sat, 17 Oct 2009 03:21:59 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751515AbZJPQVp (ORCPT ); Fri, 16 Oct 2009 12:21:45 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751367AbZJPQVp (ORCPT ); Fri, 16 Oct 2009 12:21:45 -0400 Received: from brmea-mail-2.Sun.COM ([192.18.98.43]:41305 "EHLO brmea-mail-2.sun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751306AbZJPQVp (ORCPT ); Fri, 16 Oct 2009 12:21:45 -0400 Received: from fe-amer-09.sun.com ([192.18.109.79]) by brmea-mail-2.sun.com (8.13.6+Sun/8.12.9) with ESMTP id n9GGLn40025038 for ; Fri, 16 Oct 2009 16:21:49 GMT MIME-version: 1.0 Content-type: multipart/mixed; boundary="Boundary_(ID_0BiUJJRt20xJ4sadlF+MKw)" Received: from conversion-daemon.mail-amer.sun.com by mail-amer.sun.com (Sun Java(tm) System Messaging Server 7u2-7.04 64bit (built Jul 2 2009)) id <0KRM00L007JLF700@mail-amer.sun.com> for netdev@vger.kernel.org; Fri, 16 Oct 2009 10:21:49 -0600 (MDT) Received: from [129.145.154.82] ([unknown] [129.145.154.82]) by mail-amer.sun.com (Sun Java(tm) System Messaging Server 7u2-7.04 64bit (built Jul 2 2009)) with ESMTPSA id <0KRM00K8784B8720@mail-amer.sun.com> for netdev@vger.kernel.org; Fri, 16 Oct 2009 10:21:48 -0600 (MDT) Date: Fri, 16 Oct 2009 09:21:46 -0700 From: Joyce Yu Subject: [Fwd: [PATCH] [NIU] VLAN does not work with niu driver] To: netdev@vger.kernel.org Reply-to: Joyce.Yu@Sun.COM Message-id: <4AD89D9A.7090405@Sun.COM> User-Agent: Thunderbird 2.0.0.21 (X11/20090311) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Can this patch be accepted and integrated to the main tree? Thanks, Joyce rp->rx_bytes += skb->len; -- 1.6.4 From eb878a6887fed77e6b4c69a014a2c98ea2b52736 Mon Sep 17 00:00:00 2001 From: Joyce Yu Date: Thu, 15 Oct 2009 06:49:29 -0700 Subject: [PATCH] VLAN does not work with niu driver --- drivers/net/niu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) 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; -- 1.6.4