* [patch net-next-2.6] br: remove redundant check and init
@ 2011-09-01 13:29 ` Jiri Pirko
0 siblings, 0 replies; 5+ messages in thread
From: Jiri Pirko @ 2011-09-01 13:29 UTC (permalink / raw)
To: netdev; +Cc: davem, eric.dumazet, shemminger, bridge
Since these checks and initialization are done in
dev_ethtool_get_settings called later on, remove this redundancy.
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
---
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Bridge] [patch net-next-2.6] br: remove redundant check and init
@ 2011-09-01 13:29 ` Jiri Pirko
0 siblings, 0 replies; 5+ messages in thread
From: Jiri Pirko @ 2011-09-01 13:29 UTC (permalink / raw)
To: netdev; +Cc: shemminger, bridge, davem, eric.dumazet
Since these checks and initialization are done in
dev_ethtool_get_settings called later on, remove this redundancy.
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
---
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [patch net-next-2.6] br: remove redundant check and init
2011-09-01 13:29 ` [Bridge] " Jiri Pirko
@ 2011-09-01 16:07 ` Stephen Hemminger
-1 siblings, 0 replies; 5+ messages in thread
From: Stephen Hemminger @ 2011-09-01 16:07 UTC (permalink / raw)
To: Jiri Pirko; +Cc: netdev, davem, eric.dumazet, bridge
On Thu, 1 Sep 2011 15:29:38 +0200
Jiri Pirko <jpirko@redhat.com> wrote:
> Since these checks and initialization are done in
> dev_ethtool_get_settings called later on, remove this redundancy.
>
> Signed-off-by: Jiri Pirko <jpirko@redhat.com>
> ---
> 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 <shemminger@vyatta.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Bridge] [patch net-next-2.6] br: remove redundant check and init
@ 2011-09-01 16:07 ` Stephen Hemminger
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Hemminger @ 2011-09-01 16:07 UTC (permalink / raw)
To: Jiri Pirko; +Cc: netdev, bridge, davem, eric.dumazet
On Thu, 1 Sep 2011 15:29:38 +0200
Jiri Pirko <jpirko@redhat.com> wrote:
> Since these checks and initialization are done in
> dev_ethtool_get_settings called later on, remove this redundancy.
>
> Signed-off-by: Jiri Pirko <jpirko@redhat.com>
> ---
> 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 <shemminger@vyatta.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [patch net-next-2.6] br: remove redundant check and init
2011-09-01 13:29 ` [Bridge] " Jiri Pirko
(?)
(?)
@ 2011-09-15 19:43 ` David Miller
-1 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2011-09-15 19:43 UTC (permalink / raw)
To: jpirko; +Cc: netdev, eric.dumazet, shemminger, bridge
From: Jiri Pirko <jpirko@redhat.com>
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 <jpirko@redhat.com>
Applied.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-09-15 19:45 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-09-01 13:29 [patch net-next-2.6] br: remove redundant check and init Jiri Pirko
2011-09-01 13:29 ` [Bridge] " Jiri Pirko
2011-09-01 16:07 ` Stephen Hemminger
2011-09-01 16:07 ` [Bridge] " Stephen Hemminger
2011-09-15 19:43 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.