pppoe_dispatch_disc_pkt() has `off' argument which is always passed as
0. The diff below converts this argument to local variable.

Also this function breaks style(9) but I'll fix it with separate diff.

ok?

Index: sys/net/if_pppoe.c
===================================================================
RCS file: /cvs/src/sys/net/if_pppoe.c,v
retrieving revision 1.73
diff -u -p -r1.73 if_pppoe.c
--- sys/net/if_pppoe.c  13 Sep 2020 11:00:40 -0000      1.73
+++ sys/net/if_pppoe.c  30 Dec 2020 00:09:30 -0000
@@ -149,7 +149,7 @@ struct niqueue pppoeinq = NIQUEUE_INITIA
 
 /* input routines */
 static void pppoe_disc_input(struct mbuf *);
-static void pppoe_dispatch_disc_pkt(struct mbuf *, int);
+static void pppoe_dispatch_disc_pkt(struct mbuf *);
 static void pppoe_data_input(struct mbuf *);
 
 /* management routines */
@@ -357,7 +357,7 @@ pppoeintr(void)
 }
 
 /* Analyze and handle a single received packet while not in session state. */
-static void pppoe_dispatch_disc_pkt(struct mbuf *m, int off)
+static void pppoe_dispatch_disc_pkt(struct mbuf *m)
 {
        struct pppoe_softc *sc;
        struct pppoehdr *ph;
@@ -367,7 +367,7 @@ static void pppoe_dispatch_disc_pkt(stru
        const char *err_msg, *devname;
        size_t ac_cookie_len;
        size_t relay_sid_len;
-       int noff, err, errortag;
+       int off, noff, err, errortag;
        u_int16_t *max_payload;
        u_int16_t tag, len;
        u_int16_t session, plen;
@@ -377,6 +377,7 @@ static void pppoe_dispatch_disc_pkt(stru
 
        err_msg = NULL;
        devname = "pppoe";
+       off = 0;
        errortag = 0;
 
        if (m->m_len < sizeof(*eh)) {
@@ -653,7 +654,7 @@ pppoe_disc_input(struct mbuf *m)
        /* avoid error messages if there is not a single pppoe instance */
        if (!LIST_EMPTY(&pppoe_softc_list)) {
                KASSERT(m->m_flags & M_PKTHDR);
-               pppoe_dispatch_disc_pkt(m, 0);
+               pppoe_dispatch_disc_pkt(m);
        } else
                m_freem(m);
 }

Reply via email to