Vlad, The patch below fixes broken chelsio backports for ofed-1.3.
Please pull from: git://git.openfabrics.org/~swise/ofed-1.3 ofed_kernel Thanks, Steve. --------- From: Steve Wise <[EMAIL PROTECTED]> cxgb3: backports remove 'ethtool -S' support. I mistakenly removed the get_stats_count ethtool op for cxgb3. The real backport is to change its signature... Signed-off-by: Steve Wise <[EMAIL PROTECTED]> --- .../backport/2.6.12/cxgb3_0200_sset.patch | 17 +++++++++-------- .../backport/2.6.13/cxgb3_0200_sset.patch | 17 +++++++++-------- .../backport/2.6.14/cxgb3_0200_sset.patch | 17 +++++++++-------- .../backport/2.6.15/cxgb3_0200_sset.patch | 17 +++++++++-------- .../2.6.15_ubuntu606/cxgb3_0200_sset.patch | 17 +++++++++-------- .../backport/2.6.16/cxgb3_0200_sset.patch | 17 +++++++++-------- .../backport/2.6.16_sles10/cxgb3_0200_sset.patch | 17 +++++++++-------- .../2.6.16_sles10_sp1/cxgb3_0200_sset.patch | 17 +++++++++-------- .../backport/2.6.17/cxgb3_0200_sset.patch | 17 +++++++++-------- .../backport/2.6.18-EL5.1/cxgb3_0200_sset.patch | 17 +++++++++-------- .../backport/2.6.18/cxgb3_0200_sset.patch | 17 +++++++++-------- .../backport/2.6.18_FC6/cxgb3_0200_sset.patch | 17 +++++++++-------- .../backport/2.6.19/cxgb3_0200_sset.patch | 17 +++++++++-------- .../backport/2.6.20/cxgb3_0200_sset.patch | 17 +++++++++-------- .../backport/2.6.21/cxgb3_0200_sset.patch | 17 +++++++++-------- .../backport/2.6.22/cxgb3_0200_sset.patch | 17 +++++++++-------- .../backport/2.6.23/cxgb3_0200_sset.patch | 17 +++++++++-------- .../backport/2.6.9_U4/cxgb3_0200_sset.patch | 17 +++++++++-------- .../backport/2.6.9_U5/cxgb3_0200_sset.patch | 17 +++++++++-------- 19 files changed, 171 insertions(+), 152 deletions(-) diff --git a/kernel_patches/backport/2.6.12/cxgb3_0200_sset.patch b/kernel_patches/backport/2.6.12/cxgb3_0200_sset.patch index e331411..dde776e 100644 --- a/kernel_patches/backport/2.6.12/cxgb3_0200_sset.patch +++ b/kernel_patches/backport/2.6.12/cxgb3_0200_sset.patch @@ -1,29 +1,30 @@ diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c -index 61ffc92..676df2f 100644 +index 61ffc92..57ffa8e 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c -@@ -1131,16 +1131,6 @@ static char stats_strings[][ETH_GSTRING_LEN] = { +@@ -1131,14 +1131,9 @@ static char stats_strings[][ETH_GSTRING_LEN] = { }; -static int get_sset_count(struct net_device *dev, int sset) --{ ++static int get_stats_count(struct net_device *dev) + { - switch (sset) { - case ETH_SS_STATS: - return ARRAY_SIZE(stats_strings); - default: - return -EOPNOTSUPP; - } --} -- - #define T3_REGMAP_SIZE (3 * 1024) ++ return ARRAY_SIZE(stats_strings); + } - static int get_regs_len(struct net_device *dev) -@@ -1645,7 +1635,6 @@ static const struct ethtool_ops cxgb_ethtool_ops = { + #define T3_REGMAP_SIZE (3 * 1024) +@@ -1645,7 +1640,7 @@ static const struct ethtool_ops cxgb_ethtool_ops = { .get_strings = get_strings, .phys_id = cxgb3_phys_id, .nway_reset = restart_autoneg, - .get_sset_count = get_sset_count, ++ .get_stats_count = get_stats_count, .get_ethtool_stats = get_stats, .get_regs_len = get_regs_len, .get_regs = get_regs, diff --git a/kernel_patches/backport/2.6.13/cxgb3_0200_sset.patch b/kernel_patches/backport/2.6.13/cxgb3_0200_sset.patch index e331411..dde776e 100644 --- a/kernel_patches/backport/2.6.13/cxgb3_0200_sset.patch +++ b/kernel_patches/backport/2.6.13/cxgb3_0200_sset.patch @@ -1,29 +1,30 @@ diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c -index 61ffc92..676df2f 100644 +index 61ffc92..57ffa8e 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c -@@ -1131,16 +1131,6 @@ static char stats_strings[][ETH_GSTRING_LEN] = { +@@ -1131,14 +1131,9 @@ static char stats_strings[][ETH_GSTRING_LEN] = { }; -static int get_sset_count(struct net_device *dev, int sset) --{ ++static int get_stats_count(struct net_device *dev) + { - switch (sset) { - case ETH_SS_STATS: - return ARRAY_SIZE(stats_strings); - default: - return -EOPNOTSUPP; - } --} -- - #define T3_REGMAP_SIZE (3 * 1024) ++ return ARRAY_SIZE(stats_strings); + } - static int get_regs_len(struct net_device *dev) -@@ -1645,7 +1635,6 @@ static const struct ethtool_ops cxgb_ethtool_ops = { + #define T3_REGMAP_SIZE (3 * 1024) +@@ -1645,7 +1640,7 @@ static const struct ethtool_ops cxgb_ethtool_ops = { .get_strings = get_strings, .phys_id = cxgb3_phys_id, .nway_reset = restart_autoneg, - .get_sset_count = get_sset_count, ++ .get_stats_count = get_stats_count, .get_ethtool_stats = get_stats, .get_regs_len = get_regs_len, .get_regs = get_regs, diff --git a/kernel_patches/backport/2.6.14/cxgb3_0200_sset.patch b/kernel_patches/backport/2.6.14/cxgb3_0200_sset.patch index e331411..dde776e 100644 --- a/kernel_patches/backport/2.6.14/cxgb3_0200_sset.patch +++ b/kernel_patches/backport/2.6.14/cxgb3_0200_sset.patch @@ -1,29 +1,30 @@ diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c -index 61ffc92..676df2f 100644 +index 61ffc92..57ffa8e 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c -@@ -1131,16 +1131,6 @@ static char stats_strings[][ETH_GSTRING_LEN] = { +@@ -1131,14 +1131,9 @@ static char stats_strings[][ETH_GSTRING_LEN] = { }; -static int get_sset_count(struct net_device *dev, int sset) --{ ++static int get_stats_count(struct net_device *dev) + { - switch (sset) { - case ETH_SS_STATS: - return ARRAY_SIZE(stats_strings); - default: - return -EOPNOTSUPP; - } --} -- - #define T3_REGMAP_SIZE (3 * 1024) ++ return ARRAY_SIZE(stats_strings); + } - static int get_regs_len(struct net_device *dev) -@@ -1645,7 +1635,6 @@ static const struct ethtool_ops cxgb_ethtool_ops = { + #define T3_REGMAP_SIZE (3 * 1024) +@@ -1645,7 +1640,7 @@ static const struct ethtool_ops cxgb_ethtool_ops = { .get_strings = get_strings, .phys_id = cxgb3_phys_id, .nway_reset = restart_autoneg, - .get_sset_count = get_sset_count, ++ .get_stats_count = get_stats_count, .get_ethtool_stats = get_stats, .get_regs_len = get_regs_len, .get_regs = get_regs, diff --git a/kernel_patches/backport/2.6.15/cxgb3_0200_sset.patch b/kernel_patches/backport/2.6.15/cxgb3_0200_sset.patch index e331411..dde776e 100644 --- a/kernel_patches/backport/2.6.15/cxgb3_0200_sset.patch +++ b/kernel_patches/backport/2.6.15/cxgb3_0200_sset.patch @@ -1,29 +1,30 @@ diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c -index 61ffc92..676df2f 100644 +index 61ffc92..57ffa8e 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c -@@ -1131,16 +1131,6 @@ static char stats_strings[][ETH_GSTRING_LEN] = { +@@ -1131,14 +1131,9 @@ static char stats_strings[][ETH_GSTRING_LEN] = { }; -static int get_sset_count(struct net_device *dev, int sset) --{ ++static int get_stats_count(struct net_device *dev) + { - switch (sset) { - case ETH_SS_STATS: - return ARRAY_SIZE(stats_strings); - default: - return -EOPNOTSUPP; - } --} -- - #define T3_REGMAP_SIZE (3 * 1024) ++ return ARRAY_SIZE(stats_strings); + } - static int get_regs_len(struct net_device *dev) -@@ -1645,7 +1635,6 @@ static const struct ethtool_ops cxgb_ethtool_ops = { + #define T3_REGMAP_SIZE (3 * 1024) +@@ -1645,7 +1640,7 @@ static const struct ethtool_ops cxgb_ethtool_ops = { .get_strings = get_strings, .phys_id = cxgb3_phys_id, .nway_reset = restart_autoneg, - .get_sset_count = get_sset_count, ++ .get_stats_count = get_stats_count, .get_ethtool_stats = get_stats, .get_regs_len = get_regs_len, .get_regs = get_regs, diff --git a/kernel_patches/backport/2.6.15_ubuntu606/cxgb3_0200_sset.patch b/kernel_patches/backport/2.6.15_ubuntu606/cxgb3_0200_sset.patch index e331411..dde776e 100644 --- a/kernel_patches/backport/2.6.15_ubuntu606/cxgb3_0200_sset.patch +++ b/kernel_patches/backport/2.6.15_ubuntu606/cxgb3_0200_sset.patch @@ -1,29 +1,30 @@ diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c -index 61ffc92..676df2f 100644 +index 61ffc92..57ffa8e 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c -@@ -1131,16 +1131,6 @@ static char stats_strings[][ETH_GSTRING_LEN] = { +@@ -1131,14 +1131,9 @@ static char stats_strings[][ETH_GSTRING_LEN] = { }; -static int get_sset_count(struct net_device *dev, int sset) --{ ++static int get_stats_count(struct net_device *dev) + { - switch (sset) { - case ETH_SS_STATS: - return ARRAY_SIZE(stats_strings); - default: - return -EOPNOTSUPP; - } --} -- - #define T3_REGMAP_SIZE (3 * 1024) ++ return ARRAY_SIZE(stats_strings); + } - static int get_regs_len(struct net_device *dev) -@@ -1645,7 +1635,6 @@ static const struct ethtool_ops cxgb_ethtool_ops = { + #define T3_REGMAP_SIZE (3 * 1024) +@@ -1645,7 +1640,7 @@ static const struct ethtool_ops cxgb_ethtool_ops = { .get_strings = get_strings, .phys_id = cxgb3_phys_id, .nway_reset = restart_autoneg, - .get_sset_count = get_sset_count, ++ .get_stats_count = get_stats_count, .get_ethtool_stats = get_stats, .get_regs_len = get_regs_len, .get_regs = get_regs, diff --git a/kernel_patches/backport/2.6.16/cxgb3_0200_sset.patch b/kernel_patches/backport/2.6.16/cxgb3_0200_sset.patch index e331411..dde776e 100644 --- a/kernel_patches/backport/2.6.16/cxgb3_0200_sset.patch +++ b/kernel_patches/backport/2.6.16/cxgb3_0200_sset.patch @@ -1,29 +1,30 @@ diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c -index 61ffc92..676df2f 100644 +index 61ffc92..57ffa8e 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c -@@ -1131,16 +1131,6 @@ static char stats_strings[][ETH_GSTRING_LEN] = { +@@ -1131,14 +1131,9 @@ static char stats_strings[][ETH_GSTRING_LEN] = { }; -static int get_sset_count(struct net_device *dev, int sset) --{ ++static int get_stats_count(struct net_device *dev) + { - switch (sset) { - case ETH_SS_STATS: - return ARRAY_SIZE(stats_strings); - default: - return -EOPNOTSUPP; - } --} -- - #define T3_REGMAP_SIZE (3 * 1024) ++ return ARRAY_SIZE(stats_strings); + } - static int get_regs_len(struct net_device *dev) -@@ -1645,7 +1635,6 @@ static const struct ethtool_ops cxgb_ethtool_ops = { + #define T3_REGMAP_SIZE (3 * 1024) +@@ -1645,7 +1640,7 @@ static const struct ethtool_ops cxgb_ethtool_ops = { .get_strings = get_strings, .phys_id = cxgb3_phys_id, .nway_reset = restart_autoneg, - .get_sset_count = get_sset_count, ++ .get_stats_count = get_stats_count, .get_ethtool_stats = get_stats, .get_regs_len = get_regs_len, .get_regs = get_regs, diff --git a/kernel_patches/backport/2.6.16_sles10/cxgb3_0200_sset.patch b/kernel_patches/backport/2.6.16_sles10/cxgb3_0200_sset.patch index e331411..dde776e 100644 --- a/kernel_patches/backport/2.6.16_sles10/cxgb3_0200_sset.patch +++ b/kernel_patches/backport/2.6.16_sles10/cxgb3_0200_sset.patch @@ -1,29 +1,30 @@ diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c -index 61ffc92..676df2f 100644 +index 61ffc92..57ffa8e 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c -@@ -1131,16 +1131,6 @@ static char stats_strings[][ETH_GSTRING_LEN] = { +@@ -1131,14 +1131,9 @@ static char stats_strings[][ETH_GSTRING_LEN] = { }; -static int get_sset_count(struct net_device *dev, int sset) --{ ++static int get_stats_count(struct net_device *dev) + { - switch (sset) { - case ETH_SS_STATS: - return ARRAY_SIZE(stats_strings); - default: - return -EOPNOTSUPP; - } --} -- - #define T3_REGMAP_SIZE (3 * 1024) ++ return ARRAY_SIZE(stats_strings); + } - static int get_regs_len(struct net_device *dev) -@@ -1645,7 +1635,6 @@ static const struct ethtool_ops cxgb_ethtool_ops = { + #define T3_REGMAP_SIZE (3 * 1024) +@@ -1645,7 +1640,7 @@ static const struct ethtool_ops cxgb_ethtool_ops = { .get_strings = get_strings, .phys_id = cxgb3_phys_id, .nway_reset = restart_autoneg, - .get_sset_count = get_sset_count, ++ .get_stats_count = get_stats_count, .get_ethtool_stats = get_stats, .get_regs_len = get_regs_len, .get_regs = get_regs, diff --git a/kernel_patches/backport/2.6.16_sles10_sp1/cxgb3_0200_sset.patch b/kernel_patches/backport/2.6.16_sles10_sp1/cxgb3_0200_sset.patch index e331411..dde776e 100644 --- a/kernel_patches/backport/2.6.16_sles10_sp1/cxgb3_0200_sset.patch +++ b/kernel_patches/backport/2.6.16_sles10_sp1/cxgb3_0200_sset.patch @@ -1,29 +1,30 @@ diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c -index 61ffc92..676df2f 100644 +index 61ffc92..57ffa8e 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c -@@ -1131,16 +1131,6 @@ static char stats_strings[][ETH_GSTRING_LEN] = { +@@ -1131,14 +1131,9 @@ static char stats_strings[][ETH_GSTRING_LEN] = { }; -static int get_sset_count(struct net_device *dev, int sset) --{ ++static int get_stats_count(struct net_device *dev) + { - switch (sset) { - case ETH_SS_STATS: - return ARRAY_SIZE(stats_strings); - default: - return -EOPNOTSUPP; - } --} -- - #define T3_REGMAP_SIZE (3 * 1024) ++ return ARRAY_SIZE(stats_strings); + } - static int get_regs_len(struct net_device *dev) -@@ -1645,7 +1635,6 @@ static const struct ethtool_ops cxgb_ethtool_ops = { + #define T3_REGMAP_SIZE (3 * 1024) +@@ -1645,7 +1640,7 @@ static const struct ethtool_ops cxgb_ethtool_ops = { .get_strings = get_strings, .phys_id = cxgb3_phys_id, .nway_reset = restart_autoneg, - .get_sset_count = get_sset_count, ++ .get_stats_count = get_stats_count, .get_ethtool_stats = get_stats, .get_regs_len = get_regs_len, .get_regs = get_regs, diff --git a/kernel_patches/backport/2.6.17/cxgb3_0200_sset.patch b/kernel_patches/backport/2.6.17/cxgb3_0200_sset.patch index e331411..dde776e 100644 --- a/kernel_patches/backport/2.6.17/cxgb3_0200_sset.patch +++ b/kernel_patches/backport/2.6.17/cxgb3_0200_sset.patch @@ -1,29 +1,30 @@ diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c -index 61ffc92..676df2f 100644 +index 61ffc92..57ffa8e 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c -@@ -1131,16 +1131,6 @@ static char stats_strings[][ETH_GSTRING_LEN] = { +@@ -1131,14 +1131,9 @@ static char stats_strings[][ETH_GSTRING_LEN] = { }; -static int get_sset_count(struct net_device *dev, int sset) --{ ++static int get_stats_count(struct net_device *dev) + { - switch (sset) { - case ETH_SS_STATS: - return ARRAY_SIZE(stats_strings); - default: - return -EOPNOTSUPP; - } --} -- - #define T3_REGMAP_SIZE (3 * 1024) ++ return ARRAY_SIZE(stats_strings); + } - static int get_regs_len(struct net_device *dev) -@@ -1645,7 +1635,6 @@ static const struct ethtool_ops cxgb_ethtool_ops = { + #define T3_REGMAP_SIZE (3 * 1024) +@@ -1645,7 +1640,7 @@ static const struct ethtool_ops cxgb_ethtool_ops = { .get_strings = get_strings, .phys_id = cxgb3_phys_id, .nway_reset = restart_autoneg, - .get_sset_count = get_sset_count, ++ .get_stats_count = get_stats_count, .get_ethtool_stats = get_stats, .get_regs_len = get_regs_len, .get_regs = get_regs, diff --git a/kernel_patches/backport/2.6.18-EL5.1/cxgb3_0200_sset.patch b/kernel_patches/backport/2.6.18-EL5.1/cxgb3_0200_sset.patch index e331411..dde776e 100644 --- a/kernel_patches/backport/2.6.18-EL5.1/cxgb3_0200_sset.patch +++ b/kernel_patches/backport/2.6.18-EL5.1/cxgb3_0200_sset.patch @@ -1,29 +1,30 @@ diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c -index 61ffc92..676df2f 100644 +index 61ffc92..57ffa8e 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c -@@ -1131,16 +1131,6 @@ static char stats_strings[][ETH_GSTRING_LEN] = { +@@ -1131,14 +1131,9 @@ static char stats_strings[][ETH_GSTRING_LEN] = { }; -static int get_sset_count(struct net_device *dev, int sset) --{ ++static int get_stats_count(struct net_device *dev) + { - switch (sset) { - case ETH_SS_STATS: - return ARRAY_SIZE(stats_strings); - default: - return -EOPNOTSUPP; - } --} -- - #define T3_REGMAP_SIZE (3 * 1024) ++ return ARRAY_SIZE(stats_strings); + } - static int get_regs_len(struct net_device *dev) -@@ -1645,7 +1635,6 @@ static const struct ethtool_ops cxgb_ethtool_ops = { + #define T3_REGMAP_SIZE (3 * 1024) +@@ -1645,7 +1640,7 @@ static const struct ethtool_ops cxgb_ethtool_ops = { .get_strings = get_strings, .phys_id = cxgb3_phys_id, .nway_reset = restart_autoneg, - .get_sset_count = get_sset_count, ++ .get_stats_count = get_stats_count, .get_ethtool_stats = get_stats, .get_regs_len = get_regs_len, .get_regs = get_regs, diff --git a/kernel_patches/backport/2.6.18/cxgb3_0200_sset.patch b/kernel_patches/backport/2.6.18/cxgb3_0200_sset.patch index e331411..dde776e 100644 --- a/kernel_patches/backport/2.6.18/cxgb3_0200_sset.patch +++ b/kernel_patches/backport/2.6.18/cxgb3_0200_sset.patch @@ -1,29 +1,30 @@ diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c -index 61ffc92..676df2f 100644 +index 61ffc92..57ffa8e 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c -@@ -1131,16 +1131,6 @@ static char stats_strings[][ETH_GSTRING_LEN] = { +@@ -1131,14 +1131,9 @@ static char stats_strings[][ETH_GSTRING_LEN] = { }; -static int get_sset_count(struct net_device *dev, int sset) --{ ++static int get_stats_count(struct net_device *dev) + { - switch (sset) { - case ETH_SS_STATS: - return ARRAY_SIZE(stats_strings); - default: - return -EOPNOTSUPP; - } --} -- - #define T3_REGMAP_SIZE (3 * 1024) ++ return ARRAY_SIZE(stats_strings); + } - static int get_regs_len(struct net_device *dev) -@@ -1645,7 +1635,6 @@ static const struct ethtool_ops cxgb_ethtool_ops = { + #define T3_REGMAP_SIZE (3 * 1024) +@@ -1645,7 +1640,7 @@ static const struct ethtool_ops cxgb_ethtool_ops = { .get_strings = get_strings, .phys_id = cxgb3_phys_id, .nway_reset = restart_autoneg, - .get_sset_count = get_sset_count, ++ .get_stats_count = get_stats_count, .get_ethtool_stats = get_stats, .get_regs_len = get_regs_len, .get_regs = get_regs, diff --git a/kernel_patches/backport/2.6.18_FC6/cxgb3_0200_sset.patch b/kernel_patches/backport/2.6.18_FC6/cxgb3_0200_sset.patch index e331411..dde776e 100644 --- a/kernel_patches/backport/2.6.18_FC6/cxgb3_0200_sset.patch +++ b/kernel_patches/backport/2.6.18_FC6/cxgb3_0200_sset.patch @@ -1,29 +1,30 @@ diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c -index 61ffc92..676df2f 100644 +index 61ffc92..57ffa8e 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c -@@ -1131,16 +1131,6 @@ static char stats_strings[][ETH_GSTRING_LEN] = { +@@ -1131,14 +1131,9 @@ static char stats_strings[][ETH_GSTRING_LEN] = { }; -static int get_sset_count(struct net_device *dev, int sset) --{ ++static int get_stats_count(struct net_device *dev) + { - switch (sset) { - case ETH_SS_STATS: - return ARRAY_SIZE(stats_strings); - default: - return -EOPNOTSUPP; - } --} -- - #define T3_REGMAP_SIZE (3 * 1024) ++ return ARRAY_SIZE(stats_strings); + } - static int get_regs_len(struct net_device *dev) -@@ -1645,7 +1635,6 @@ static const struct ethtool_ops cxgb_ethtool_ops = { + #define T3_REGMAP_SIZE (3 * 1024) +@@ -1645,7 +1640,7 @@ static const struct ethtool_ops cxgb_ethtool_ops = { .get_strings = get_strings, .phys_id = cxgb3_phys_id, .nway_reset = restart_autoneg, - .get_sset_count = get_sset_count, ++ .get_stats_count = get_stats_count, .get_ethtool_stats = get_stats, .get_regs_len = get_regs_len, .get_regs = get_regs, diff --git a/kernel_patches/backport/2.6.19/cxgb3_0200_sset.patch b/kernel_patches/backport/2.6.19/cxgb3_0200_sset.patch index e331411..dde776e 100644 --- a/kernel_patches/backport/2.6.19/cxgb3_0200_sset.patch +++ b/kernel_patches/backport/2.6.19/cxgb3_0200_sset.patch @@ -1,29 +1,30 @@ diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c -index 61ffc92..676df2f 100644 +index 61ffc92..57ffa8e 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c -@@ -1131,16 +1131,6 @@ static char stats_strings[][ETH_GSTRING_LEN] = { +@@ -1131,14 +1131,9 @@ static char stats_strings[][ETH_GSTRING_LEN] = { }; -static int get_sset_count(struct net_device *dev, int sset) --{ ++static int get_stats_count(struct net_device *dev) + { - switch (sset) { - case ETH_SS_STATS: - return ARRAY_SIZE(stats_strings); - default: - return -EOPNOTSUPP; - } --} -- - #define T3_REGMAP_SIZE (3 * 1024) ++ return ARRAY_SIZE(stats_strings); + } - static int get_regs_len(struct net_device *dev) -@@ -1645,7 +1635,6 @@ static const struct ethtool_ops cxgb_ethtool_ops = { + #define T3_REGMAP_SIZE (3 * 1024) +@@ -1645,7 +1640,7 @@ static const struct ethtool_ops cxgb_ethtool_ops = { .get_strings = get_strings, .phys_id = cxgb3_phys_id, .nway_reset = restart_autoneg, - .get_sset_count = get_sset_count, ++ .get_stats_count = get_stats_count, .get_ethtool_stats = get_stats, .get_regs_len = get_regs_len, .get_regs = get_regs, diff --git a/kernel_patches/backport/2.6.20/cxgb3_0200_sset.patch b/kernel_patches/backport/2.6.20/cxgb3_0200_sset.patch index e331411..dde776e 100644 --- a/kernel_patches/backport/2.6.20/cxgb3_0200_sset.patch +++ b/kernel_patches/backport/2.6.20/cxgb3_0200_sset.patch @@ -1,29 +1,30 @@ diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c -index 61ffc92..676df2f 100644 +index 61ffc92..57ffa8e 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c -@@ -1131,16 +1131,6 @@ static char stats_strings[][ETH_GSTRING_LEN] = { +@@ -1131,14 +1131,9 @@ static char stats_strings[][ETH_GSTRING_LEN] = { }; -static int get_sset_count(struct net_device *dev, int sset) --{ ++static int get_stats_count(struct net_device *dev) + { - switch (sset) { - case ETH_SS_STATS: - return ARRAY_SIZE(stats_strings); - default: - return -EOPNOTSUPP; - } --} -- - #define T3_REGMAP_SIZE (3 * 1024) ++ return ARRAY_SIZE(stats_strings); + } - static int get_regs_len(struct net_device *dev) -@@ -1645,7 +1635,6 @@ static const struct ethtool_ops cxgb_ethtool_ops = { + #define T3_REGMAP_SIZE (3 * 1024) +@@ -1645,7 +1640,7 @@ static const struct ethtool_ops cxgb_ethtool_ops = { .get_strings = get_strings, .phys_id = cxgb3_phys_id, .nway_reset = restart_autoneg, - .get_sset_count = get_sset_count, ++ .get_stats_count = get_stats_count, .get_ethtool_stats = get_stats, .get_regs_len = get_regs_len, .get_regs = get_regs, diff --git a/kernel_patches/backport/2.6.21/cxgb3_0200_sset.patch b/kernel_patches/backport/2.6.21/cxgb3_0200_sset.patch index e331411..dde776e 100644 --- a/kernel_patches/backport/2.6.21/cxgb3_0200_sset.patch +++ b/kernel_patches/backport/2.6.21/cxgb3_0200_sset.patch @@ -1,29 +1,30 @@ diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c -index 61ffc92..676df2f 100644 +index 61ffc92..57ffa8e 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c -@@ -1131,16 +1131,6 @@ static char stats_strings[][ETH_GSTRING_LEN] = { +@@ -1131,14 +1131,9 @@ static char stats_strings[][ETH_GSTRING_LEN] = { }; -static int get_sset_count(struct net_device *dev, int sset) --{ ++static int get_stats_count(struct net_device *dev) + { - switch (sset) { - case ETH_SS_STATS: - return ARRAY_SIZE(stats_strings); - default: - return -EOPNOTSUPP; - } --} -- - #define T3_REGMAP_SIZE (3 * 1024) ++ return ARRAY_SIZE(stats_strings); + } - static int get_regs_len(struct net_device *dev) -@@ -1645,7 +1635,6 @@ static const struct ethtool_ops cxgb_ethtool_ops = { + #define T3_REGMAP_SIZE (3 * 1024) +@@ -1645,7 +1640,7 @@ static const struct ethtool_ops cxgb_ethtool_ops = { .get_strings = get_strings, .phys_id = cxgb3_phys_id, .nway_reset = restart_autoneg, - .get_sset_count = get_sset_count, ++ .get_stats_count = get_stats_count, .get_ethtool_stats = get_stats, .get_regs_len = get_regs_len, .get_regs = get_regs, diff --git a/kernel_patches/backport/2.6.22/cxgb3_0200_sset.patch b/kernel_patches/backport/2.6.22/cxgb3_0200_sset.patch index e331411..dde776e 100644 --- a/kernel_patches/backport/2.6.22/cxgb3_0200_sset.patch +++ b/kernel_patches/backport/2.6.22/cxgb3_0200_sset.patch @@ -1,29 +1,30 @@ diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c -index 61ffc92..676df2f 100644 +index 61ffc92..57ffa8e 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c -@@ -1131,16 +1131,6 @@ static char stats_strings[][ETH_GSTRING_LEN] = { +@@ -1131,14 +1131,9 @@ static char stats_strings[][ETH_GSTRING_LEN] = { }; -static int get_sset_count(struct net_device *dev, int sset) --{ ++static int get_stats_count(struct net_device *dev) + { - switch (sset) { - case ETH_SS_STATS: - return ARRAY_SIZE(stats_strings); - default: - return -EOPNOTSUPP; - } --} -- - #define T3_REGMAP_SIZE (3 * 1024) ++ return ARRAY_SIZE(stats_strings); + } - static int get_regs_len(struct net_device *dev) -@@ -1645,7 +1635,6 @@ static const struct ethtool_ops cxgb_ethtool_ops = { + #define T3_REGMAP_SIZE (3 * 1024) +@@ -1645,7 +1640,7 @@ static const struct ethtool_ops cxgb_ethtool_ops = { .get_strings = get_strings, .phys_id = cxgb3_phys_id, .nway_reset = restart_autoneg, - .get_sset_count = get_sset_count, ++ .get_stats_count = get_stats_count, .get_ethtool_stats = get_stats, .get_regs_len = get_regs_len, .get_regs = get_regs, diff --git a/kernel_patches/backport/2.6.23/cxgb3_0200_sset.patch b/kernel_patches/backport/2.6.23/cxgb3_0200_sset.patch index e331411..dde776e 100644 --- a/kernel_patches/backport/2.6.23/cxgb3_0200_sset.patch +++ b/kernel_patches/backport/2.6.23/cxgb3_0200_sset.patch @@ -1,29 +1,30 @@ diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c -index 61ffc92..676df2f 100644 +index 61ffc92..57ffa8e 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c -@@ -1131,16 +1131,6 @@ static char stats_strings[][ETH_GSTRING_LEN] = { +@@ -1131,14 +1131,9 @@ static char stats_strings[][ETH_GSTRING_LEN] = { }; -static int get_sset_count(struct net_device *dev, int sset) --{ ++static int get_stats_count(struct net_device *dev) + { - switch (sset) { - case ETH_SS_STATS: - return ARRAY_SIZE(stats_strings); - default: - return -EOPNOTSUPP; - } --} -- - #define T3_REGMAP_SIZE (3 * 1024) ++ return ARRAY_SIZE(stats_strings); + } - static int get_regs_len(struct net_device *dev) -@@ -1645,7 +1635,6 @@ static const struct ethtool_ops cxgb_ethtool_ops = { + #define T3_REGMAP_SIZE (3 * 1024) +@@ -1645,7 +1640,7 @@ static const struct ethtool_ops cxgb_ethtool_ops = { .get_strings = get_strings, .phys_id = cxgb3_phys_id, .nway_reset = restart_autoneg, - .get_sset_count = get_sset_count, ++ .get_stats_count = get_stats_count, .get_ethtool_stats = get_stats, .get_regs_len = get_regs_len, .get_regs = get_regs, diff --git a/kernel_patches/backport/2.6.9_U4/cxgb3_0200_sset.patch b/kernel_patches/backport/2.6.9_U4/cxgb3_0200_sset.patch index e331411..dde776e 100644 --- a/kernel_patches/backport/2.6.9_U4/cxgb3_0200_sset.patch +++ b/kernel_patches/backport/2.6.9_U4/cxgb3_0200_sset.patch @@ -1,29 +1,30 @@ diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c -index 61ffc92..676df2f 100644 +index 61ffc92..57ffa8e 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c -@@ -1131,16 +1131,6 @@ static char stats_strings[][ETH_GSTRING_LEN] = { +@@ -1131,14 +1131,9 @@ static char stats_strings[][ETH_GSTRING_LEN] = { }; -static int get_sset_count(struct net_device *dev, int sset) --{ ++static int get_stats_count(struct net_device *dev) + { - switch (sset) { - case ETH_SS_STATS: - return ARRAY_SIZE(stats_strings); - default: - return -EOPNOTSUPP; - } --} -- - #define T3_REGMAP_SIZE (3 * 1024) ++ return ARRAY_SIZE(stats_strings); + } - static int get_regs_len(struct net_device *dev) -@@ -1645,7 +1635,6 @@ static const struct ethtool_ops cxgb_ethtool_ops = { + #define T3_REGMAP_SIZE (3 * 1024) +@@ -1645,7 +1640,7 @@ static const struct ethtool_ops cxgb_ethtool_ops = { .get_strings = get_strings, .phys_id = cxgb3_phys_id, .nway_reset = restart_autoneg, - .get_sset_count = get_sset_count, ++ .get_stats_count = get_stats_count, .get_ethtool_stats = get_stats, .get_regs_len = get_regs_len, .get_regs = get_regs, diff --git a/kernel_patches/backport/2.6.9_U5/cxgb3_0200_sset.patch b/kernel_patches/backport/2.6.9_U5/cxgb3_0200_sset.patch index e331411..dde776e 100644 --- a/kernel_patches/backport/2.6.9_U5/cxgb3_0200_sset.patch +++ b/kernel_patches/backport/2.6.9_U5/cxgb3_0200_sset.patch @@ -1,29 +1,30 @@ diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c -index 61ffc92..676df2f 100644 +index 61ffc92..57ffa8e 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c -@@ -1131,16 +1131,6 @@ static char stats_strings[][ETH_GSTRING_LEN] = { +@@ -1131,14 +1131,9 @@ static char stats_strings[][ETH_GSTRING_LEN] = { }; -static int get_sset_count(struct net_device *dev, int sset) --{ ++static int get_stats_count(struct net_device *dev) + { - switch (sset) { - case ETH_SS_STATS: - return ARRAY_SIZE(stats_strings); - default: - return -EOPNOTSUPP; - } --} -- - #define T3_REGMAP_SIZE (3 * 1024) ++ return ARRAY_SIZE(stats_strings); + } - static int get_regs_len(struct net_device *dev) -@@ -1645,7 +1635,6 @@ static const struct ethtool_ops cxgb_ethtool_ops = { + #define T3_REGMAP_SIZE (3 * 1024) +@@ -1645,7 +1640,7 @@ static const struct ethtool_ops cxgb_ethtool_ops = { .get_strings = get_strings, .phys_id = cxgb3_phys_id, .nway_reset = restart_autoneg, - .get_sset_count = get_sset_count, ++ .get_stats_count = get_stats_count, .get_ethtool_stats = get_stats, .get_regs_len = get_regs_len, .get_regs = get_regs, _______________________________________________ ewg mailing list ewg@lists.openfabrics.org http://lists.openfabrics.org/cgi-bin/mailman/listinfo/ewg