From owner-svn-src-all@freebsd.org Fri May 27 07:10:13 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 33DA5B4B7D5; Fri, 27 May 2016 07:10:13 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DF83E1687; Fri, 27 May 2016 07:10:12 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4R7ACA8042446; Fri, 27 May 2016 07:10:12 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4R7ABJX042444; Fri, 27 May 2016 07:10:11 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201605270710.u4R7ABJX042444@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Fri, 27 May 2016 07:10:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r300833 - head/sys/dev/iwm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 May 2016 07:10:13 -0000 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 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;