[patch net-next-2.6] br: remove redundant check and init
Subsystems:
ethernet bridge , networking [general] , the rest
STALE5506d
3 messages,
3 authors,
2011-09-15 · open the first message on its own page
Since these checks and initialization are done in
dev_ethtool_get_settings called later on, remove this redundancy.
Signed-off-by: Jiri Pirko <redacted>
---
net/bridge/br_if.c | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 2cdf007..b365bba 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c @@ -33,20 +33,18 @@
*/
static int port_cost ( struct net_device * dev )
{
- if ( dev -> ethtool_ops && dev -> ethtool_ops -> get_settings ) {
- struct ethtool_cmd ecmd = { . cmd = ETHTOOL_GSET , };
-
- if ( ! dev_ethtool_get_settings ( dev , & ecmd )) {
- switch ( ethtool_cmd_speed ( & ecmd )) {
- case SPEED_10000 :
- return 2 ;
- case SPEED_1000 :
- return 4 ;
- case SPEED_100 :
- return 19 ;
- case SPEED_10 :
- return 100 ;
- }
+ struct ethtool_cmd ecmd ;
+
+ if ( ! dev_ethtool_get_settings ( dev , & ecmd )) {
+ switch ( ethtool_cmd_speed ( & ecmd )) {
+ case SPEED_10000 :
+ return 2 ;
+ case SPEED_1000 :
+ return 4 ;
+ case SPEED_100 :
+ return 19 ;
+ case SPEED_10 :
+ return 100 ;
}
}
--
1.7.6
On Thu, 1 Sep 2011 15:29:38 +0200
Jiri Pirko [off-list ref] wrote:
quoted hunk Since these checks and initialization are done in
dev_ethtool_get_settings called later on, remove this redundancy.
Signed-off-by: Jiri Pirko <redacted>
---
net/bridge/br_if.c | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 2cdf007..b365bba 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c @@ -33,20 +33,18 @@
*/
static int port_cost ( struct net_device * dev )
{
- if ( dev -> ethtool_ops && dev -> ethtool_ops -> get_settings ) {
- struct ethtool_cmd ecmd = { . cmd = ETHTOOL_GSET , };
-
- if ( ! dev_ethtool_get_settings ( dev , & ecmd )) {
- switch ( ethtool_cmd_speed ( & ecmd )) {
- case SPEED_10000 :
- return 2 ;
- case SPEED_1000 :
- return 4 ;
- case SPEED_100 :
- return 19 ;
- case SPEED_10 :
- return 100 ;
- }
+ struct ethtool_cmd ecmd ;
+
+ if ( ! dev_ethtool_get_settings ( dev , & ecmd )) {
+ switch ( ethtool_cmd_speed ( & ecmd )) {
+ case SPEED_10000 :
+ return 2 ;
+ case SPEED_1000 :
+ return 4 ;
+ case SPEED_100 :
+ return 19 ;
+ case SPEED_10 :
+ return 100 ;
}
}
Yeah, this code predates when ethtool was sane about ops
Acked-by: Stephen Hemminger <redacted>
From: Jiri Pirko <redacted>
Date: Thu, 1 Sep 2011 15:29:38 +0200
Since these checks and initialization are done in
dev_ethtool_get_settings called later on, remove this redundancy.
Signed-off-by: Jiri Pirko <redacted>
Applied.