PERFORCE change 127318 for review
Xin LI
delphij at FreeBSD.org
Mon Oct 8 13:23:25 PDT 2007
http://perforce.freebsd.org/chv.cgi?CH=127318
Change 127318 by delphij at tarsier on 2007/10/08 20:22:47
IFC
Affected files ...
.. //depot/projects/delphij_fork/sys/boot/common/module.c#2 integrate
.. //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/ata/ata-all.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/ata/ata-chipset.c#3 integrate
.. //depot/projects/delphij_fork/sys/dev/ata/ata-pci.h#3 integrate
.. //depot/projects/delphij_fork/sys/dev/usb/usbdevs#7 integrate
.. //depot/projects/delphij_fork/sys/dev/usb/uscanner.c#2 integrate
.. //depot/projects/delphij_fork/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate
.. //depot/projects/delphij_fork/sys/fs/tmpfs/tmpfs_vfsops.c#7 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_mbuf.c#2 integrate
.. //depot/projects/delphij_fork/sys/kern/uipc_mbuf.c#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/accf_data.c#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/accf_http.c#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/if_ether.c#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/igmp.c#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/in.c#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/in_cksum.c#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/in_gif.c#3 integrate
.. //depot/projects/delphij_fork/sys/netinet/in_pcb.c#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/in_proto.c#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/in_rmx.c#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/ip_carp.c#3 integrate
.. //depot/projects/delphij_fork/sys/netinet/ip_divert.c#3 integrate
.. //depot/projects/delphij_fork/sys/netinet/ip_dummynet.c#4 integrate
.. //depot/projects/delphij_fork/sys/netinet/ip_ecn.c#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/ip_encap.c#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/ip_fastfwd.c#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/ip_fw2.c#7 integrate
.. //depot/projects/delphij_fork/sys/netinet/ip_fw_pfil.c#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/ip_gre.c#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/ip_icmp.c#3 integrate
.. //depot/projects/delphij_fork/sys/netinet/ip_id.c#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/ip_input.c#3 integrate
.. //depot/projects/delphij_fork/sys/netinet/ip_ipsec.c#3 integrate
.. //depot/projects/delphij_fork/sys/netinet/ip_mroute.c#4 integrate
.. //depot/projects/delphij_fork/sys/netinet/ip_options.c#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/ip_output.c#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/raw_ip.c#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctp_pcb.c#11 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctputil.c#11 integrate
.. //depot/projects/delphij_fork/sys/netinet/tcp_debug.c#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/tcp_hostcache.c#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/tcp_input.c#5 integrate
.. //depot/projects/delphij_fork/sys/netinet/tcp_output.c#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/tcp_reass.c#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/tcp_subr.c#7 integrate
.. //depot/projects/delphij_fork/sys/netinet/tcp_syncache.c#4 integrate
.. //depot/projects/delphij_fork/sys/netinet/tcp_timer.c#4 integrate
.. //depot/projects/delphij_fork/sys/netinet/tcp_timewait.c#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/tcp_usrreq.c#4 integrate
.. //depot/projects/delphij_fork/sys/netinet/udp_usrreq.c#5 integrate
.. //depot/projects/delphij_fork/sys/opencrypto/cryptodev.c#2 integrate
.. //depot/projects/delphij_fork/sys/sparc64/sparc64/pmap.c#3 integrate
.. //depot/projects/delphij_fork/sys/sys/mbuf.h#3 integrate
.. //depot/projects/delphij_fork/sys/vm/vm_fault.c#6 integrate
.. //depot/projects/delphij_fork/sys/vm/vm_page.c#6 integrate
Differences ...
==== //depot/projects/delphij_fork/sys/boot/common/module.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/common/module.c,v 1.26 2006/01/12 13:18:49 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/common/module.c,v 1.27 2007/10/04 18:29:52 obrien Exp $");
/*
* file/module function dispatcher, support, etc.
@@ -75,6 +75,7 @@
static char *kld_ext_list[] = {
".ko",
"",
+ ".debug",
NULL
};
==== //depot/projects/delphij_fork/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 (text+ko) ====
@@ -209,6 +209,8 @@
winner = dmu_buf_set_user(db, zap, &zap->zap_m.zap_phys, zap_evict);
if (winner != NULL) {
+ rw_exit(&zap->zap_rwlock);
+ rw_destroy(&zap->zap_rwlock);
if (!zap->zap_ismicro)
mutex_destroy(&zap->zap_f.zap_num_entries_mtx);
kmem_free(zap, sizeof (zap_t));
==== //depot/projects/delphij_fork/sys/dev/ata/ata-all.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.279 2007/02/23 16:25:08 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.280 2007/10/04 19:17:15 sos Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -738,7 +738,7 @@
atadev->flags &= ~ATA_D_48BIT_ACTIVE;
- if ((request->u.ata.lba >= ATA_MAX_28BIT_LBA ||
+ if (((request->u.ata.lba + request->u.ata.count) >= ATA_MAX_28BIT_LBA ||
request->u.ata.count > 256) &&
atadev->param.support.command2 & ATA_SUPPORT_ADDRESS48) {
==== //depot/projects/delphij_fork/sys/dev/ata/ata-chipset.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.199 2007/09/10 19:16:39 simon Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.201 2007/10/04 19:17:15 sos Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -1216,6 +1216,7 @@
{ ATA_AMD766, 0x00, AMDNVIDIA, AMDCABLE|AMDBUG, ATA_UDMA5, "766" },
{ ATA_AMD768, 0x00, AMDNVIDIA, AMDCABLE, ATA_UDMA5, "768" },
{ ATA_AMD8111, 0x00, AMDNVIDIA, AMDCABLE, ATA_UDMA6, "8111" },
+ { ATA_AMD5536, 0x00, AMDNVIDIA, 0x00, ATA_UDMA5, "CS5536" },
{ 0, 0, 0, 0, 0, 0}};
char buffer[64];
@@ -5095,6 +5096,7 @@
{ ATA_VIA8235, 0x00, VIA133, 0x00, ATA_UDMA6, "8235" },
{ ATA_VIA8237, 0x00, VIA133, 0x00, ATA_UDMA6, "8237" },
{ ATA_VIA8237A, 0x00, VIA133, 0x00, ATA_UDMA6, "8237A" },
+ { ATA_VIA8237S, 0x00, VIA133, 0x00, ATA_UDMA6, "8237S" },
{ ATA_VIA8251, 0x00, VIA133, 0x00, ATA_UDMA6, "8251" },
{ 0, 0, 0, 0, 0, 0 }};
static struct ata_chip_id new_ids[] =
@@ -5102,6 +5104,7 @@
{ ATA_VIA6420, 0x00, 7, 0x00, ATA_SA150, "6420" },
{ ATA_VIA6421, 0x00, 6, VIABAR, ATA_SA150, "6421" },
{ ATA_VIA8237A, 0x00, 7, 0x00, ATA_SA150, "8237A" },
+ { ATA_VIA8237S, 0x00, 7, 0x00, ATA_SA150, "8237S" },
{ ATA_VIA8251, 0x00, 0, VIAAHCI, ATA_SA300, "8251" },
{ 0, 0, 0, 0, 0, 0 }};
char buffer[64];
==== //depot/projects/delphij_fork/sys/dev/ata/ata-pci.h#3 (text+ko) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.78 2007/09/10 19:16:39 simon Exp $
+ * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.80 2007/10/04 19:17:16 sos Exp $
*/
/* structure holding chipset config info */
@@ -86,6 +86,7 @@
#define ATA_AMD766 0x74111022
#define ATA_AMD768 0x74411022
#define ATA_AMD8111 0x74691022
+#define ATA_AMD5536 0x209a1022
#define ATA_ACER_LABS_ID 0x10b9
#define ATA_ALI_1533 0x153310b9
@@ -357,6 +358,7 @@
#define ATA_VIA8235 0x31771106
#define ATA_VIA8237 0x32271106
#define ATA_VIA8237A 0x05911106
+#define ATA_VIA8237S 0x53371106
#define ATA_VIA8251 0x33491106
#define ATA_VIA8361 0x31121106
#define ATA_VIA8363 0x03051106
==== //depot/projects/delphij_fork/sys/dev/usb/usbdevs#7 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/sys/dev/usb/usbdevs,v 1.327 2007/08/29 21:00:57 imp Exp $
+$FreeBSD: src/sys/dev/usb/usbdevs,v 1.328 2007/10/05 07:26:39 luigi Exp $
/* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */
/*-
@@ -1198,6 +1198,8 @@
product EPSON 3500 0x080e CX-3500/3600/3650 MFP
product EPSON RX425 0x080f Stylus Photo RX425 scanner
product EPSON 4200 0x0820 CX4200 MP scanner
+product EPSON 5000 0x082b DX-50x0 MFP scanner
+product EPSON 6000 0x082e DX-60x0 MFP scanner
/* e-TEK Labs products */
product ETEK 1COM 0x8007 Serial
==== //depot/projects/delphij_fork/sys/dev/usb/uscanner.c#2 (text+ko) ====
@@ -5,7 +5,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/uscanner.c,v 1.88 2007/06/22 05:49:12 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uscanner.c,v 1.89 2007/10/05 07:26:39 luigi Exp $");
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -210,6 +210,8 @@
{{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_3590 }, 0 },
{{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_4200 }, 0 },
{{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_4990 }, 0 },
+ {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_5000 }, 0 },
+ {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_6000 }, 0 },
/* UMAX */
{{ USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1220U }, 0 },
@@ -314,12 +316,28 @@
uscanner_match(device_t self)
{
struct usb_attach_arg *uaa = device_get_ivars(self);
+ usb_interface_descriptor_t *id;
+
+ if (uaa->iface == NULL)
+ return UMATCH_NONE; /* do not grab the entire device */
+
+ if (uscanner_lookup(uaa->vendor, uaa->product) == NULL)
+ return UMATCH_NONE; /* not in the list of known devices */
+ id = usbd_get_interface_descriptor(uaa->iface);
+ if (id == NULL)
+ return UMATCH_NONE;
- if (uaa->iface != NULL)
+ /*
+ * There isn't a specific UICLASS for scanners, many vendors use
+ * UICLASS_VENDOR, so detecting the right interface is not so easy.
+ * But certainly we can exclude PRINTER and MASS - which some
+ * multifunction devices implement.
+ */
+ if (id->bInterfaceClass == UICLASS_PRINTER ||
+ id->bInterfaceClass == UICLASS_MASS)
return UMATCH_NONE;
- return (uscanner_lookup(uaa->vendor, uaa->product) != NULL ?
- UMATCH_VENDOR_PRODUCT : UMATCH_NONE);
+ return UMATCH_VENDOR_PRODUCT; /* ok we found it */
}
static int
@@ -331,20 +349,32 @@
usb_endpoint_descriptor_t *ed, *ed_bulkin = NULL, *ed_bulkout = NULL;
int i;
usbd_status err;
+ int ifnum;
sc->sc_dev = self;
sc->sc_dev_flags = uscanner_lookup(uaa->vendor, uaa->product)->flags;
sc->sc_udev = uaa->device;
+ id = usbd_get_interface_descriptor(uaa->iface);
+ ifnum = id->bInterfaceNumber;
+#if 0
+ /*
+ * This was in the original driver, but we cannot change the
+ * configuration of the whole device while attaching only to
+ * one of its interfaces. This can kill other already-attached
+ * driver, and/or possibly prevent this driver from attaching
+ * if an error occurs in set_config_no.
+ * If a device need setting the configuration, this must be done
+ * before attaching drivers to the various interfaces.
+ */
err = usbd_set_config_no(uaa->device, 1, 1); /* XXX */
if (err) {
printf("%s: setting config no failed\n",
device_get_nameunit(sc->sc_dev));
return ENXIO;
}
-
- /* XXX We only check the first interface */
- err = usbd_device2interface_handle(sc->sc_udev, 0, &sc->sc_iface);
+#endif
+ err = usbd_device2interface_handle(sc->sc_udev, ifnum, &sc->sc_iface);
if (!err && sc->sc_iface)
id = usbd_get_interface_descriptor(sc->sc_iface);
if (err || id == 0) {
==== //depot/projects/delphij_fork/sys/fs/pseudofs/pseudofs_vnops.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/fs/pseudofs/pseudofs_vnops.c,v 1.64 2007/06/07 15:04:30 bmah Exp $");
+__FBSDID("$FreeBSD: src/sys/fs/pseudofs/pseudofs_vnops.c,v 1.65 2007/10/05 17:37:25 jhb Exp $");
#include "opt_pseudofs.h"
@@ -417,7 +417,7 @@
got_pnode:
pfs_assert_not_owned(pd);
pfs_assert_not_owned(pn);
- visible = pfs_visible(curthread, pn, pvd->pvd_pid, NULL);
+ visible = pfs_visible(curthread, pn, pid, NULL);
if (!visible) {
error = ENOENT;
goto failed;
==== //depot/projects/delphij_fork/sys/fs/tmpfs/tmpfs_vfsops.c#7 (text+ko) ====
@@ -48,7 +48,7 @@
* allocate and release resources.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_vfsops.c,v 1.9 2007/08/10 05:24:49 delphij Exp $");
+__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_vfsops.c,v 1.11 2007/10/04 17:11:48 delphij Exp $");
#include <sys/param.h>
#include <sys/limits.h>
@@ -85,7 +85,7 @@
/* --------------------------------------------------------------------- */
static const char *tmpfs_opts[] = {
- "from", "size", "inodes", "uid", "gid", "mode",
+ "from", "size", "inodes", "uid", "gid", "mode", "export",
NULL
};
@@ -215,6 +215,9 @@
return EOPNOTSUPP;
}
+ printf("WARNING: TMPFS is considered to be a highly experimental "
+ "feature in FreeBSD.\n");
+
vn_lock(mp->mnt_vnodecovered, LK_SHARED | LK_RETRY, td);
error = VOP_GETATTR(mp->mnt_vnodecovered, &va, mp->mnt_cred, td);
VOP_UNLOCK(mp->mnt_vnodecovered, 0, td);
==== //depot/projects/delphij_fork/sys/kern/kern_mbuf.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_mbuf.c,v 1.30 2007/06/04 18:25:07 dwmalone Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_mbuf.c,v 1.32 2007/10/06 21:42:39 kmacy Exp $");
#include "opt_mac.h"
#include "opt_param.h"
@@ -339,11 +339,15 @@
mb_dtor_mbuf(void *mem, int size, void *arg)
{
struct mbuf *m;
+ unsigned long flags;
m = (struct mbuf *)mem;
- if ((m->m_flags & M_PKTHDR) != 0)
+ flags = (unsigned long)arg;
+
+ if ((flags & MB_NOTAGS) == 0 && (m->m_flags & M_PKTHDR) != 0)
m_tag_delete_chain(m, NULL);
KASSERT((m->m_flags & M_EXT) == 0, ("%s: M_EXT set", __func__));
+ KASSERT((m->m_flags & M_NOFREE) == 0, ("%s: M_NOFREE set", __func__));
#ifdef INVARIANTS
trash_dtor(mem, size, arg);
#endif
@@ -527,7 +531,7 @@
m->m_len = 0;
m->m_flags = (flags | M_EXT);
m->m_type = type;
-
+
if (flags & M_PKTHDR) {
m->m_pkthdr.rcvif = NULL;
m->m_pkthdr.len = 0;
==== //depot/projects/delphij_fork/sys/kern/uipc_mbuf.c#2 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/uipc_mbuf.c,v 1.173 2007/05/16 20:41:07 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_mbuf.c,v 1.174 2007/10/06 21:42:39 kmacy Exp $");
#include "opt_mac.h"
#include "opt_param.h"
@@ -211,9 +211,17 @@
void
mb_free_ext(struct mbuf *m)
{
+ int skipmbuf;
+
KASSERT((m->m_flags & M_EXT) == M_EXT, ("%s: M_EXT not set", __func__));
KASSERT(m->m_ext.ref_cnt != NULL, ("%s: ref_cnt not set", __func__));
+
+ /*
+ * check if the header is embedded in the cluster
+ */
+ skipmbuf = (m->m_flags & M_NOFREE);
+
/* Free attached storage if this mbuf is the only reference to it. */
if (*(m->m_ext.ref_cnt) == 1 ||
atomic_fetchadd_int(m->m_ext.ref_cnt, -1) == 1) {
@@ -254,6 +262,9 @@
("%s: unknown ext_type", __func__));
}
}
+ if (skipmbuf)
+ return;
+
/*
* Free this mbuf back to the mbuf zone with all m_ext
* information purged.
==== //depot/projects/delphij_fork/sys/netinet/accf_data.c#2 (text+ko) ====
@@ -22,10 +22,11 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * $FreeBSD: src/sys/netinet/accf_data.c,v 1.10 2004/05/30 20:23:30 phk Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/netinet/accf_data.c,v 1.11 2007/10/07 20:44:22 silby Exp $");
+
#define ACCEPT_FILTER_MOD
#include <sys/param.h>
==== //depot/projects/delphij_fork/sys/netinet/accf_http.c#2 (text+ko) ====
@@ -23,10 +23,11 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * $FreeBSD: src/sys/netinet/accf_http.c,v 1.16 2005/01/07 01:45:44 imp Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/netinet/accf_http.c,v 1.17 2007/10/07 20:44:22 silby Exp $");
+
#define ACCEPT_FILTER_MOD
#include <sys/param.h>
==== //depot/projects/delphij_fork/sys/netinet/if_ether.c#2 (text+ko) ====
@@ -27,7 +27,6 @@
* SUCH DAMAGE.
*
* @(#)if_ether.c 8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/netinet/if_ether.c,v 1.161 2007/05/10 15:58:46 rwatson Exp $
*/
/*
@@ -36,6 +35,9 @@
* add "inuse/lock" bit (or ref. count) along with valid bit
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/netinet/if_ether.c,v 1.162 2007/10/07 20:44:22 silby Exp $");
+
#include "opt_inet.h"
#include "opt_mac.h"
#include "opt_carp.h"
==== //depot/projects/delphij_fork/sys/netinet/igmp.c#2 (text+ko) ====
@@ -31,7 +31,6 @@
* SUCH DAMAGE.
*
* @(#)igmp.c 8.1 (Berkeley) 7/19/93
- * $FreeBSD: src/sys/netinet/igmp.c,v 1.53 2006/12/04 00:41:48 rwatson Exp $
*/
/*
@@ -45,6 +44,9 @@
* MULTICAST Revision: 3.5.1.4
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/netinet/igmp.c,v 1.54 2007/10/07 20:44:22 silby Exp $");
+
#include "opt_mac.h"
#include <sys/param.h>
==== //depot/projects/delphij_fork/sys/netinet/in.c#2 (text+ko) ====
@@ -28,9 +28,11 @@
* SUCH DAMAGE.
*
* @(#)in.c 8.4 (Berkeley) 1/9/95
- * $FreeBSD: src/sys/netinet/in.c,v 1.101 2007/06/17 00:31:24 mjacob Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/netinet/in.c,v 1.102 2007/10/07 20:44:22 silby Exp $");
+
#include "opt_carp.h"
#include <sys/param.h>
==== //depot/projects/delphij_fork/sys/netinet/in_cksum.c#2 (text+ko) ====
@@ -27,9 +27,11 @@
* SUCH DAMAGE.
*
* @(#)in_cksum.c 8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/netinet/in_cksum.c,v 1.9 2007/05/10 15:58:46 rwatson Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/netinet/in_cksum.c,v 1.10 2007/10/07 20:44:22 silby Exp $");
+
#include <sys/param.h>
#include <sys/mbuf.h>
==== //depot/projects/delphij_fork/sys/netinet/in_gif.c#3 (text+ko) ====
@@ -1,4 +1,3 @@
-/* $FreeBSD: src/sys/netinet/in_gif.c,v 1.37 2007/09/23 17:50:17 csjp Exp $ */
/* $KAME: in_gif.c,v 1.54 2001/05/14 14:02:16 itojun Exp $ */
/*-
@@ -30,6 +29,9 @@
* SUCH DAMAGE.
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/netinet/in_gif.c,v 1.38 2007/10/07 20:44:22 silby Exp $");
+
#include "opt_mrouting.h"
#include "opt_inet.h"
#include "opt_inet6.h"
==== //depot/projects/delphij_fork/sys/netinet/in_pcb.c#2 (text+ko) ====
@@ -29,9 +29,11 @@
* SUCH DAMAGE.
*
* @(#)in_pcb.c 8.4 (Berkeley) 5/24/95
- * $FreeBSD: src/sys/netinet/in_pcb.c,v 1.195 2007/07/03 12:13:43 gnn Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/netinet/in_pcb.c,v 1.196 2007/10/07 20:44:22 silby Exp $");
+
#include "opt_ddb.h"
#include "opt_ipsec.h"
#include "opt_inet6.h"
==== //depot/projects/delphij_fork/sys/netinet/in_proto.c#2 (text+ko) ====
@@ -27,9 +27,11 @@
* SUCH DAMAGE.
*
* @(#)in_proto.c 8.2 (Berkeley) 2/9/95
- * $FreeBSD: src/sys/netinet/in_proto.c,v 1.86 2007/07/03 12:13:43 gnn Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/netinet/in_proto.c,v 1.87 2007/10/07 20:44:22 silby Exp $");
+
#include "opt_ipx.h"
#include "opt_mrouting.h"
#include "opt_ipsec.h"
==== //depot/projects/delphij_fork/sys/netinet/in_rmx.c#2 (text+ko) ====
@@ -25,8 +25,6 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * $FreeBSD: src/sys/netinet/in_rmx.c,v 1.56 2007/05/10 15:58:47 rwatson Exp $
*/
/*
@@ -42,6 +40,9 @@
* indefinitely. See in_rtqtimo() below for the exact mechanism.
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/netinet/in_rmx.c,v 1.57 2007/10/07 20:44:22 silby Exp $");
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
==== //depot/projects/delphij_fork/sys/netinet/ip_carp.c#3 (text+ko) ====
@@ -1,5 +1,3 @@
-/* $FreeBSD: src/sys/netinet/ip_carp.c,v 1.51 2007/07/28 07:31:30 rwatson Exp $ */
-
/*
* Copyright (c) 2002 Michael Shalayeff. All rights reserved.
* Copyright (c) 2003 Ryan McBride. All rights reserved.
@@ -26,6 +24,9 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/netinet/ip_carp.c,v 1.52 2007/10/07 20:44:22 silby Exp $");
+
#include "opt_carp.h"
#include "opt_bpf.h"
#include "opt_inet.h"
==== //depot/projects/delphij_fork/sys/netinet/ip_divert.c#3 (text+ko) ====
@@ -25,10 +25,11 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * $FreeBSD: src/sys/netinet/ip_divert.c,v 1.129 2007/08/06 22:06:36 csjp Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/netinet/ip_divert.c,v 1.130 2007/10/07 20:44:22 silby Exp $");
+
#if !defined(KLD_MODULE)
#include "opt_inet.h"
#include "opt_ipfw.h"
==== //depot/projects/delphij_fork/sys/netinet/ip_dummynet.c#4 (text+ko) ====
@@ -23,10 +23,11 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * $FreeBSD: src/sys/netinet/ip_dummynet.c,v 1.109 2007/08/06 14:26:01 rwatson Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/netinet/ip_dummynet.c,v 1.110 2007/10/07 20:44:22 silby Exp $");
+
#define DUMMYNET_DEBUG
#include "opt_inet6.h"
==== //depot/projects/delphij_fork/sys/netinet/ip_ecn.c#2 (text+ko) ====
@@ -1,4 +1,3 @@
-/* $FreeBSD: src/sys/netinet/ip_ecn.c,v 1.8 2007/05/10 15:58:47 rwatson Exp $ */
/* $KAME: ip_ecn.c,v 1.12 2002/01/07 11:34:47 kjc Exp $ */
/*-
@@ -35,6 +34,9 @@
* http://www.aciri.org/floyd/papers/draft-ipsec-ecn-00.txt
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/netinet/ip_ecn.c,v 1.9 2007/10/07 20:44:22 silby Exp $");
+
#include "opt_inet.h"
#include "opt_inet6.h"
==== //depot/projects/delphij_fork/sys/netinet/ip_encap.c#2 (text+ko) ====
@@ -1,4 +1,3 @@
-/* $FreeBSD: src/sys/netinet/ip_encap.c,v 1.23 2007/05/10 15:58:47 rwatson Exp $ */
/* $KAME: ip_encap.c,v 1.41 2001/03/15 08:35:08 itojun Exp $ */
/*-
@@ -57,6 +56,9 @@
*/
/* XXX is M_NETADDR correct? */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/netinet/ip_encap.c,v 1.24 2007/10/07 20:44:23 silby Exp $");
+
#include "opt_mrouting.h"
#include "opt_inet.h"
#include "opt_inet6.h"
==== //depot/projects/delphij_fork/sys/netinet/ip_fastfwd.c#2 (text+ko) ====
@@ -25,8 +25,6 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * $FreeBSD: src/sys/netinet/ip_fastfwd.c,v 1.40 2007/03/18 23:05:20 bms Exp $
*/
/*
@@ -75,6 +73,9 @@
* is being followed here.
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/netinet/ip_fastfwd.c,v 1.41 2007/10/07 20:44:23 silby Exp $");
+
#include "opt_ipfw.h"
#include "opt_ipstealth.h"
==== //depot/projects/delphij_fork/sys/netinet/ip_fw2.c#7 (text+ko) ====
@@ -21,10 +21,11 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * $FreeBSD: src/sys/netinet/ip_fw2.c,v 1.174 2007/09/29 15:01:41 maxim Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/netinet/ip_fw2.c,v 1.175 2007/10/07 20:44:23 silby Exp $");
+
#define DEB(x)
#define DDB(x) x
==== //depot/projects/delphij_fork/sys/netinet/ip_fw_pfil.c#2 (text+ko) ====
@@ -22,10 +22,11 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * $FreeBSD: src/sys/netinet/ip_fw_pfil.c,v 1.24 2006/12/29 21:59:17 piso Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/netinet/ip_fw_pfil.c,v 1.25 2007/10/07 20:44:23 silby Exp $");
+
#if !defined(KLD_MODULE)
#include "opt_ipfw.h"
#include "opt_ipdn.h"
==== //depot/projects/delphij_fork/sys/netinet/ip_gre.c#2 (text+ko) ====
@@ -1,5 +1,4 @@
/* $NetBSD: ip_gre.c,v 1.29 2003/09/05 23:02:43 itojun Exp $ */
-/* $FreeBSD$ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -45,6 +44,9 @@
* This currently handles IPPROTO_GRE, IPPROTO_MOBILE
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
#include "opt_inet.h"
#include "opt_atalk.h"
#include "opt_inet6.h"
==== //depot/projects/delphij_fork/sys/netinet/ip_icmp.c#3 (text+ko) ====
@@ -27,9 +27,11 @@
* SUCH DAMAGE.
*
* @(#)ip_icmp.c 8.2 (Berkeley) 1/4/94
- * $FreeBSD: src/sys/netinet/ip_icmp.c,v 1.117 2007/07/19 22:34:25 rwatson Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/netinet/ip_icmp.c,v 1.118 2007/10/07 20:44:23 silby Exp $");
+
#include "opt_ipsec.h"
#include "opt_mac.h"
==== //depot/projects/delphij_fork/sys/netinet/ip_id.c#2 (text+ko) ====
@@ -33,8 +33,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD: src/sys/netinet/ip_id.c,v 1.8 2007/05/11 11:05:30 rwatson Exp $
*/
/*-
@@ -57,6 +55,9 @@
* caused by reseeding.
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/netinet/ip_id.c,v 1.9 2007/10/07 20:44:23 silby Exp $");
+
#include "opt_pf.h"
#include <sys/param.h>
#include <sys/time.h>
==== //depot/projects/delphij_fork/sys/netinet/ip_input.c#3 (text+ko) ====
@@ -27,9 +27,11 @@
* SUCH DAMAGE.
*
* @(#)ip_input.c 8.2 (Berkeley) 1/4/94
- * $FreeBSD: src/sys/netinet/ip_input.c,v 1.331 2007/08/05 16:16:15 bz Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/netinet/ip_input.c,v 1.332 2007/10/07 20:44:23 silby Exp $");
+
#include "opt_bootp.h"
#include "opt_ipfw.h"
#include "opt_ipstealth.h"
==== //depot/projects/delphij_fork/sys/netinet/ip_ipsec.c#3 (text+ko) ====
@@ -25,10 +25,11 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * $FreeBSD: src/sys/netinet/ip_ipsec.c,v 1.7 2007/08/05 16:16:15 bz Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/netinet/ip_ipsec.c,v 1.8 2007/10/07 20:44:23 silby Exp $");
+
#include "opt_ipsec.h"
#include <sys/param.h>
==== //depot/projects/delphij_fork/sys/netinet/ip_mroute.c#4 (text+ko) ====
@@ -51,10 +51,11 @@
* MROUTING Revision: 3.5
* and PIM-SMv2 and PIM-DM support, advanced API support,
* bandwidth metering and signaling
- *
- * $FreeBSD: src/sys/netinet/ip_mroute.c,v 1.137 2007/08/06 14:26:01 rwatson Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/netinet/ip_mroute.c,v 1.138 2007/10/07 20:44:23 silby Exp $");
+
#include "opt_inet.h"
#include "opt_inet6.h"
#include "opt_mac.h"
==== //depot/projects/delphij_fork/sys/netinet/ip_options.c#2 (text+ko) ====
@@ -27,10 +27,11 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * $FreeBSD: src/sys/netinet/ip_options.c,v 1.5 2007/05/11 10:48:30 rwatson Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/netinet/ip_options.c,v 1.6 2007/10/07 20:44:23 silby Exp $");
+
#include "opt_ipstealth.h"
#include "opt_mac.h"
==== //depot/projects/delphij_fork/sys/netinet/ip_output.c#2 (text+ko) ====
@@ -27,9 +27,11 @@
* SUCH DAMAGE.
*
* @(#)ip_output.c 8.3 (Berkeley) 1/21/94
- * $FreeBSD: src/sys/netinet/ip_output.c,v 1.275 2007/07/03 12:13:43 gnn Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/netinet/ip_output.c,v 1.276 2007/10/07 20:44:23 silby Exp $");
+
#include "opt_ipfw.h"
#include "opt_ipsec.h"
#include "opt_mac.h"
==== //depot/projects/delphij_fork/sys/netinet/raw_ip.c#2 (text+ko) ====
@@ -27,9 +27,11 @@
* SUCH DAMAGE.
*
* @(#)raw_ip.c 8.7 (Berkeley) 5/15/95
- * $FreeBSD: src/sys/netinet/raw_ip.c,v 1.179 2007/07/03 12:13:43 gnn Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/netinet/raw_ip.c,v 1.180 2007/10/07 20:44:23 silby Exp $");
+
#include "opt_inet6.h"
#include "opt_ipsec.h"
#include "opt_mac.h"
==== //depot/projects/delphij_fork/sys/netinet/sctp_pcb.c#11 (text+ko) ====
@@ -31,7 +31,7 @@
/* $KAME: sctp_pcb.c,v 1.38 2005/03/06 16:04:18 itojun Exp $ */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/sctp_pcb.c,v 1.61 2007/10/01 03:22:28 rrs Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/sctp_pcb.c,v 1.62 2007/10/06 13:23:42 rrs Exp $");
#include <netinet/sctp_os.h>
#include <sys/proc.h>
@@ -4235,6 +4235,7 @@
SS_ISCONNECTED);
}
SOCK_UNLOCK(so);
+ socantrcvmore(so);
sctp_sowwakeup(inp, so);
sctp_sorwakeup(inp, so);
SCTP_SOWAKEUP(so);
==== //depot/projects/delphij_fork/sys/netinet/sctputil.c#11 (text+ko) ====
@@ -31,7 +31,7 @@
/* $KAME: sctputil.c,v 1.37 2005/03/07 23:26:09 itojun Exp $ */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/sctputil.c,v 1.64 2007/10/01 03:22:29 rrs Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/sctputil.c,v 1.65 2007/10/04 09:29:33 rrs Exp $");
#include <netinet/sctp_os.h>
#include <netinet/sctp_pcb.h>
@@ -5009,7 +5009,8 @@
so->so_error = 0;
} else {
SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTPUTIL, ENOTCONN);
- error = ENOTCONN;
+ /* indicate EOF */
+ error = 0;
}
goto out;
}
==== //depot/projects/delphij_fork/sys/netinet/tcp_debug.c#2 (text+ko) ====
@@ -28,9 +28,11 @@
* SUCH DAMAGE.
*
* @(#)tcp_debug.c 8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/netinet/tcp_debug.c,v 1.28 2007/05/07 14:05:23 rwatson Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/netinet/tcp_debug.c,v 1.29 2007/10/07 20:44:23 silby Exp $");
+
#include "opt_inet.h"
#include "opt_inet6.h"
#include "opt_tcpdebug.h"
==== //depot/projects/delphij_fork/sys/netinet/tcp_hostcache.c#2 (text+ko) ====
@@ -25,8 +25,6 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * $FreeBSD: src/sys/netinet/tcp_hostcache.c,v 1.16 2007/06/08 13:43:28 yar Exp $
*/
/*
@@ -64,6 +62,9 @@
* followed here.
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/netinet/tcp_hostcache.c,v 1.17 2007/10/07 20:44:23 silby Exp $");
+
#include "opt_inet6.h"
#include <sys/param.h>
==== //depot/projects/delphij_fork/sys/netinet/tcp_input.c#5 (text+ko) ====
@@ -27,9 +27,11 @@
* SUCH DAMAGE.
*
* @(#)tcp_input.c 8.12 (Berkeley) 5/24/95
- * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.368 2007/09/10 14:49:32 kensmith Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/netinet/tcp_input.c,v 1.370 2007/10/07 20:44:23 silby Exp $");
+
#include "opt_ipfw.h" /* for ipfw_fwd */
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -1573,9 +1575,9 @@
KASSERT(headlocked, ("%s: trimthenstep6: tcp_close.3: head "
"not locked", __func__));
if ((s = tcp_log_addrs(&tp->t_inpcb->inp_inc, th, NULL, NULL))) {
- log(LOG_DEBUG, "%s; %s: %s: Received data after socket "
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list