From 42a79bf8a2d0e664b18d2e8d2d77a6cee37881f3 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Fri, 4 Jan 2013 02:51:31 +0100 Subject: [PATCH] kernel: Remove some unused variables in netgraph/netgraph7. --- sys/netgraph/fec/ng_fec.c | 3 +-- sys/netgraph/lmi/ng_lmi.c | 4 ++++ sys/netgraph/pppoe/ng_pppoe.c | 3 --- sys/netgraph7/atm/ng_atm.c | 5 ----- sys/netgraph7/ether/ng_ether.c | 3 --- sys/netgraph7/ksocket/ng_ksocket.c | 5 ++--- sys/netgraph7/lmi/ng_lmi.c | 5 ++++- sys/netgraph7/netgraph/ng_base.c | 2 -- 8 files changed, 11 insertions(+), 19 deletions(-) diff --git a/sys/netgraph/fec/ng_fec.c b/sys/netgraph/fec/ng_fec.c index e7334df840..813f2c8692 100644 --- a/sys/netgraph/fec/ng_fec.c +++ b/sys/netgraph/fec/ng_fec.c @@ -409,7 +409,7 @@ static int ng_fec_delport(struct ng_fec_private *priv, char *iface) { struct ng_fec_bundle *b; - struct ifnet *ifp, *bifp; + struct ifnet *bifp; struct arpcom *ac; struct sockaddr_dl *sdl; struct ng_fec_portlist *p; @@ -418,7 +418,6 @@ ng_fec_delport(struct ng_fec_private *priv, char *iface) return(EINVAL); b = &priv->fec_bundle; - ifp = &priv->arpcom.ac_if; /* Find the interface */ bifp = ifunit(iface); diff --git a/sys/netgraph/lmi/ng_lmi.c b/sys/netgraph/lmi/ng_lmi.c index 51cb5f201b..54cda2b996 100644 --- a/sys/netgraph/lmi/ng_lmi.c +++ b/sys/netgraph/lmi/ng_lmi.c @@ -753,7 +753,9 @@ nglmi_checkdata(hook_p hook, struct mbuf *m, meta_p meta) u_char nextbyte; int seq_seen = 0; int resptype_seen = 0; /* 0 , 1 (partial) or 2 (full) */ +#if 0 int highest_dlci = 0; +#endif packetlen = m->m_hdr.mh_len; data = mtod(m, const u_char *); @@ -970,7 +972,9 @@ nglmi_checkdata(hook_p hook, struct mbuf *m, meta_p meta) log(LOG_WARNING, "nglmi: DLCI out of range\n"); goto reject; } +#if 0 highest_dlci = dlci; +#endif break; default: log(LOG_WARNING, diff --git a/sys/netgraph/pppoe/ng_pppoe.c b/sys/netgraph/pppoe/ng_pppoe.c index 0b8d64439e..abfaf72df4 100644 --- a/sys/netgraph/pppoe/ng_pppoe.c +++ b/sys/netgraph/pppoe/ng_pppoe.c @@ -883,7 +883,6 @@ ng_pppoe_rcvdata(hook_p hook, struct mbuf *m, meta_p meta) const struct pppoe_full_hdr *wh; const struct pppoe_hdr *ph; int error = 0; - u_int16_t session; u_int16_t length; u_int8_t code; const struct pppoe_tag *utag = NULL, *tag = NULL; @@ -919,7 +918,6 @@ AAA } wh = mtod(m, struct pppoe_full_hdr *); ph = &wh->ph; - session = ntohs(wh->ph.sid); length = ntohs(wh->ph.length); code = wh->ph.code; switch(wh->eh.ether_type) { @@ -1309,7 +1307,6 @@ AAA } wh = mtod(m, struct pppoe_full_hdr *); ph = &wh->ph; - session = ntohs(wh->ph.sid); length = ntohs(wh->ph.length); code = wh->ph.code; if ( code != PADI_CODE) { diff --git a/sys/netgraph7/atm/ng_atm.c b/sys/netgraph7/atm/ng_atm.c index 1875e62fa2..dcb6e66710 100644 --- a/sys/netgraph7/atm/ng_atm.c +++ b/sys/netgraph7/atm/ng_atm.c @@ -539,7 +539,6 @@ ng_atm_event_func(node_p node, hook_p hook, void *arg, int event) case ATMEV_FLOW_CONTROL: { struct atmev_flow_control *ev = arg; - struct ngm_queue_state *qstate; /* find the connection */ LIST_FOREACH(vcc, &priv->vccs, link) @@ -554,7 +553,6 @@ ng_atm_event_func(node_p node, hook_p hook, void *arg, int event) sizeof(struct ngm_queue_state), M_WAITOK | M_NULLOK); if (mesg == NULL) break; - qstate = (struct ngm_queue_state *)mesg->data; /* XXX have to figure out how to get that info */ @@ -654,7 +652,6 @@ static int ng_atm_cpcs_init(node_p node, const struct ngm_atm_cpcs_init *arg) { struct priv *priv = NG_NODE_PRIVATE(node); - const struct ifatm_mib *mib; struct ngvcc *vcc; struct atmio_openvcc data; int err; @@ -662,8 +659,6 @@ ng_atm_cpcs_init(node_p node, const struct ngm_atm_cpcs_init *arg) if(priv->ifp->if_ioctl == NULL) return (ENXIO); - mib = (const struct ifatm_mib *)(priv->ifp->if_linkmib); - LIST_FOREACH(vcc, &priv->vccs, link) if (strcmp(arg->name, NG_HOOK_NAME(vcc->hook)) == 0) break; diff --git a/sys/netgraph7/ether/ng_ether.c b/sys/netgraph7/ether/ng_ether.c index 6ac18487a5..9c6cfdc522 100644 --- a/sys/netgraph7/ether/ng_ether.c +++ b/sys/netgraph7/ether/ng_ether.c @@ -40,7 +40,6 @@ * Julian Elischer * * $FreeBSD: src/sys/netgraph/ng_ether.c,v 1.62 2007/03/20 00:36:10 bms Exp $ - * $DragonFly: src/sys/netgraph7/ng_ether.c,v 1.2 2008/06/26 23:05:35 dillon Exp $ */ /* @@ -642,7 +641,6 @@ ng_ether_rcv_upper(node_p node, struct mbuf *m) { const priv_p priv = NG_NODE_PRIVATE(node); struct ifnet *ifp = priv->ifp; - struct ether_header *eh; /* Check length and pull off header */ if (m->m_pkthdr.len < sizeof(struct ether_header)) { @@ -663,7 +661,6 @@ ng_ether_rcv_upper(node_p node, struct mbuf *m) } /* Route packet back in */ - eh = mtod(m, struct ether_header *); ether_demux_oncpu(ifp, m); return (0); } diff --git a/sys/netgraph7/ksocket/ng_ksocket.c b/sys/netgraph7/ksocket/ng_ksocket.c index 4d95df9404..097fc5a57b 100644 --- a/sys/netgraph7/ksocket/ng_ksocket.c +++ b/sys/netgraph7/ksocket/ng_ksocket.c @@ -666,7 +666,6 @@ ng_ksocket_rcvmsg(node_p node, item_p item, hook_p lasthook) struct ng_mesg *resp = NULL; int error = 0; struct ng_mesg *msg; - ng_ID_t raddr; NGI_GET_MSG(item, msg); switch (msg->header.typecookie) { @@ -725,7 +724,7 @@ ng_ksocket_rcvmsg(node_p node, item_p item, hook_p lasthook) * the connection when it comes in. */ priv->response_token = msg->header.token; - raddr = priv->response_addr = NGI_RETADDR(item); + priv->response_addr = NGI_RETADDR(item); if (error == 0) { ng_ksocket_finish_accept(priv); } else @@ -755,7 +754,7 @@ ng_ksocket_rcvmsg(node_p node, item_p item, hook_p lasthook) if ((so->so_state & SS_ISCONNECTING) != 0) { /* We will notify the sender when we connect */ priv->response_token = msg->header.token; - raddr = priv->response_addr = NGI_RETADDR(item); + priv->response_addr = NGI_RETADDR(item); priv->flags |= KSF_CONNECTING; ERROUT(EINPROGRESS); } diff --git a/sys/netgraph7/lmi/ng_lmi.c b/sys/netgraph7/lmi/ng_lmi.c index c8345c8508..594c7ebde7 100644 --- a/sys/netgraph7/lmi/ng_lmi.c +++ b/sys/netgraph7/lmi/ng_lmi.c @@ -38,7 +38,6 @@ * Author: Julian Elischer * * $FreeBSD: src/sys/netgraph/ng_lmi.c,v 1.25 2006/01/14 14:17:27 glebius Exp $ - * $DragonFly: src/sys/netgraph7/ng_lmi.c,v 1.2 2008/06/26 23:05:35 dillon Exp $ * $Whistle: ng_lmi.c,v 1.38 1999/11/01 09:24:52 julian Exp $ */ @@ -745,7 +744,9 @@ nglmi_checkdata(hook_p hook, struct mbuf *m) u_char nextbyte; int seq_seen = 0; int resptype_seen = 0; /* 0 , 1 (partial) or 2 (full) */ +#if 0 int highest_dlci = 0; +#endif packetlen = m->m_len; data = mtod(m, const u_char *); @@ -962,7 +963,9 @@ nglmi_checkdata(hook_p hook, struct mbuf *m) log(LOG_WARNING, "nglmi: DLCI out of range\n"); goto reject; } +#if 0 highest_dlci = dlci; +#endif break; default: log(LOG_WARNING, diff --git a/sys/netgraph7/netgraph/ng_base.c b/sys/netgraph7/netgraph/ng_base.c index 846b6fb5fb..0725b182cf 100644 --- a/sys/netgraph7/netgraph/ng_base.c +++ b/sys/netgraph7/netgraph/ng_base.c @@ -3198,10 +3198,8 @@ sysctl_debug_ng_dump_items(SYSCTL_HANDLER_ARGS) { int error; int val; - int i; val = allocated; - i = 1; error = sysctl_handle_int(oidp, &val, 0, req); if (error != 0 || req->newptr == NULL) return (error); -- 2.41.0