From ac10fe233eda76c5a4fdb9bf4bfd300e7080237a Mon Sep 17 00:00:00 2001 From: juhosg Date: Sat, 26 Jun 2010 19:52:24 +0000 Subject: [PATCH] backfire: generic: rtl8366: fix register offset and size of MIB counters (backport of r29107) git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21926 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../files/drivers/net/phy/rtl8366rb.c | 26 +++++++++---------- .../files/drivers/net/phy/rtl8366s.c | 26 +++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/target/linux/generic-2.6/files/drivers/net/phy/rtl8366rb.c b/target/linux/generic-2.6/files/drivers/net/phy/rtl8366rb.c index dcc4d6c92..98c5a0ba8 100644 --- a/target/linux/generic-2.6/files/drivers/net/phy/rtl8366rb.c +++ b/target/linux/generic-2.6/files/drivers/net/phy/rtl8366rb.c @@ -210,19 +210,19 @@ static struct mib_counter rtl8366rb_mib_counters[RTL8366S_MIB_COUNT] = { { 38, 2, "Dot3StatsSymbolErrors " }, { 40, 2, "Dot3InPauseFrames " }, { 42, 2, "Dot3ControlInUnknownOpcodes " }, - { 44, 2, "IfOutOctets " }, - { 46, 2, "Dot3StatsSingleCollisionFrames " }, - { 48, 2, "Dot3StatMultipleCollisionFrames " }, - { 50, 2, "Dot3sDeferredTransmissions " }, - { 52, 2, "Dot3StatsLateCollisions " }, - { 54, 2, "EtherStatsCollisions " }, - { 56, 2, "Dot3StatsExcessiveCollisions " }, - { 58, 2, "Dot3OutPauseFrames " }, - { 60, 2, "Dot1dBasePortDelayExceededDiscards" }, - { 62, 2, "Dot1dTpPortInDiscards " }, - { 64, 2, "IfOutUcastPkts " }, - { 66, 2, "IfOutMulticastPkts " }, - { 68, 2, "IfOutBroadcastPkts " }, + { 44, 4, "IfOutOctets " }, + { 48, 2, "Dot3StatsSingleCollisionFrames " }, + { 50, 2, "Dot3StatMultipleCollisionFrames " }, + { 52, 2, "Dot3sDeferredTransmissions " }, + { 54, 2, "Dot3StatsLateCollisions " }, + { 56, 2, "EtherStatsCollisions " }, + { 58, 2, "Dot3StatsExcessiveCollisions " }, + { 60, 2, "Dot3OutPauseFrames " }, + { 62, 2, "Dot1dBasePortDelayExceededDiscards" }, + { 64, 2, "Dot1dTpPortInDiscards " }, + { 66, 2, "IfOutUcastPkts " }, + { 68, 2, "IfOutMulticastPkts " }, + { 70, 2, "IfOutBroadcastPkts " }, }; static inline struct rtl8366rb *sw_to_rtl8366rb(struct switch_dev *sw) diff --git a/target/linux/generic-2.6/files/drivers/net/phy/rtl8366s.c b/target/linux/generic-2.6/files/drivers/net/phy/rtl8366s.c index c8e7dd60b..26d5c7880 100644 --- a/target/linux/generic-2.6/files/drivers/net/phy/rtl8366s.c +++ b/target/linux/generic-2.6/files/drivers/net/phy/rtl8366s.c @@ -210,19 +210,19 @@ static struct mib_counter rtl8366s_mib_counters[RTL8366S_MIB_COUNT] = { { 38, 2, "Dot3StatsSymbolErrors " }, { 40, 2, "Dot3InPauseFrames " }, { 42, 2, "Dot3ControlInUnknownOpcodes " }, - { 44, 2, "IfOutOctets " }, - { 46, 2, "Dot3StatsSingleCollisionFrames " }, - { 48, 2, "Dot3StatMultipleCollisionFrames " }, - { 50, 2, "Dot3sDeferredTransmissions " }, - { 52, 2, "Dot3StatsLateCollisions " }, - { 54, 2, "EtherStatsCollisions " }, - { 56, 2, "Dot3StatsExcessiveCollisions " }, - { 58, 2, "Dot3OutPauseFrames " }, - { 60, 2, "Dot1dBasePortDelayExceededDiscards" }, - { 62, 2, "Dot1dTpPortInDiscards " }, - { 64, 2, "IfOutUcastPkts " }, - { 66, 2, "IfOutMulticastPkts " }, - { 68, 2, "IfOutBroadcastPkts " }, + { 44, 4, "IfOutOctets " }, + { 48, 2, "Dot3StatsSingleCollisionFrames " }, + { 50, 2, "Dot3StatMultipleCollisionFrames " }, + { 52, 2, "Dot3sDeferredTransmissions " }, + { 54, 2, "Dot3StatsLateCollisions " }, + { 56, 2, "EtherStatsCollisions " }, + { 58, 2, "Dot3StatsExcessiveCollisions " }, + { 60, 2, "Dot3OutPauseFrames " }, + { 62, 2, "Dot1dBasePortDelayExceededDiscards" }, + { 64, 2, "Dot1dTpPortInDiscards " }, + { 66, 2, "IfOutUcastPkts " }, + { 68, 2, "IfOutMulticastPkts " }, + { 70, 2, "IfOutBroadcastPkts " }, }; static inline struct rtl8366s *sw_to_rtl8366s(struct switch_dev *sw) -- 2.35.1