[Fwd: [PATCH] [NIU] VLAN does not work with niu driver]

[Fwd: [PATCH] [NIU] VLAN does not work with niu driver]

[Joyce Yu]

[-- Attachment #1: Type: text/plain, Size: 839 bytes --]


Can this patch be accepted and integrated to the main tree?

Thanks,
Joyce


=============================

 From eb878a6887fed77e6b4c69a014a2c98ea2b52736 Mon Sep 17 00:00:00 2001
From: Joyce Yu <joyce.yu@sun.com>
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

[-- Attachment #2: 0001-VLAN-does-not-work-with-niu-driver.patch --]
[-- Type: text/x-patch, Size: 728 bytes --]

>From eb878a6887fed77e6b4c69a014a2c98ea2b52736 Mon Sep 17 00:00:00 2001
From: Joyce Yu <joyce.yu@sun.com>
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

Re: [Fwd: [PATCH] [NIU] VLAN does not work with niu driver]

[David Miller]

From: Joyce Yu <Joyce.Yu@Sun.COM>
Date: Fri, 16 Oct 2009 09:21:46 -0700

> 
> Can this patch be accepted and integrated to the main tree?

Well, what happened to all of those page fragment modifications?

They all of a sudden are no longer necessary?  Why?

I'm not going to apply this patch until you start explaining
why these things are being done, or not done.  And you must
add some more text to your commit messages so that you explain
your change sufficiently.

Thank you.

Re: [Fwd: [PATCH] [NIU] VLAN does not work with niu driver]

[Joyce Yu]

Here was what happened to this patch:

I got system hard hung a couple of times when testing the niu driver 
with "__pskb_pull_tail(skb, min(len, VLAN_ETH_HLEN))" fix. I thought 
that the fix was not working at the time, so I came up with the fixes 
moving around the pointers. I didn't see the hard hung with that code. 
When you asked me to explain the fix, I had the second thought to 
re-test the "__pskb_pull_tail(skb, min(len, VLAN_ETH_HLEN))" fix. I 
didn't experience any hard hung any more. I also asked our QA to test it 
and didn't find any problem. I guess the hard hung may due to 
rmmod/insmod, ifconfig up/down using different fixes so many times and 
that may cause memory corruptions.

Regards,
Joyce


On 10/16/09 05:40 PM, David Miller wrote:
> From: Joyce Yu <Joyce.Yu@Sun.COM>
> Date: Fri, 16 Oct 2009 09:21:46 -0700
> 
>> Can this patch be accepted and integrated to the main tree?
> 
> Well, what happened to all of those page fragment modifications?
> 
> They all of a sudden are no longer necessary?  Why?
> 
> I'm not going to apply this patch until you start explaining
> why these things are being done, or not done.  And you must
> add some more text to your commit messages so that you explain
> your change sufficiently.
> 
> Thank you.
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html


--