Module Name: src
Committed By: christos
Date: Sat Jun 15 13:05:35 UTC 2013
Modified Files:
src/sys/dev/pci: if_iwn.c if_iwnreg.h if_iwnvar.h
Log Message:
reflect the correct OpenBSD versions we are synced with.
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/pci/if_iwn.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/if_iwnreg.h
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/pci/if_iwnvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_iwn.c
diff -u src/sys/dev/pci/if_iwn.c:1.65 src/sys/dev/pci/if_iwn.c:1.66
--- src/sys/dev/pci/if_iwn.c:1.65 Sun Apr 21 15:59:40 2013
+++ src/sys/dev/pci/if_iwn.c Sat Jun 15 09:05:35 2013
@@ -1,5 +1,5 @@
-/* $NetBSD: if_iwn.c,v 1.65 2013/04/21 19:59:40 msaitoh Exp $ */
-/* $OpenBSD: if_iwn.c,v 1.96 2010/05/13 09:25:03 damien Exp $ */
+/* $NetBSD: if_iwn.c,v 1.66 2013/06/15 13:05:35 christos Exp $ */
+/* $OpenBSD: if_iwn.c,v 1.119 2013/05/29 23:16:52 yuo Exp $ */
/*-
* Copyright (c) 2007-2010 Damien Bergamini <damien.bergam...@free.fr>
@@ -22,7 +22,7 @@
* adapters.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.65 2013/04/21 19:59:40 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.66 2013/06/15 13:05:35 christos Exp $");
#define IWN_USE_RBUF /* Use local storage for RX */
#undef IWN_HWCRYPTO /* XXX does not even compile yet */
Index: src/sys/dev/pci/if_iwnreg.h
diff -u src/sys/dev/pci/if_iwnreg.h:1.11 src/sys/dev/pci/if_iwnreg.h:1.12
--- src/sys/dev/pci/if_iwnreg.h:1.11 Sat Mar 30 10:14:31 2013
+++ src/sys/dev/pci/if_iwnreg.h Sat Jun 15 09:05:35 2013
@@ -1,5 +1,5 @@
-/* $NetBSD: if_iwnreg.h,v 1.11 2013/03/30 14:14:31 christos Exp $ */
-/* $OpenBSD: if_iwnreg.h,v 1.40 2010/05/05 19:41:57 damien Exp $ */
+/* $NetBSD: if_iwnreg.h,v 1.12 2013/06/15 13:05:35 christos Exp $ */
+/* $OpenBSD: if_iwnreg.h,v 1.43 2011/09/01 18:49:56 kettenis Exp $ */
/*-
* Copyright (c) 2007, 2008
Index: src/sys/dev/pci/if_iwnvar.h
diff -u src/sys/dev/pci/if_iwnvar.h:1.13 src/sys/dev/pci/if_iwnvar.h:1.14
--- src/sys/dev/pci/if_iwnvar.h:1.13 Sun May 15 09:56:20 2011
+++ src/sys/dev/pci/if_iwnvar.h Sat Jun 15 09:05:35 2013
@@ -1,5 +1,5 @@
-/* $NetBSD: if_iwnvar.h,v 1.13 2011/05/15 13:56:20 christos Exp $ */
-/* $OpenBSD: if_iwnvar.h,v 1.19 2010/05/05 19:47:43 damien Exp $ */
+/* $NetBSD: if_iwnvar.h,v 1.14 2013/06/15 13:05:35 christos Exp $ */
+/* $OpenBSD: if_iwnvar.h,v 1.24 2012/11/17 14:02:51 kettenis Exp $ */
/*-
* Copyright (c) 2007, 2008
