[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <BANLkTimUUXp5XiCtVoD+pJyQYcE_r25zyA@mail.gmail.com>
Date: Tue, 10 May 2011 15:19:27 +0200
From: Michał Mirosław <mirqus@...il.com>
To: frank.blaschka@...ibm.com
Cc: davem@...emloft.net, netdev@...r.kernel.org,
linux-s390@...r.kernel.org
Subject: Re: [patch 1/9] [PATCH] qeth: convert to hw_features part 2
> From: Frank Blaschka <frank.blaschka@...ibm.com>
>
> Set rx csum default to hw checksumming again.
> Remove sysfs interface for rx csum (checksumming) and TSO (large_send).
> With the new hw_features it does not work to keep the old sysfs
> interface in parallel. Convert options.checksum_type to new hw_features.
[...]
> @@ -1482,32 +1476,28 @@ static int qeth_l3_start_ipa_checksum(st
[...]
> - rc = qeth_l3_send_checksum_command(card);
> - if (!rc)
> - dev_info(&card->gdev->dev,
> + card->dev->hw_features &= ~IPA_INBOUND_CHECKSUM;
> + card->dev->features &= ~IPA_INBOUND_CHECKSUM;
> + return 0;
> + }
Should be NETIF_F_RXCSUM probably.
Don't modify hw_features. Limit currently available features in
ndo_fix_features callback instead when checksumming is (temporarily)
unavailable.
[...]
> static int qeth_l3_set_features(struct net_device *dev, u32 features)
> {
> - enum qeth_checksum_types csum_type;
> struct qeth_card *card = dev->ml_priv;
> u32 changed = dev->features ^ features;
> + int on;
>
> if (!(changed & NETIF_F_RXCSUM))
> return 0;
>
> if (features & NETIF_F_RXCSUM)
> - csum_type = HW_CHECKSUMMING;
> + on = 1;
> else
> - csum_type = SW_CHECKSUMMING;
> + on = 0;
>
> dev->features = features ^ NETIF_F_RXCSUM;
> - return qeth_l3_set_rx_csum(card, csum_type);
> + return qeth_l3_set_rx_csum(card, on);
> }
Since you removed dev->features update from qeth_l3_set_rx_csum(), you
should also modify this code to match. On exit from ndo_fix_features,
dev->features should reflect what is currently set, even if part of
the request failed.
> static const struct ethtool_ops qeth_l3_ethtool_ops = {
> @@ -3342,6 +3326,12 @@ static int qeth_l3_setup_netdev(struct q
> if (!(card->info.unique_id & UNIQUE_ID_NOT_BY_CARD))
> card->dev->dev_id = card->info.unique_id &
> 0xffff;
> + if (!card->info.guestlan) {
> + card->dev->hw_features = NETIF_F_SG |
> + NETIF_F_RXCSUM | NETIF_F_IP_CSUM |
> + NETIF_F_TSO;
> + card->dev->features = NETIF_F_RXCSUM;
> + }
All features except RXCSUM will be disabled by default. Is that the intent here?
Best Regards,
Michał Mirosław
Powered by blists - more mailing lists