Module Name: src
Committed By: jdolecek
Date: Mon Mar 16 20:51:36 UTC 2020
Modified Files:
src/sys/arch/xen/include: xennet_checksum.h
src/sys/arch/xen/xen: if_xennet_xenbus.c xennet_checksum.c
xennetback_xenbus.c
Log Message:
drop the disabled M_EXT_ROMAP mbuf code, convert xennet_checksum_fill()
to use in_undefer_cksum() instead of custom code to compute the checksum
for Rx packets, and set csum_data appropriately for eventual hw offloading
make it possible to skip the sw checksum computation by appropriate Rx
flag similarily as we do for Tx
XXX for now, the Rx flag is mostly for testing as it only works for
dom0<->domu, need some further network stack changes to arrange for
the checksum to be eventually computed when packets goes outside xen
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/xen/include/xennet_checksum.h
cvs rdiff -u -r1.89 -r1.90 src/sys/arch/xen/xen/if_xennet_xenbus.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/xen/xen/xennet_checksum.c
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/xen/xen/xennetback_xenbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/include/xennet_checksum.h
diff -u src/sys/arch/xen/include/xennet_checksum.h:1.1 src/sys/arch/xen/include/xennet_checksum.h:1.2
--- src/sys/arch/xen/include/xennet_checksum.h:1.1 Wed Jul 12 15:02:15 2006
+++ src/sys/arch/xen/include/xennet_checksum.h Mon Mar 16 20:51:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: xennet_checksum.h,v 1.1 2006/07/12 15:02:15 yamt Exp $ */
+/* $NetBSD: xennet_checksum.h,v 1.2 2020/03/16 20:51:36 jdolecek Exp $ */
/*-
* Copyright (c)2006 YAMAMOTO Takashi,
@@ -29,8 +29,9 @@
#ifndef _XEN_XENNET_CHECKSUM_H_
#define _XEN_XENNET_CHECKSUM_H_
+struct ifnet;
struct mbuf;
-int xennet_checksum_fill(struct mbuf **);
+int xennet_checksum_fill(struct ifnet *, struct mbuf *);
#endif /* !_XEN_XENNET_CHECKSUM_H_ */
Index: src/sys/arch/xen/xen/if_xennet_xenbus.c
diff -u src/sys/arch/xen/xen/if_xennet_xenbus.c:1.89 src/sys/arch/xen/xen/if_xennet_xenbus.c:1.90
--- src/sys/arch/xen/xen/if_xennet_xenbus.c:1.89 Mon Mar 16 20:49:22 2020
+++ src/sys/arch/xen/xen/if_xennet_xenbus.c Mon Mar 16 20:51:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xennet_xenbus.c,v 1.89 2020/03/16 20:49:22 jdolecek Exp $ */
+/* $NetBSD: if_xennet_xenbus.c,v 1.90 2020/03/16 20:51:36 jdolecek Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -84,7 +84,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.89 2020/03/16 20:49:22 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.90 2020/03/16 20:51:36 jdolecek Exp $");
#include "opt_xen.h"
#include "opt_nfs_boot.h"
Index: src/sys/arch/xen/xen/xennet_checksum.c
diff -u src/sys/arch/xen/xen/xennet_checksum.c:1.5 src/sys/arch/xen/xen/xennet_checksum.c:1.6
--- src/sys/arch/xen/xen/xennet_checksum.c:1.5 Mon Mar 16 20:49:22 2020
+++ src/sys/arch/xen/xen/xennet_checksum.c Mon Mar 16 20:51:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: xennet_checksum.c,v 1.5 2020/03/16 20:49:22 jdolecek Exp $ */
+/* $NetBSD: xennet_checksum.c,v 1.6 2020/03/16 20:51:36 jdolecek Exp $ */
/*-
* Copyright (c)2006 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xennet_checksum.c,v 1.5 2020/03/16 20:49:22 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xennet_checksum.c,v 1.6 2020/03/16 20:51:36 jdolecek Exp $");
#include <sys/types.h>
#include <sys/param.h>
Index: src/sys/arch/xen/xen/xennetback_xenbus.c
diff -u src/sys/arch/xen/xen/xennetback_xenbus.c:1.77 src/sys/arch/xen/xen/xennetback_xenbus.c:1.78
--- src/sys/arch/xen/xen/xennetback_xenbus.c:1.77 Mon Mar 16 20:49:22 2020
+++ src/sys/arch/xen/xen/xennetback_xenbus.c Mon Mar 16 20:51:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: xennetback_xenbus.c,v 1.77 2020/03/16 20:49:22 jdolecek Exp $ */
+/* $NetBSD: xennetback_xenbus.c,v 1.78 2020/03/16 20:51:36 jdolecek Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xennetback_xenbus.c,v 1.77 2020/03/16 20:49:22 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xennetback_xenbus.c,v 1.78 2020/03/16 20:51:36 jdolecek Exp $");
#include "opt_xen.h"
