backfire: generic: rtl8366: use common rtl8366_mib_counter structure (backport of...

SVN-Revision: 22028

diff --git a/target/linux/generic-2.6/files/drivers/net/phy/rtl8366_smi.h b/target/linux/generic-2.6/files/drivers/net/phy/rtl8366_smi.h
index 32388759662f2ddb90328a021bd011a8c1615dae..f1701a54a4aa331363cff555a8168f72810ee43a 100644 (file)
--- a/target/linux/generic-2.6/files/drivers/net/phy/rtl8366_smi.h
+++ b/target/linux/generic-2.6/files/drivers/net/phy/rtl8366_smi.h
@@ -20,6 +20,13 @@ struct dentry;
 struct inode;
 struct file;
 
+struct rtl8366_mib_counter {
+       unsigned        base;
+       unsigned        offset;
+       unsigned        length;
+       const char      *name;
+};
+
 struct rtl8366_smi {
        struct device           *parent;
        unsigned int            gpio_sda;

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 70063d48675897c00f61f4b8d34b5222743fbfdf..495be8e7d1753f9db3a83f5d9cbdcc2939d3a9e2 100644 (file)
--- a/target/linux/generic-2.6/files/drivers/net/phy/rtl8366rb.c
+++ b/target/linux/generic-2.6/files/drivers/net/phy/rtl8366rb.c
@@ -187,46 +187,40 @@ struct rtl8366rb_vlan_4k {
        u16     fid:3;
 };
 
-struct mib_counter {
-       unsigned        offset;
-       unsigned        length;
-       const char      *name;
-};
-
-static struct mib_counter rtl8366rb_mib_counters[RTL8366RB_MIB_COUNT] = {
-       {  0, 4, "IfInOctets"                           },
-       {  4, 4, "EtherStatsOctets"                     },
-       {  8, 2, "EtherStatsUnderSizePkts"              },
-       { 10, 2, "EtherFragments"                       },
-       { 12, 2, "EtherStatsPkts64Octets"               },
-       { 14, 2, "EtherStatsPkts65to127Octets"          },
-       { 16, 2, "EtherStatsPkts128to255Octets"         },
-       { 18, 2, "EtherStatsPkts256to511Octets"         },
-       { 20, 2, "EtherStatsPkts512to1023Octets"        },
-       { 22, 2, "EtherStatsPkts1024to1518Octets"       },
-       { 24, 2, "EtherOversizeStats"                   },
-       { 26, 2, "EtherStatsJabbers"                    },
-       { 28, 2, "IfInUcastPkts"                        },
-       { 30, 2, "EtherStatsMulticastPkts"              },
-       { 32, 2, "EtherStatsBroadcastPkts"              },
-       { 34, 2, "EtherStatsDropEvents"                 },
-       { 36, 2, "Dot3StatsFCSErrors"                   },
-       { 38, 2, "Dot3StatsSymbolErrors"                },
-       { 40, 2, "Dot3InPauseFrames"                    },
-       { 42, 2, "Dot3ControlInUnknownOpcodes"          },
-       { 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 struct rtl8366_mib_counter rtl8366rb_mib_counters[] = {
+       { 0,  0, 4, "IfInOctets"                                },
+       { 0,  4, 4, "EtherStatsOctets"                          },
+       { 0,  8, 2, "EtherStatsUnderSizePkts"                   },
+       { 0, 10, 2, "EtherFragments"                            },
+       { 0, 12, 2, "EtherStatsPkts64Octets"                    },
+       { 0, 14, 2, "EtherStatsPkts65to127Octets"               },
+       { 0, 16, 2, "EtherStatsPkts128to255Octets"              },
+       { 0, 18, 2, "EtherStatsPkts256to511Octets"              },
+       { 0, 20, 2, "EtherStatsPkts512to1023Octets"             },
+       { 0, 22, 2, "EtherStatsPkts1024to1518Octets"            },
+       { 0, 24, 2, "EtherOversizeStats"                        },
+       { 0, 26, 2, "EtherStatsJabbers"                         },
+       { 0, 28, 2, "IfInUcastPkts"                             },
+       { 0, 30, 2, "EtherStatsMulticastPkts"                   },
+       { 0, 32, 2, "EtherStatsBroadcastPkts"                   },
+       { 0, 34, 2, "EtherStatsDropEvents"                      },
+       { 0, 36, 2, "Dot3StatsFCSErrors"                        },
+       { 0, 38, 2, "Dot3StatsSymbolErrors"                     },
+       { 0, 40, 2, "Dot3InPauseFrames"                         },
+       { 0, 42, 2, "Dot3ControlInUnknownOpcodes"               },
+       { 0, 44, 4, "IfOutOctets"                               },
+       { 0, 48, 2, "Dot3StatsSingleCollisionFrames"            },
+       { 0, 50, 2, "Dot3StatMultipleCollisionFrames"           },
+       { 0, 52, 2, "Dot3sDeferredTransmissions"                },
+       { 0, 54, 2, "Dot3StatsLateCollisions"                   },
+       { 0, 56, 2, "EtherStatsCollisions"                      },
+       { 0, 58, 2, "Dot3StatsExcessiveCollisions"              },
+       { 0, 60, 2, "Dot3OutPauseFrames"                        },
+       { 0, 62, 2, "Dot1dBasePortDelayExceededDiscards"        },
+       { 0, 64, 2, "Dot1dTpPortInDiscards"                     },
+       { 0, 66, 2, "IfOutUcastPkts"                            },
+       { 0, 68, 2, "IfOutMulticastPkts"                        },
+       { 0, 70, 2, "IfOutBroadcastPkts"                        },
 };
 
 #define REG_WR(_smi, _reg, _val)                                       \

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 df6fe2909e618edab77af513bf004e67b77b016d..ed20b4fbe3908f1a2ec81f4f407cf213dec73e19 100644 (file)
--- a/target/linux/generic-2.6/files/drivers/net/phy/rtl8366s.c
+++ b/target/linux/generic-2.6/files/drivers/net/phy/rtl8366s.c
@@ -193,14 +193,7 @@ struct rtl8366s_vlan_4k {
        u16     member:6;
 };
 
-struct mib_counter {
-       unsigned        base;
-       unsigned        offset;
-       unsigned        length;
-       const char      *name;
-};
-
-static struct mib_counter rtl8366s_mib_counters[RTL8366S_MIB_COUNT] = {
+static struct rtl8366_mib_counter rtl8366s_mib_counters[] = {
        { 0,  0, 4, "IfInOctets"                                },
        { 0,  4, 4, "EtherStatsOctets"                          },
        { 0,  8, 2, "EtherStatsUnderSizePkts"                   },