From: "Michał Mirosław" <mirqus@gmail.com>
To: frank.blaschka@de.ibm.com
Cc: davem@davemloft.net, netdev@vger.kernel.org, linux-s390@vger.kernel.org
Subject: Re: [patch 1/9] [PATCH] qeth: convert to hw_features part 2
Date: Tue, 10 May 2011 15:19:27 +0200 [thread overview]
Message-ID: <BANLkTimUUXp5XiCtVoD+pJyQYcE_r25zyA@mail.gmail.com> (raw)
In-Reply-To: <20110510115047.113084723@de.ibm.com>
> From: Frank Blaschka <frank.blaschka@de.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
next prev parent reply other threads:[~2011-05-10 13:29 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-10 11:50 [patch 0/9] s390: network feature patches for net-next frank.blaschka
2011-05-10 11:50 ` [patch 1/9] [PATCH] qeth: convert to hw_features part 2 frank.blaschka
2011-05-10 13:19 ` Michał Mirosław [this message]
2011-05-10 14:09 ` Frank Blaschka
2011-05-10 14:33 ` Michał Mirosław
2011-05-10 11:50 ` [patch 2/9] [PATCH] qeth: add OSA concurrent hardware trap frank.blaschka
2011-05-10 11:50 ` [patch 3/9] [PATCH] qeth: add owner to ccw driver frank.blaschka
2011-05-10 11:50 ` [patch 4/9] [PATCH] claw: remove unused return code handling frank.blaschka
2011-05-10 11:50 ` [patch 5/9] [PATCH] lcs: get rid of compile warning frank.blaschka
2011-05-10 11:50 ` [patch 6/9] [PATCH] ctcm: " frank.blaschka
2011-05-10 11:50 ` [patch 7/9] [PATCH] iucv: " frank.blaschka
2011-05-10 11:50 ` [patch 8/9] [PATCH] af_iucv: " frank.blaschka
2011-05-10 11:50 ` [patch 9/9] [PATCH] convert old cpumask API into new one frank.blaschka
-- strict thread matches above, loose matches on Subject: below --
2011-05-12 5:43 [patch 0/9] [resend] s390: network feature patches for net-next frank.blaschka
2011-05-12 5:43 ` [patch 1/9] [PATCH] qeth: convert to hw_features part 2 frank.blaschka
2011-05-12 5:59 ` Michał Mirosław
2011-05-12 7:21 ` Frank Blaschka
2011-05-12 8:12 ` Michał Mirosław
2011-05-12 11:10 ` Frank Blaschka
2011-05-12 11:25 ` Michał Mirosław
2011-05-12 11:59 ` Frank Blaschka
2011-05-12 22:02 ` David Miller
2011-05-13 4:45 [patch 0/9] [resend v2] s390: network feature patches for net-next frank.blaschka
2011-05-13 4:45 ` [patch 1/9] [PATCH] qeth: convert to hw_features part 2 frank.blaschka
2011-05-13 7:38 ` Michał Mirosław
2011-05-13 7:57 ` Frank Blaschka
2011-05-13 8:07 ` Michał Mirosław
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=BANLkTimUUXp5XiCtVoD+pJyQYcE_r25zyA@mail.gmail.com \
--to=mirqus@gmail.com \
--cc=davem@davemloft.net \
--cc=frank.blaschka@de.ibm.com \
--cc=linux-s390@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).