Attachment 144902 Details for Bug 192013 – patch for pf delayed_csum bug

[patch] patch for pf delayed_csum bug

pf-delayed-csum.diff (text/plain), 1.27 KB, created by Dag-Erling Smørgrav on 2014-07-23 07:02:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dag-Erling Smørgrav

Created: 2014-07-23 07:02:55 UTC

Size: 1.27 KB

patch

obsolete

>Index: sys/netpfil/pf/pf_ioctl.c
>===================================================================
>--- sys/netpfil/pf/pf_ioctl.c	(revision 268985)
>+++ sys/netpfil/pf/pf_ioctl.c	(working copy)
>@@ -77,6 +77,7 @@
> #include <netinet/ip.h>
> #include <netinet/ip_var.h>
> #include <netinet/ip_icmp.h>
>+#include <netinet6/ip6_var.h>
> 
> #ifdef INET6
> #include <netinet/ip6.h>
>@@ -3534,7 +3535,7 @@
> 	int chk;
> 
> 	/* We need a proper CSUM befor we start (s. OpenBSD ip_output) */
>-	if ((*m)->m_pkthdr.csum_flags & CSUM_DELAY_DATA) {
>+	if ((*m)->m_pkthdr.csum_flags & CSUM_DELAY_DATA & ~ifp->if_hwassist) {
> 		in_delayed_cksum(*m);
> 		(*m)->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA;
> 	}
>@@ -3578,12 +3579,12 @@
> 	int chk;
> 
> 	/* We need a proper CSUM before we start (s. OpenBSD ip_output) */
>-	if ((*m)->m_pkthdr.csum_flags & CSUM_DELAY_DATA) {
>-#ifdef INET
>-		/* XXX-BZ copy&paste error from r126261? */
>-		in_delayed_cksum(*m);
>-#endif
>-		(*m)->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA;
>+	if ((*m)->m_pkthdr.csum_flags &
>+	    CSUM_DELAY_DATA_IPV6 & ~ifp->if_hwassist) {
>+		in6_delayed_cksum(*m,
>+		    (*m)->m_pkthdr.len - sizeof(struct ip6_hdr),
>+		    sizeof(struct ip6_hdr));
>+		(*m)->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA_IPV6;
> 	}
> 	CURVNET_SET(ifp->if_vnet);
> 	chk = pf_test6(PF_OUT, ifp, m, inp);

Actions: View | Diff

Attachments on bug 192013: 144852 | 144883 | 144902 | 149819