[PATCH 1/2] sky2: Receive Overflows not counted

[PATCH 1/2] sky2: Receive Overflows not counted

[Mirko Lindner]

The sky2 driver doesn't count the Receive Overflows because the MAC 
interrupt for this event is not set in the MAC's interrupt mask.
The MAC's interrupt mask is set only for Transmit FIFO Underruns.

Fix: The correct setting should be (GM_IS_TX_FF_UR | GM_IS_RX_FF_OR)
Otherwise the Receive Overflow event will not generate any interrupt.
The  Receive Overflow interrupt is handled correctly

Signed-off-by: Mirko Lindner <mlindner@marvell.com>
---
 drivers/net/ethernet/marvell/sky2.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/marvell/sky2.h b/drivers/net/ethernet/marvell/sky2.h
index 615ac63..ec6dcd8 100644
--- a/drivers/net/ethernet/marvell/sky2.h
+++ b/drivers/net/ethernet/marvell/sky2.h
@@ -2074,7 +2074,7 @@ enum {
 	GM_IS_RX_FF_OR	= 1<<1,	/* Receive FIFO Overrun */
 	GM_IS_RX_COMPL	= 1<<0,	/* Frame Reception Complete */
 
-#define GMAC_DEF_MSK     GM_IS_TX_FF_UR
+#define GMAC_DEF_MSK     (GM_IS_TX_FF_UR | GM_IS_RX_FF_OR)
 };
 
 /*	GMAC_LINK_CTRL	16 bit	GMAC Link Control Reg (YUKON only) */
-- 
1.7.10.4

Re: [PATCH 1/2] sky2: Receive Overflows not counted

[Stephen Hemminger]

> The sky2 driver doesn't count the Receive Overflows because the MAC 
> interrupt for this event is not set in the MAC's interrupt mask.
> The MAC's interrupt mask is set only for Transmit FIFO Underruns.
> 
> Fix: The correct setting should be (GM_IS_TX_FF_UR | GM_IS_RX_FF_OR)
> Otherwise the Receive Overflow event will not generate any interrupt.
> The  Receive Overflow interrupt is handled correctly
> 
> Signed-off-by: Mirko Lindner <mlindner@marvell.com>

Both these patches are fine, but the patch format seems corrupted since
they won't directly apply with quilt.

Acked-by: Stephen Hemminger <stephen@networkplumber.org>

Re: [PATCH 1/2] sky2: Receive Overflows not counted

[David Miller]

From: Stephen Hemminger <stephen@networkplumber.org>
Date: Thu, 28 Mar 2013 14:40:20 -0700

>> The sky2 driver doesn't count the Receive Overflows because the MAC 
>> interrupt for this event is not set in the MAC's interrupt mask.
>> The MAC's interrupt mask is set only for Transmit FIFO Underruns.
>> 
>> Fix: The correct setting should be (GM_IS_TX_FF_UR | GM_IS_RX_FF_OR)
>> Otherwise the Receive Overflow event will not generate any interrupt.
>> The  Receive Overflow interrupt is handled correctly
>> 
>> Signed-off-by: Mirko Lindner <mlindner@marvell.com>
> 
> Both these patches are fine, but the patch format seems corrupted since
> they won't directly apply with quilt.
> 
> Acked-by: Stephen Hemminger <stephen@networkplumber.org>

They apply cleanly to the 'net' tree just fine, I don't know why
it didn't work for you.