--- if_pppoe.c.orig     2008-10-14 19:06:21.000000000 +0100
+++ if_pppoe.c  2008-10-14 19:06:07.000000000 +0100
@@ -310,12 +310,9 @@

        LIST_FOREACH(sc, &pppoe_softc_list, sc_list) {
                if (sc->sc_state == PPPOE_STATE_SESSION
-                   && sc->sc_session == session) {
-                       if (sc->sc_eth_if == rcvif)
-                               return (sc);
-                       else
-                               return (NULL);
-               }
+                   && sc->sc_session == session
+                   && sc->sc_eth_if == rcvif)
+                       return (sc);
        }
        return (NULL);
 }