svn commit: r300833 - head/sys/dev/iwm
Adrian Chadd
adrian at FreeBSD.org
Fri May 27 07:10:13 UTC 2016
Author: adrian
Date: Fri May 27 07:10:11 2016
New Revision: 300833
URL: https://svnweb.freebsd.org/changeset/base/300833
Log:
[iwm] remove dead code.
if_iwm - GC some dead code, left by a partially applied OpenBSD change.
Taken-From: OpenBSD (if_iwm.c r1.69)
Submitted by: Imre Vadasz <imre at vdsz.com>
Obtained from: DragonflyBSD git 07dfed32ea39b980b0b80d27ff938e7c3ca4c0b5
Modified:
head/sys/dev/iwm/if_iwm.c
head/sys/dev/iwm/if_iwmvar.h
Modified: head/sys/dev/iwm/if_iwm.c
==============================================================================
--- head/sys/dev/iwm/if_iwm.c Fri May 27 07:05:30 2016 (r300832)
+++ head/sys/dev/iwm/if_iwm.c Fri May 27 07:10:11 2016 (r300833)
@@ -3829,7 +3829,6 @@ iwm_stop(struct iwm_softc *sc)
sc->sc_flags |= IWM_FLAG_STOPPED;
sc->sc_generation++;
sc->sc_scanband = 0;
- sc->sc_auth_prot = 0;
sc->sc_tx_timer = 0;
iwm_stop_device(sc);
}
@@ -4246,20 +4245,9 @@ iwm_notif_intr(struct iwm_softc *sc)
struct iwm_time_event_notif *notif;
SYNC_RESP_STRUCT(notif, pkt);
- if (notif->status) {
- if (le32toh(notif->action) &
- IWM_TE_V2_NOTIF_HOST_EVENT_START)
- sc->sc_auth_prot = 2;
- else
- sc->sc_auth_prot = 0;
- } else {
- sc->sc_auth_prot = -1;
- }
IWM_DPRINTF(sc, IWM_DEBUG_INTR,
- "%s: time event notification auth_prot=%d\n",
- __func__, sc->sc_auth_prot);
-
- wakeup(&sc->sc_auth_prot);
+ "TE notif status = 0x%x action = 0x%x\n",
+ notif->status, notif->action);
break; }
case IWM_MCAST_FILTER_CMD:
Modified: head/sys/dev/iwm/if_iwmvar.h
==============================================================================
--- head/sys/dev/iwm/if_iwmvar.h Fri May 27 07:05:30 2016 (r300832)
+++ head/sys/dev/iwm/if_iwmvar.h Fri May 27 07:10:11 2016 (r300833)
@@ -485,8 +485,6 @@ struct iwm_softc {
int sc_scan_last_antenna;
int sc_scanband;
- int sc_auth_prot;
-
int sc_fixed_ridx;
int sc_staid;
More information about the svn-src-all
mailing list