summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorbrooks <brooks@FreeBSD.org>2009-12-31 20:29:58 +0000
committerbrooks <brooks@FreeBSD.org>2009-12-31 20:29:58 +0000
commita5cc24440bfbf4dc6eeb27b3770d09132b85bd31 (patch)
tree5056962dae0f4e2a29ef2bc9e81b2303cf37d6a1 /sys
parent2521baf3fe6bd48029ce31d5a4a71014bf96f1d0 (diff)
downloadFreeBSD-src-a5cc24440bfbf4dc6eeb27b3770d09132b85bd31.zip
FreeBSD-src-a5cc24440bfbf4dc6eeb27b3770d09132b85bd31.tar.gz
The devices that supported EVFILT_NETDEV kqueue filters were removed in
r195175. Remove all definitions, documentation, and usage. fifo_misc.c: Remove all kqueue tests as fifo_io.c performs all those that would have remained. Reviewed by: rwatson MFC after: 3 weeks X-MFC note: don't change vlan_link_state() function signature
Diffstat (limited to 'sys')
-rw-r--r--sys/kern/kern_event.c2
-rw-r--r--sys/net/if.c11
-rw-r--r--sys/net/if_vlan.c6
-rw-r--r--sys/sys/event.h9
4 files changed, 7 insertions, 21 deletions
diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c
index 7c40594..96a811d 100644
--- a/sys/kern/kern_event.c
+++ b/sys/kern/kern_event.c
@@ -279,7 +279,7 @@ static struct {
{ &proc_filtops }, /* EVFILT_PROC */
{ &sig_filtops }, /* EVFILT_SIGNAL */
{ &timer_filtops }, /* EVFILT_TIMER */
- { &file_filtops }, /* EVFILT_NETDEV */
+ { &null_filtops }, /* former EVFILT_NETDEV */
{ &fs_filtops }, /* EVFILT_FS */
{ &null_filtops }, /* EVFILT_LIO */
{ &user_filtops }, /* EVFILT_USER */
diff --git a/sys/net/if.c b/sys/net/if.c
index 7029b9c..ad77d65 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -1819,7 +1819,7 @@ if_route(struct ifnet *ifp, int flag, int fam)
#endif
}
-void (*vlan_link_state_p)(struct ifnet *, int); /* XXX: private from if_vlan */
+void (*vlan_link_state_p)(struct ifnet *); /* XXX: private from if_vlan */
void (*vlan_trunk_cap_p)(struct ifnet *); /* XXX: private from if_vlan */
/*
@@ -1845,19 +1845,12 @@ do_link_state_change(void *arg, int pending)
{
struct ifnet *ifp = (struct ifnet *)arg;
int link_state = ifp->if_link_state;
- int link;
CURVNET_SET(ifp->if_vnet);
/* Notify that the link state has changed. */
rt_ifmsg(ifp);
- if (link_state == LINK_STATE_UP)
- link = NOTE_LINKUP;
- else if (link_state == LINK_STATE_DOWN)
- link = NOTE_LINKDOWN;
- else
- link = NOTE_LINKINV;
if (ifp->if_vlantrunk != NULL)
- (*vlan_link_state_p)(ifp, link);
+ (*vlan_link_state_p)(ifp);
if ((ifp->if_type == IFT_ETHER || ifp->if_type == IFT_L2VLAN) &&
IFP2AC(ifp)->ac_netgraph != NULL)
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index 99f714e..1fd70d5 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -188,7 +188,7 @@ static int vlan_setmulti(struct ifnet *ifp);
static int vlan_unconfig(struct ifnet *ifp);
static int vlan_unconfig_locked(struct ifnet *ifp);
static int vlan_config(struct ifvlan *ifv, struct ifnet *p, uint16_t tag);
-static void vlan_link_state(struct ifnet *ifp, int link);
+static void vlan_link_state(struct ifnet *ifp);
static void vlan_capabilities(struct ifvlan *ifv);
static void vlan_trunk_capabilities(struct ifnet *ifp);
@@ -525,7 +525,7 @@ restart:
extern void (*vlan_input_p)(struct ifnet *, struct mbuf *);
/* For if_link_state_change() eyes only... */
-extern void (*vlan_link_state_p)(struct ifnet *, int);
+extern void (*vlan_link_state_p)(struct ifnet *);
static int
vlan_modevent(module_t mod, int type, void *data)
@@ -1231,7 +1231,7 @@ vlan_setflags(struct ifnet *ifp, int status)
/* Inform all vlans that their parent has changed link state */
static void
-vlan_link_state(struct ifnet *ifp, int link)
+vlan_link_state(struct ifnet *ifp)
{
struct ifvlantrunk *trunk = ifp->if_vlantrunk;
struct ifvlan *ifv;
diff --git a/sys/sys/event.h b/sys/sys/event.h
index 4365e44..d92eb55 100644
--- a/sys/sys/event.h
+++ b/sys/sys/event.h
@@ -38,7 +38,7 @@
#define EVFILT_PROC (-5) /* attached to struct proc */
#define EVFILT_SIGNAL (-6) /* attached to struct proc */
#define EVFILT_TIMER (-7) /* timers */
-#define EVFILT_NETDEV (-8) /* network devices */
+/* EVFILT_NETDEV (-8) no longer supported */
#define EVFILT_FS (-9) /* filesystem events */
#define EVFILT_LIO (-10) /* attached to lio requests */
#define EVFILT_USER (-11) /* User events */
@@ -131,13 +131,6 @@ struct kevent {
#define NOTE_TRACKERR 0x00000002 /* could not track child */
#define NOTE_CHILD 0x00000004 /* am a child process */
-/*
- * data/hint flags for EVFILT_NETDEV, shared with userspace
- */
-#define NOTE_LINKUP 0x0001 /* link is up */
-#define NOTE_LINKDOWN 0x0002 /* link is down */
-#define NOTE_LINKINV 0x0004 /* link state is invalid */
-
struct knote;
SLIST_HEAD(klist, knote);
struct kqueue;
OpenPOWER on IntegriCloud