From: vyasevich@gmail.com
To: netdev@vger.kernel.org
Cc: Vladislav Yasevich <vyasevic@redhat.com>,
Rasesh Mody <rmody@brocade.com>
Subject: [PATCH 3/8] bna: Support TSO and partial checksum with non-accelerated vlans.
Date: Fri, 22 Aug 2014 22:17:05 -0400 [thread overview]
Message-ID: <1408760230-7457-4-git-send-email-vysevich@gmail.com> (raw)
In-Reply-To: <1408760230-7457-1-git-send-email-vysevich@gmail.com>
From: Vladislav Yasevich <vyasevic@redhat.com>
This device claims TSO and checksum support for vlans. It also
allows a user to control vlan acceleration offloading. As such,
it is possible to turn off vlan acceleration and configure a vlan
which will continue to support TSO.
In such situation the packet passed down the the device will contain
a vlan header and skb->protocol will be set to ETH_P_8021Q.
The device assumes that skb->protocol contains network protocol
value and uses that value to set up TSO information. This results
in corrupted frames sent on the wire.
This patch extract the protocol value correctly and corrects TSO
and checksums for non-accelerated traffic.
CC: Rasesh Mody <rmody@brocade.com>
Signed-off-by: Vladislav Yasevich <vyasevic@redhat.com>
---
drivers/net/ethernet/brocade/bna/bnad.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c
index ff8cae5..ffc92a4 100644
--- a/drivers/net/ethernet/brocade/bna/bnad.c
+++ b/drivers/net/ethernet/brocade/bna/bnad.c
@@ -2506,7 +2506,7 @@ bnad_tso_prepare(struct bnad *bnad, struct sk_buff *skb)
* For TSO, the TCP checksum field is seeded with pseudo-header sum
* excluding the length field.
*/
- if (skb->protocol == htons(ETH_P_IP)) {
+ if (vlan_get_protocol(skb) == htons(ETH_P_IP)) {
struct iphdr *iph = ip_hdr(skb);
/* Do we really need these? */
@@ -2870,12 +2870,13 @@ bnad_txq_wi_prepare(struct bnad *bnad, struct bna_tcb *tcb,
}
if (skb->ip_summed == CHECKSUM_PARTIAL) {
+ __be16 net_proto = vlan_get_protocol(skb);
u8 proto = 0;
- if (skb->protocol == htons(ETH_P_IP))
+ if (net_proto == htons(ETH_P_IP))
proto = ip_hdr(skb)->protocol;
#ifdef NETIF_F_IPV6_CSUM
- else if (skb->protocol == htons(ETH_P_IPV6)) {
+ else if (net_proto == htons(ETH_P_IPV6)) {
/* nexthdr may not be TCP immediately. */
proto = ipv6_hdr(skb)->nexthdr;
}
--
1.9.3
next prev parent reply other threads:[~2014-08-23 2:17 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-23 2:17 [PATCH 0/8] Fix TSO and checksum issues with non-accelerated vlan traffic vyasevich
2014-08-23 2:17 ` [PATCH 1/8] e1000e: Fix TSO with non-accelerated vlans vyasevich
2014-08-23 2:17 ` [PATCH 2/8] e1000: Fix TSO for non-accelerated vlan traffic vyasevich
2014-08-23 2:17 ` vyasevich [this message]
2014-08-23 2:17 ` [PATCH 4/8] ehea: Fix TSO and hw checksums with non-accelerated vlan packets vyasevich
2014-08-23 2:17 ` [PATCH 5/8] i40e: Fix TSO and hw checksums for " vyasevich
2014-08-23 18:43 ` David Miller
2014-08-24 1:13 ` Vlad Yasevich
2014-08-23 2:17 ` [PATCH 6/8] i40evf: " vyasevich
2014-08-23 2:17 ` [PATCH 7/8] mvneta: Fix TSO and checksum for non-acceleration vlan traffic vyasevich
2014-08-23 2:17 ` [PATCH 8/8] qlge: Fix TSO for non-accelerated " vyasevich
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=1408760230-7457-4-git-send-email-vysevich@gmail.com \
--to=vyasevich@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=rmody@brocade.com \
--cc=vyasevic@redhat.com \
/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).