From: Benjamin Herrenschmidt <benh@kernel•crashing.org>
To: netdev@vger•kernel.org
Cc: Benjamin Herrenschmidt <benh@kernel•crashing.org>
Subject: [PATCH v2 01/10] ftgmac100: Upgrade to NETIF_F_HW_CSUM
Date: Wed, 12 Apr 2017 13:27:01 +1000 [thread overview]
Message-ID: <20170412032710.17546-2-benh@kernel.crashing.org> (raw)
In-Reply-To: <20170412032710.17546-1-benh@kernel.crashing.org>
The documentation describes NETIF_F_IP_CSUM as deprecated
so let's switch to NETIF_F_HW_CSUM and use the helper to
handle unhandled protocols.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel•crashing.org>
--
v2. - Properly fallback on unknown IP protocols (side effect
of fixing a reported coding style issue as well).
---
drivers/net/ethernet/faraday/ftgmac100.c | 40 ++++++++++++++++++++------------
1 file changed, 25 insertions(+), 15 deletions(-)
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index 98b8956..bfa7d0a 100644
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -570,6 +570,26 @@ static void ftgmac100_tx_complete(struct ftgmac100 *priv)
}
}
+static bool ftgmac100_prep_tx_csum(struct sk_buff *skb, u32 *csum_vlan)
+{
+ if (skb->protocol == cpu_to_be16(ETH_P_IP)) {
+ u8 ip_proto = ip_hdr(skb)->protocol;
+
+ *csum_vlan |= FTGMAC100_TXDES1_IP_CHKSUM;
+ switch(ip_proto) {
+ case IPPROTO_TCP:
+ *csum_vlan |= FTGMAC100_TXDES1_TCP_CHKSUM;
+ return true;
+ case IPPROTO_UDP:
+ *csum_vlan |= FTGMAC100_TXDES1_UDP_CHKSUM;
+ return true;
+ case IPPROTO_IP:
+ return true;
+ }
+ }
+ return skb_checksum_help(skb) == 0;
+}
+
static int ftgmac100_hard_start_xmit(struct sk_buff *skb,
struct net_device *netdev)
{
@@ -626,19 +646,9 @@ static int ftgmac100_hard_start_xmit(struct sk_buff *skb,
/* Setup HW checksumming */
csum_vlan = 0;
- if (skb->ip_summed == CHECKSUM_PARTIAL) {
- __be16 protocol = skb->protocol;
-
- if (protocol == cpu_to_be16(ETH_P_IP)) {
- u8 ip_proto = ip_hdr(skb)->protocol;
-
- csum_vlan |= FTGMAC100_TXDES1_IP_CHKSUM;
- if (ip_proto == IPPROTO_TCP)
- csum_vlan |= FTGMAC100_TXDES1_TCP_CHKSUM;
- else if (ip_proto == IPPROTO_UDP)
- csum_vlan |= FTGMAC100_TXDES1_UDP_CHKSUM;
- }
- }
+ if (skb->ip_summed == CHECKSUM_PARTIAL &&
+ !ftgmac100_prep_tx_csum(skb, &csum_vlan))
+ goto drop;
txdes->txdes1 = cpu_to_le32(csum_vlan);
/* Next descriptor */
@@ -1463,11 +1473,11 @@ static int ftgmac100_probe(struct platform_device *pdev)
* when NCSI is enabled on the interface. It doesn't work
* in that case.
*/
- netdev->features = NETIF_F_RXCSUM | NETIF_F_IP_CSUM |
+ netdev->features = NETIF_F_RXCSUM | NETIF_F_HW_CSUM |
NETIF_F_GRO | NETIF_F_SG;
if (priv->use_ncsi &&
of_get_property(pdev->dev.of_node, "no-hw-checksum", NULL))
- netdev->features &= ~NETIF_F_IP_CSUM;
+ netdev->features &= ~NETIF_F_HW_CSUM;
/* register network device */
err = register_netdev(netdev);
--
2.9.3
next prev parent reply other threads:[~2017-04-12 3:27 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-12 3:27 [PATCH v2 00/10] ftgmac100: Rework batch 4 - Misc Benjamin Herrenschmidt
2017-04-12 3:27 ` Benjamin Herrenschmidt [this message]
2017-04-12 3:27 ` [PATCH v2 02/10] ftgmac100: Use device "compatible" property, not machine Benjamin Herrenschmidt
2017-04-12 3:27 ` [PATCH v2 03/10] ftgmac100: Disable HW checksum generation on AST2400, enable on others Benjamin Herrenschmidt
2017-04-12 3:27 ` [PATCH v2 04/10] ftgmac100: Set netdev->hw_features Benjamin Herrenschmidt
2017-04-12 3:27 ` [PATCH v2 05/10] ftgmac100: Rename ftgmac100_set_mac to ftgmac100_write_mac_addr Benjamin Herrenschmidt
2017-04-12 3:27 ` [PATCH v2 06/10] ftgmac100: Rename ftgmac100_setup_mac to ftgmac100_initial_mac Benjamin Herrenschmidt
2017-04-12 3:27 ` [PATCH v2 07/10] ftgmac100: Open code remaining register writes Benjamin Herrenschmidt
2017-04-12 3:27 ` [PATCH v2 08/10] ftgmac100: Add more register inits in ftgmac100_init_hw() Benjamin Herrenschmidt
2017-04-12 3:27 ` [PATCH v2 09/10] ftgmac100: Make ring sizes configurable via ethtool Benjamin Herrenschmidt
2017-04-12 3:27 ` [PATCH v2 10/10] ftgmac100: Set default ring sizes to 128 entries Benjamin Herrenschmidt
2017-04-12 14:19 ` [PATCH v2 00/10] ftgmac100: Rework batch 4 - Misc David Miller
2017-04-12 21:32 ` Benjamin Herrenschmidt
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=20170412032710.17546-2-benh@kernel.crashing.org \
--to=benh@kernel$(echo .)crashing.org \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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