From f2b29dd20024271accb0da41be636b3dc0766b84 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Wed, 12 Sep 2012 19:58:43 +0200
Subject: [PATCH] kernel: Remove some unused variables.

---
 sys/net/bridge/if_bridge.c    | 5 -----
 sys/net/if_ethersubr.c        | 2 --
 sys/net/ip_mroute/ip_mroute.c | 2 --
 sys/net/pf/if_pfsync.c        | 4 ----
 sys/net/tap/if_tap.c          | 2 --
 5 files changed, 15 deletions(-)

diff --git a/sys/net/bridge/if_bridge.c b/sys/net/bridge/if_bridge.c
index 37f3a35e41..7a7d31a96a 100644
--- a/sys/net/bridge/if_bridge.c
+++ b/sys/net/bridge/if_bridge.c
@@ -2521,7 +2521,6 @@ bridge_input(struct ifnet *ifp, struct mbuf *m)
 	struct ifnet *bifp, *new_ifp;
 	struct ether_header *eh;
 	struct mbuf *mc, *mc2;
-	int from_blocking;
 
 	ASSERT_IFNET_NOT_SERIALIZED_ALL(ifp);
 	mbuftrackid(m, 67);
@@ -2769,16 +2768,12 @@ bridge_input(struct ifnet *ifp, struct mbuf *m)
 	 *	 case (hence we only do it in LINK2), but it isn't quite as
 	 *	 bad as a broadcast packet looping.
 	 */
-	from_blocking = 0;
 	if (bif->bif_flags & IFBIF_STP) {
 		switch (bif->bif_state) {
 		case BSTP_IFSTATE_L1BLOCKING:
 		case BSTP_IFSTATE_LISTENING:
 		case BSTP_IFSTATE_DISABLED:
 			goto out;
-		case BSTP_IFSTATE_BLOCKING:
-			from_blocking = 1;
-			/* fall through */
 		default:
 			/* blocking, bonded, forwarding, learning */
 			break;
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index b93d47b915..18e138513c 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -855,7 +855,6 @@ altq_etherclassify(struct ifaltq *ifq, struct mbuf *m,
 	struct ether_header *eh;
 	uint16_t ether_type;
 	int hlen, af, hdrsize;
-	caddr_t hdr;
 
 	hlen = sizeof(struct ether_header);
 	eh = mtod(m, struct ether_header *);
@@ -890,7 +889,6 @@ altq_etherclassify(struct ifaltq *ifq, struct mbuf *m,
 		hlen -= m->m_len;
 		m = m->m_next;
 	}
-	hdr = m->m_data + hlen;
 	if (m->m_len < hlen + hdrsize) {
 		/*
 		 * ip header is not in a single mbuf.  this should not
diff --git a/sys/net/ip_mroute/ip_mroute.c b/sys/net/ip_mroute/ip_mroute.c
index b1d8c359a8..92dbc12f34 100644
--- a/sys/net/ip_mroute/ip_mroute.c
+++ b/sys/net/ip_mroute/ip_mroute.c
@@ -2119,7 +2119,6 @@ X_rsvp_input(struct mbuf **mp, int *offp, int proto)
     struct ip *ip = mtod(m, struct ip *);
     struct sockaddr_in rsvp_src = { sizeof rsvp_src, AF_INET };
     struct ifnet *ifp;
-    int off;
 #ifdef ALTQ
     /* support IP_RECVIF used by rsvpd rel4.2a1 */
     struct inpcb *inp;
@@ -2127,7 +2126,6 @@ X_rsvp_input(struct mbuf **mp, int *offp, int proto)
     struct mbuf *opts;
 #endif
 
-    off = *offp;
     *mp = NULL;
 
     if (rsvpdebug)
diff --git a/sys/net/pf/if_pfsync.c b/sys/net/pf/if_pfsync.c
index 7af299cd56..2cd430be4b 100644
--- a/sys/net/pf/if_pfsync.c
+++ b/sys/net/pf/if_pfsync.c
@@ -1413,7 +1413,6 @@ pfsync_pack_state(u_int8_t action, struct pf_state *st, int flags)
 int
 pfsync_request_update(struct pfsync_state_upd *up, struct in_addr *src)
 {
-	struct ifnet *ifp = NULL;
 	struct pfsync_header *h;
 	struct pfsync_softc *sc = pfsyncif;
 	struct pfsync_state_upd_req *rup;
@@ -1422,7 +1421,6 @@ pfsync_request_update(struct pfsync_state_upd *up, struct in_addr *src)
 	if (sc == NULL)
 		return (0);
 
-	ifp = &sc->sc_if;
 	if (sc->sc_mbuf == NULL) {
 		if ((sc->sc_mbuf = pfsync_get_mbuf(sc, PFSYNC_ACT_UREQ,
 		    (void *)&sc->sc_statep.s)) == NULL)
@@ -1459,7 +1457,6 @@ pfsync_request_update(struct pfsync_state_upd *up, struct in_addr *src)
 int
 pfsync_clear_states(u_int32_t creatorid, char *ifname)
 {
-	struct ifnet *ifp = NULL;
 	struct pfsync_softc *sc = pfsyncif;
 	struct pfsync_state_clr *cp;
 	int ret;
@@ -1467,7 +1464,6 @@ pfsync_clear_states(u_int32_t creatorid, char *ifname)
 	if (sc == NULL)
 		return (0);
 
-	ifp = &sc->sc_if;
 	crit_enter();
 	if (sc->sc_mbuf != NULL)
 		pfsync_sendout(sc);
diff --git a/sys/net/tap/if_tap.c b/sys/net/tap/if_tap.c
index f05fe4a1cf..a7cb035821 100644
--- a/sys/net/tap/if_tap.c
+++ b/sys/net/tap/if_tap.c
@@ -984,11 +984,9 @@ tapkqfilter(struct dev_kqfilter_args *ap)
 	struct knote *kn = ap->a_kn;
 	struct tap_softc *tp;
 	struct klist *list;
-	struct ifnet *ifp;
 
 	tp = dev->si_drv1;
 	list = &tp->tap_rkq.ki_note;
-	ifp = &tp->tap_if;
 	ap->a_result =0;
 
 	switch(kn->kn_filter) {
-- 
2.41.0