From: Paul Barker <paul.barker.ct@xxxxxxxxxxxxxx>
The GbEth IP supports offloading IPv6 TCP, UDP & ICMPv6 checksums.
Signed-off-by: Paul Barker <paul.barker.ct@xxxxxxxxxxxxxx>
---
drivers/net/ethernet/renesas/ravb.h | 3 ++-
drivers/net/ethernet/renesas/ravb_main.c | 31 ++++++++++++++----------
2 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h
index 8523b89ba1c6..2cb6c4ef1330 100644
--- a/drivers/net/ethernet/renesas/ravb.h
+++ b/drivers/net/ethernet/renesas/ravb.h
@@ -998,7 +998,8 @@ enum CSR1_BIT {
CSR1_TDHD = 0x08000000,
};
-#define CSR1_CSUM_ENABLE (CSR1_TTCP4 | CSR1_TUDP4 | CSR1_TICMP4)
+#define CSR1_CSUM_ENABLE (CSR1_TTCP4 | CSR1_TUDP4 | CSR1_TICMP4 | \
+ CSR1_TTCP6 | CSR1_TUDP6 | CSR1_TICMP6)
enum CSR2_BIT {
CSR2_RIP4 = 0x00000001,
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 69d71fbf3e02..832132d44fb4 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -2063,25 +2063,30 @@ static void ravb_tx_timeout_work(struct work_struct *work)
static bool ravb_can_tx_csum_gbeth(struct sk_buff *skb)
{
- struct iphdr *ip = ip_hdr(skb);
-
/* TODO: Need to add support for VLAN tag 802.1Q */
if (skb_vlan_tag_present(skb))
return false;
- /* TODO: Need to add hardware checksum for IPv6 */
- if (skb->protocol != htons(ETH_P_IP))
- return false;
-
- switch (ip->protocol) {
- case IPPROTO_TCP:
- case IPPROTO_UDP:
- case IPPROTO_ICMP:
- return true;
+ switch (ntohs(skb->protocol)) {
+ case ETH_P_IP:
+ switch (ip_hdr(skb)->protocol) {
+ case IPPROTO_TCP:
+ case IPPROTO_UDP:
+ case IPPROTO_ICMP:
+ return true;
+ }
+ break;
- default:
- return false;
+ case ETH_P_IPV6:
+ switch (ipv6_hdr(skb)->nexthdr) {
+ case IPPROTO_TCP:
+ case IPPROTO_UDP:
+ case IPPROTO_ICMPV6:
+ return true;
+ }
}
+
+ return false;
}
/* Packet transmit function for Ethernet AVB */
--
2.43.0
