Module Name: src
Committed By: snj
Date: Fri Aug 7 18:25:33 UTC 2009
Modified Files:
src/sys/dev/cardbus [netbsd-5]: if_ath_cardbus.c
src/sys/dev/pci [netbsd-5]: if_ath_pci.c
Log Message:
Pull up following revision(s) (requested by sborrill in ticket #903):
sys/dev/cardbus/if_ath_cardbus.c: revision 1.32
sys/dev/pci/if_ath_pci.c: revision 1.32
Sync ath(4) with the new HAL, mostly based on <jmcneill>'s patches.
Everything should be fine again !
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.31.4.1 src/sys/dev/cardbus/if_ath_cardbus.c
cvs rdiff -u -r1.31 -r1.31.4.1 src/sys/dev/pci/if_ath_pci.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/dev/cardbus/if_ath_cardbus.c
diff -u src/sys/dev/cardbus/if_ath_cardbus.c:1.31 src/sys/dev/cardbus/if_ath_cardbus.c:1.31.4.1
--- src/sys/dev/cardbus/if_ath_cardbus.c:1.31 Thu Jul 10 05:11:10 2008
+++ src/sys/dev/cardbus/if_ath_cardbus.c Fri Aug 7 18:25:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ath_cardbus.c,v 1.31 2008/07/10 05:11:10 cegger Exp $ */
+/* $NetBSD: if_ath_cardbus.c,v 1.31.4.1 2009/08/07 18:25:33 snj Exp $ */
/*
* Copyright (c) 2003
* Ichiro FUKUHARA <[email protected]>.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.31 2008/07/10 05:11:10 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.31.4.1 2009/08/07 18:25:33 snj Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -79,7 +79,8 @@
#include <dev/ic/ath_netbsd.h>
#include <dev/ic/athvar.h>
-#include <contrib/dev/ath/ah.h>
+
+#include <external/isc/atheros_hal/dist/ah.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: src/sys/dev/pci/if_ath_pci.c
diff -u src/sys/dev/pci/if_ath_pci.c:1.31 src/sys/dev/pci/if_ath_pci.c:1.31.4.1
--- src/sys/dev/pci/if_ath_pci.c:1.31 Wed Jul 9 19:47:24 2008
+++ src/sys/dev/pci/if_ath_pci.c Fri Aug 7 18:25:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ath_pci.c,v 1.31 2008/07/09 19:47:24 joerg Exp $ */
+/* $NetBSD: if_ath_pci.c,v 1.31.4.1 2009/08/07 18:25:33 snj Exp $ */
/*-
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -41,7 +41,7 @@
__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath_pci.c,v 1.11 2005/01/18 18:08:16 sam Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: if_ath_pci.c,v 1.31 2008/07/09 19:47:24 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ath_pci.c,v 1.31.4.1 2009/08/07 18:25:33 snj Exp $");
#endif
/*
@@ -68,9 +68,10 @@
#include <netinet/in.h>
#endif
+#include <external/isc/atheros_hal/dist/ah.h>
+
#include <dev/ic/ath_netbsd.h>
#include <dev/ic/athvar.h>
-#include <contrib/dev/ath/ah.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
