diff mbox

net: benet: convert to hw_features - fixup

Message ID 20110417101547.5F75513A6A@rere.qmqm.pl
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Michał Mirosław April 17, 2011, 10:15 a.m. UTC
Remove be_set_flags() as it's already covered by hw_features.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
 drivers/net/benet/be_ethtool.c |   13 -------------
 1 files changed, 0 insertions(+), 13 deletions(-)

Comments

Ajit Khaparde April 17, 2011, 4:14 p.m. UTC | #1
> Remove be_set_flags() as it's already covered by hw_features.

> Signed-off-by: Michał Mirosław mirq-linux@rere.qmqm.pl
Acked-by: Ajit Khaparde ajit.khaparde@emulex.com

> ---
>  drivers/net/benet/be_ethtool.c |   13 -------------
>  1 files changed, 0 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/net/benet/be_ethtool.c b/drivers/net/benet/be_ethtool.c
> index 80226e4..ab7ebdd 100644
> --- a/drivers/net/benet/be_ethtool.c
> +++ b/drivers/net/benet/be_ethtool.c
> @@ -716,18 +716,6 @@ be_read_eeprom(struct net_device *netdev, struct ethtool_eeprom *eeprom,
>         return status;
>  }

> -static int be_set_flags(struct net_device *netdev, u32 data)
> -{
> -       struct be_adapter *adapter = netdev_priv(netdev);
> -       int rc = -1;
> -
> -       if (be_multi_rxq(adapter))
> -               rc = ethtool_op_set_flags(netdev, data, ETH_FLAG_RXHASH |
> -                               ETH_FLAG_TXVLAN | ETH_FLAG_RXVLAN);
> -
> -       return rc;
> -}
> -
>  const struct ethtool_ops be_ethtool_ops = {
>         .get_settings = be_get_settings,
>         .get_drvinfo = be_get_drvinfo,
> @@ -749,5 +737,4 @@ const struct ethtool_ops be_ethtool_ops = {
>         .get_regs = be_get_regs,
>         .flash_device = be_do_flash,
>         .self_test = be_self_test,
> -       .set_flags = be_set_flags,
>  };
> --
> 1.7.2.5
>--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller April 18, 2011, 12:41 a.m. UTC | #2
From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Date: Sun, 17 Apr 2011 12:15:47 +0200 (CEST)

> Remove be_set_flags() as it's already covered by hw_features.
> 
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/benet/be_ethtool.c b/drivers/net/benet/be_ethtool.c
index 80226e4..ab7ebdd 100644
--- a/drivers/net/benet/be_ethtool.c
+++ b/drivers/net/benet/be_ethtool.c
@@ -716,18 +716,6 @@  be_read_eeprom(struct net_device *netdev, struct ethtool_eeprom *eeprom,
 	return status;
 }
 
-static int be_set_flags(struct net_device *netdev, u32 data)
-{
-	struct be_adapter *adapter = netdev_priv(netdev);
-	int rc = -1;
-
-	if (be_multi_rxq(adapter))
-		rc = ethtool_op_set_flags(netdev, data, ETH_FLAG_RXHASH |
-				ETH_FLAG_TXVLAN | ETH_FLAG_RXVLAN);
-
-	return rc;
-}
-
 const struct ethtool_ops be_ethtool_ops = {
 	.get_settings = be_get_settings,
 	.get_drvinfo = be_get_drvinfo,
@@ -749,5 +737,4 @@  const struct ethtool_ops be_ethtool_ops = {
 	.get_regs = be_get_regs,
 	.flash_device = be_do_flash,
 	.self_test = be_self_test,
-	.set_flags = be_set_flags,
 };