Module Name: src
Committed By: christos
Date: Tue Dec 27 01:31:06 UTC 2016
Modified Files:
src/sys/net: if_pppoe.c
Log Message:
fix merge conflict.
To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.123 src/sys/net/if_pppoe.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_pppoe.c
diff -u src/sys/net/if_pppoe.c:1.122 src/sys/net/if_pppoe.c:1.123
--- src/sys/net/if_pppoe.c:1.122 Mon Dec 26 18:21:49 2016
+++ src/sys/net/if_pppoe.c Mon Dec 26 20:31:06 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pppoe.c,v 1.122 2016/12/26 23:21:49 christos Exp $ */
+/* $NetBSD: if_pppoe.c,v 1.123 2016/12/27 01:31:06 christos Exp $ */
/*-
* Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.122 2016/12/26 23:21:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.123 2016/12/27 01:31:06 christos Exp $");
#ifdef _KERNEL_OPT
#include "pppoe.h"
@@ -235,7 +235,7 @@ static struct pppoe_softc * pppoe_find_s
struct ifnet *, krw_t);
static struct mbuf *pppoe_get_mbuf(size_t len);
-static void pppoe_ifattach_hook(void *, u_long, void *);
+static void pppoe_ifattach_hook(void *, unsigned long, void *);
static LIST_HEAD(pppoe_softc_head, pppoe_softc) pppoe_softc_list;
static krwlock_t pppoe_softc_list_lock;
@@ -1898,14 +1898,15 @@ pppoe_transmit(struct ifnet *ifp, struct
}
#endif /* PPPOE_MPSAFE */
-static int
-pppoe_ifattach_hook(void *arg, struct mbuf **mp, struct ifnet *ifp, int dir)
+static void
+pppoe_ifattach_hook(void *arg, unsigned long cmd, void *arg2)
{
+ struct ifnet *ifp = arg2;
struct pppoe_softc *sc;
DECLARE_SPLNET_VARIABLE;
- if (mp != (struct mbuf **)PFIL_IFNET_DETACH)
- return 0;
+ if (cmd != PFIL_IFNET_DETACH)
+ return;
ACQUIRE_SPLNET();
rw_enter(&pppoe_softc_list_lock, RW_READER);
@@ -1930,8 +1931,6 @@ pppoe_ifattach_hook(void *arg, struct mb
}
rw_exit(&pppoe_softc_list_lock);
RELEASE_SPLNET();
-
- return 0;
}
static void
