Sun May 3 16:10:26 2020 UTC ()
return EOPNOTSUPP for unknown IP protocol (same as unknown ethernet type),
so that EINVAL is returned only when the packet is too short


(jdolecek)
diff -r1.12 -r1.13 src/sys/arch/xen/xen/xennet_checksum.c
cvs diff -r1.12 -r1.13 src/sys/arch/xen/xen/xennet_checksum.c (expand / switch to unified diff)

--- src/sys/arch/xen/xen/xennet_checksum.c 2020/05/01 19:53:17 1.12
+++ src/sys/arch/xen/xen/xennet_checksum.c 2020/05/03 16:10:26 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: xennet_checksum.c,v 1.12 2020/05/01 19:53:17 jdolecek Exp $ */ 1/* $NetBSD: xennet_checksum.c,v 1.13 2020/05/03 16:10:26 jdolecek Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c)2006 YAMAMOTO Takashi, 4 * Copyright (c)2006 YAMAMOTO Takashi,
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -17,27 +17,27 @@ @@ -17,27 +17,27 @@
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE 19 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE. 26 * SUCH DAMAGE.
27 */ 27 */
28 28
29#include <sys/cdefs.h> 29#include <sys/cdefs.h>
30__KERNEL_RCSID(0, "$NetBSD: xennet_checksum.c,v 1.12 2020/05/01 19:53:17 jdolecek Exp $"); 30__KERNEL_RCSID(0, "$NetBSD: xennet_checksum.c,v 1.13 2020/05/03 16:10:26 jdolecek Exp $");
31 31
32#ifdef _KERNEL_OPT 32#ifdef _KERNEL_OPT
33#include "opt_inet.h" 33#include "opt_inet.h"
34#endif 34#endif
35 35
36#include <sys/types.h> 36#include <sys/types.h>
37#include <sys/param.h> 37#include <sys/param.h>
38 38
39#include <net/if.h> 39#include <net/if.h>
40#include <net/if_dl.h> 40#include <net/if_dl.h>
41#include <net/if_ether.h> 41#include <net/if_ether.h>
42#include <net/if_vlanvar.h> 42#include <net/if_vlanvar.h>
43 43
@@ -176,27 +176,27 @@ xennet_checksum_fill(struct ifnet *ifp,  @@ -176,27 +176,27 @@ xennet_checksum_fill(struct ifnet *ifp,
176 case IPPROTO_FRAGMENT: 176 case IPPROTO_FRAGMENT:
177 /* nothing to do */ 177 /* nothing to do */
178 error = 0; 178 error = 0;
179 goto out; 179 goto out;
180 /* NOTREACHED */ 180 /* NOTREACHED */
181 default: 181 default:
182 { 182 {
183#ifdef XENNET_DEBUG 183#ifdef XENNET_DEBUG
184 static struct timeval lasttime; 184 static struct timeval lasttime;
185 if (ratecheck(&lasttime, &xn_cksum_errintvl)) 185 if (ratecheck(&lasttime, &xn_cksum_errintvl))
186 printf("%s: unknown proto %d passed no checksum\n", 186 printf("%s: unknown proto %d passed no checksum\n",
187 ifp->if_xname, nxt); 187 ifp->if_xname, nxt);
188#endif /* XENNET_DEBUG */ 188#endif /* XENNET_DEBUG */
189 error = EINVAL; 189 error = EOPNOTSUPP;
190 goto out; 190 goto out;
191 } 191 }
192 } 192 }
193 193
194 /* 194 /*
195 * Only compute the checksum if impossible to defer. 195 * Only compute the checksum if impossible to defer.
196 */ 196 */
197 sw_csum = m->m_pkthdr.csum_flags & ~ifp->if_csum_flags_rx; 197 sw_csum = m->m_pkthdr.csum_flags & ~ifp->if_csum_flags_rx;
198 198
199 /* 199 /*
200 * Always initialize the sum to 0! Some HW assisted 200 * Always initialize the sum to 0! Some HW assisted
201 * checksumming requires this. in_undefer_cksum() 201 * checksumming requires this. in_undefer_cksum()
202 * also needs it to be zero. 202 * also needs it to be zero.