Module Name: src
Committed By: sevan
Date: Sat Apr 27 01:55:06 UTC 2019
Modified Files:
src/sys/dev/usb: if_athn_usb.c
Log Message:
Rename imask to intr_mask as imask is defined globally in
sys/arch/powerpc/include/intr.h:104 and this clashes.
Resolves build on macppc.
ok <pgoyette>
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/usb/if_athn_usb.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/usb/if_athn_usb.c
diff -u src/sys/dev/usb/if_athn_usb.c:1.31 src/sys/dev/usb/if_athn_usb.c:1.32
--- src/sys/dev/usb/if_athn_usb.c:1.31 Wed Oct 3 10:02:08 2018
+++ src/sys/dev/usb/if_athn_usb.c Sat Apr 27 01:55:05 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_athn_usb.c,v 1.31 2018/10/03 10:02:08 martin Exp $ */
+/* $NetBSD: if_athn_usb.c,v 1.32 2019/04/27 01:55:05 sevan Exp $ */
/* $OpenBSD: if_athn_usb.c,v 1.12 2013/01/14 09:50:31 jsing Exp $ */
/*-
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_athn_usb.c,v 1.31 2018/10/03 10:02:08 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_athn_usb.c,v 1.32 2019/04/27 01:55:05 sevan Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1422,7 +1422,7 @@ athn_usb_newstate_cb(struct athn_usb_sof
struct athn_softc *sc = &usc->usc_sc;
struct ieee80211com *ic = &sc->sc_ic;
enum ieee80211_state ostate, nstate;
- uint32_t reg, imask;
+ uint32_t reg, intr_mask;
int s;
DPRINTFN(DBG_FN, sc, "\n");
@@ -1479,13 +1479,13 @@ athn_usb_newstate_cb(struct athn_usb_sof
if (ic->ic_opmode == IEEE80211_M_HOSTAP) {
athn_set_hostap_timers(sc);
/* Enable software beacon alert interrupts. */
- imask = htobe32(AR_IMR_SWBA);
+ intr_mask = htobe32(AR_IMR_SWBA);
} else
#endif
{
athn_set_sta_timers(sc);
/* Enable beacon miss interrupts. */
- imask = htobe32(AR_IMR_BMISS);
+ intr_mask = htobe32(AR_IMR_BMISS);
/* Stop receiving beacons from other BSS. */
reg = AR_READ(sc, AR_RX_FILTER);
@@ -1495,7 +1495,7 @@ athn_usb_newstate_cb(struct athn_usb_sof
AR_WRITE_BARRIER(sc);
}
athn_usb_wmi_xcmd(usc, AR_WMI_CMD_ENABLE_INTR,
- &imask, sizeof(imask), NULL);
+ &intr_mask, sizeof(intr_mask), NULL);
break;
}
if (!usc->usc_dying)
