* [PATCH] net: benet: convert to hw_features - fixup
@ 2011-04-17 10:15 Michał Mirosław
2011-04-17 16:14 ` Ajit.Khaparde
2011-04-18 0:41 ` David Miller
0 siblings, 2 replies; 5+ messages in thread
From: Michał Mirosław @ 2011-04-17 10:15 UTC (permalink / raw)
To: netdev; +Cc: Sathya Perla, Subbu Seetharaman, Ajit Khaparde
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(-)
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
^ permalink raw reply related [flat|nested] 5+ messages in thread* RE: [PATCH] net: benet: convert to hw_features - fixup
2011-04-17 10:15 [PATCH] net: benet: convert to hw_features - fixup Michał Mirosław
@ 2011-04-17 16:14 ` Ajit.Khaparde
2011-04-18 0:41 ` David Miller
1 sibling, 0 replies; 5+ messages in thread
From: Ajit.Khaparde @ 2011-04-17 16:14 UTC (permalink / raw)
To: mirq-linux, netdev; +Cc: Sathya.Perla, subbu.seetharaman
> 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
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] net: benet: convert to hw_features - fixup
2011-04-17 10:15 [PATCH] net: benet: convert to hw_features - fixup Michał Mirosław
2011-04-17 16:14 ` Ajit.Khaparde
@ 2011-04-18 0:41 ` David Miller
1 sibling, 0 replies; 5+ messages in thread
From: David Miller @ 2011-04-18 0:41 UTC (permalink / raw)
To: mirq-linux; +Cc: netdev, sathya.perla, subbu.seetharaman, ajit.khaparde
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.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] net: benet: convert to hw_features - fixup
@ 2011-04-08 12:38 Michał Mirosław
2011-04-11 1:55 ` David Miller
0 siblings, 1 reply; 5+ messages in thread
From: Michał Mirosław @ 2011-04-08 12:38 UTC (permalink / raw)
To: netdev; +Cc: Sathya Perla, Subbu Seetharaman, Ajit Khaparde
Fix up after merge with NETIF_F_RXHASH implementation.
This allows to toggle NETIF_F_RXHASH and NETIF_F_HW_VLAN_TX.
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
drivers/net/benet/be_main.c | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index 58a652f..5497336 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -2629,14 +2629,13 @@ static void be_netdev_init(struct net_device *netdev)
int i;
netdev->hw_features |= NETIF_F_SG | NETIF_F_TSO | NETIF_F_TSO6 |
- NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM;
-
- netdev->features |= netdev->hw_features |
- NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX |
- NETIF_F_HW_VLAN_FILTER;
-
+ NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM |
+ NETIF_F_HW_VLAN_TX;
if (be_multi_rxq(adapter))
- netdev->features |= NETIF_F_RXHASH;
+ netdev->hw_features |= NETIF_F_RXHASH;
+
+ netdev->features |= netdev->hw_features |
+ NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER;
netdev->vlan_features |= NETIF_F_SG | NETIF_F_TSO |
NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM;
--
1.7.2.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] net: benet: convert to hw_features - fixup
2011-04-08 12:38 Michał Mirosław
@ 2011-04-11 1:55 ` David Miller
0 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2011-04-11 1:55 UTC (permalink / raw)
To: mirq-linux; +Cc: netdev, sathya.perla, subbu.seetharaman, ajit.khaparde
From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Date: Fri, 8 Apr 2011 14:38:47 +0200 (CEST)
> Fix up after merge with NETIF_F_RXHASH implementation.
>
> This allows to toggle NETIF_F_RXHASH and NETIF_F_HW_VLAN_TX.
>
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Applied.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-04-18 0:42 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-17 10:15 [PATCH] net: benet: convert to hw_features - fixup Michał Mirosław
2011-04-17 16:14 ` Ajit.Khaparde
2011-04-18 0:41 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2011-04-08 12:38 Michał Mirosław
2011-04-11 1:55 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).