diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2005-09-08 12:44:57 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2005-09-08 12:44:57 +0000 |
| commit | f4f73313bc8e06be9400024e4958d7e0290a53c0 (patch) | |
| tree | 0939c6219d6bf5ec26fcd4deacd6977790fe58cc /sys/dev/ic | |
| parent | b8e5e021299a88f2cd4b6cde58cac13c02815ee6 (diff) | |
Remove the last of the FreeBSD compatiblity goop.
ok reyk@
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/ar5xxx.h | 3 | ||||
| -rw-r--r-- | sys/dev/ic/ath.c | 3 | ||||
| -rw-r--r-- | sys/dev/ic/atw.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/rtw.c | 3 |
4 files changed, 6 insertions, 9 deletions
diff --git a/sys/dev/ic/ar5xxx.h b/sys/dev/ic/ar5xxx.h index 2f86057c041..dbe4928c1f6 100644 --- a/sys/dev/ic/ar5xxx.h +++ b/sys/dev/ic/ar5xxx.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ar5xxx.h,v 1.25 2005/08/17 13:14:17 reyk Exp $ */ +/* $OpenBSD: ar5xxx.h,v 1.26 2005/09/08 12:44:55 jsg Exp $ */ /* * Copyright (c) 2004, 2005 Reyk Floeter <reyk@vantronix.net> @@ -57,7 +57,6 @@ #endif #include <net80211/ieee80211_var.h> -#include <net80211/ieee80211_compat.h> #include <net80211/ieee80211_radiotap.h> #include <net80211/ieee80211_regdomain.h> diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c index 7b5a964f7a1..a7c4ecd524e 100644 --- a/sys/dev/ic/ath.c +++ b/sys/dev/ic/ath.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ath.c,v 1.36 2005/09/08 09:11:07 jsg Exp $ */ +/* $OpenBSD: ath.c,v 1.37 2005/09/08 12:44:55 jsg Exp $ */ /* $NetBSD: ath.c,v 1.37 2004/08/18 21:59:39 dyoung Exp $ */ /*- @@ -78,7 +78,6 @@ #endif #include <net80211/ieee80211_var.h> -#include <net80211/ieee80211_compat.h> #include <dev/pci/pcidevs.h> #include <dev/gpio/gpiovar.h> diff --git a/sys/dev/ic/atw.c b/sys/dev/ic/atw.c index 0f8e245648a..a3ee829d921 100644 --- a/sys/dev/ic/atw.c +++ b/sys/dev/ic/atw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: atw.c,v 1.35 2005/08/27 09:13:50 avsm Exp $ */ +/* $OpenBSD: atw.c,v 1.36 2005/09/08 12:44:55 jsg Exp $ */ /* $NetBSD: atw.c,v 1.69 2004/07/23 07:07:55 dyoung Exp $ */ /*- @@ -77,7 +77,6 @@ __KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.69 2004/07/23 07:07:55 dyoung Exp $"); #endif #include <net80211/ieee80211_var.h> -#include <net80211/ieee80211_compat.h> #include <net80211/ieee80211_radiotap.h> #include <machine/bus.h> @@ -3814,7 +3813,8 @@ atw_start(struct ifnet *ifp) lasttx = nexttx; } - IASSERT(lasttx != -1, ("bad lastx")); + if (lasttx == -1) + panic("%s: bad lastx", ifp->if_xname); /* Set `first segment' and `last segment' appropriately. */ sc->sc_txdescs[sc->sc_txnext].at_flags |= htole32(ATW_TXFLAG_FS); diff --git a/sys/dev/ic/rtw.c b/sys/dev/ic/rtw.c index 2bd416e20dd..5dabd999df7 100644 --- a/sys/dev/ic/rtw.c +++ b/sys/dev/ic/rtw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtw.c,v 1.35 2005/07/18 02:43:27 fgsch Exp $ */ +/* $OpenBSD: rtw.c,v 1.36 2005/09/08 12:44:55 jsg Exp $ */ /* $NetBSD: rtw.c,v 1.29 2004/12/27 19:49:16 dyoung Exp $ */ /*- @@ -67,7 +67,6 @@ #endif #include <net80211/ieee80211_var.h> -#include <net80211/ieee80211_compat.h> #include <net80211/ieee80211_radiotap.h> #include <dev/ic/rtwreg.h> |