diff options
author | adrian <adrian@FreeBSD.org> | 2016-05-27 07:10:11 +0000 |
---|---|---|
committer | adrian <adrian@FreeBSD.org> | 2016-05-27 07:10:11 +0000 |
commit | 9593b923612bfed698bc7a64670c20d4901ca513 (patch) | |
tree | 471015120edfdba52bc26cc028e7df592464fcac | |
parent | 025a099e5b76000fcdee82f3d3ab2c3d0f8a73b2 (diff) | |
download | FreeBSD-src-9593b923612bfed698bc7a64670c20d4901ca513.zip FreeBSD-src-9593b923612bfed698bc7a64670c20d4901ca513.tar.gz |
[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@vdsz.com>
Obtained from: DragonflyBSD git 07dfed32ea39b980b0b80d27ff938e7c3ca4c0b5
-rw-r--r-- | sys/dev/iwm/if_iwm.c | 16 | ||||
-rw-r--r-- | sys/dev/iwm/if_iwmvar.h | 2 |
2 files changed, 2 insertions, 16 deletions
diff --git a/sys/dev/iwm/if_iwm.c b/sys/dev/iwm/if_iwm.c index 86a6e1d..d622d3f 100644 --- a/sys/dev/iwm/if_iwm.c +++ b/sys/dev/iwm/if_iwm.c @@ -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: diff --git a/sys/dev/iwm/if_iwmvar.h b/sys/dev/iwm/if_iwmvar.h index 849ded7..894dd80 100644 --- a/sys/dev/iwm/if_iwmvar.h +++ b/sys/dev/iwm/if_iwmvar.h @@ -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; |