D49677.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D49677.diff
View Options

	diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
	--- a/sys/netinet/ip_output.c
	+++ b/sys/netinet/ip_output.c
	@@ -1044,14 +1044,14 @@
	}

	void
	-in_delayed_cksum(struct mbuf *m)
	+in_delayed_cksum_o(struct mbuf *m, uint16_t iph_offset)
	{
	struct ip *ip;
	struct udphdr *uh;
	uint16_t cklen, csum, offset;

	- ip = mtod(m, struct ip *);
	- offset = ip->ip_hl << 2 ;
	+ ip = (struct ip *)mtodo(m, iph_offset);
	+ offset = iph_offset + (ip->ip_hl << 2);

	if (m->m_pkthdr.csum_flags & CSUM_UDP) {
	/* if udp header is not in the first mbuf copy udplen */
	@@ -1078,6 +1078,13 @@
	(u_short )mtodo(m, offset) = csum;
	}

	+void
	+in_delayed_cksum(struct mbuf *m)
	+{
	+
	+ in_delayed_cksum_o(m, 0);
	+}
	+
	/*
	* IP socket option processing.
	*/
	diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
	--- a/sys/netinet/ip_var.h
	+++ b/sys/netinet/ip_var.h
	@@ -271,6 +271,7 @@
	#define PFIL_INET_LOCAL_NAME "inet-local"

	void in_delayed_cksum(struct mbuf *m);
	+void in_delayed_cksum_o(struct mbuf *m, uint16_t o);

	/* Hooks for ipfw, dummynet, divert etc. Most are declared in raw_ip.c */
	/*