Page MenuHomeFreeBSD
Files F133209458

D26226.id76414.diff
No OneTemporary
Actions

D26226.id76414.diff
View Options

Index: sys/netgraph/ng_ether.c
===================================================================
--- sys/netgraph/ng_ether.c
+++ sys/netgraph/ng_ether.c
@@ -703,7 +703,7 @@
}
/* Send it on its way */
- return ether_output_frame(ifp, m);
+ return (ether_output_frame(ifp, m));
}
/*
@@ -712,7 +712,6 @@
static int
ng_ether_rcv_upper(hook_p hook, item_p item)
{
- struct epoch_tracker et;
struct mbuf *m;
const node_p node = NG_HOOK_NODE(hook);
const priv_p priv = NG_NODE_PRIVATE(node);
@@ -740,9 +739,7 @@
}
/* Route packet back in */
- NET_EPOCH_ENTER(et);
ether_demux(ifp, m);
- NET_EPOCH_EXIT(et);
return (0);
}
Index: sys/netgraph/ng_pppoe.c
===================================================================
--- sys/netgraph/ng_pppoe.c
+++ sys/netgraph/ng_pppoe.c
@@ -48,6 +48,7 @@
#include <sys/mbuf.h>
#include <sys/malloc.h>
#include <sys/errno.h>
+#include <sys/epoch.h>
#include <sys/syslog.h>
#include <net/ethernet.h>
@@ -763,6 +764,7 @@
static int
ng_pppoe_rcvmsg(node_p node, item_p item, hook_p lasthook)
{
+ struct epoch_tracker et;
priv_p privp = NG_NODE_PRIVATE(node);
struct ngpppoe_init_data *ourmsg = NULL;
struct ng_mesg *resp = NULL;
@@ -982,7 +984,9 @@
neg->service.hdr.tag_len = htons((uint16_t)srvlen);
bcopy(ourmsg->data + srvpos, neg->service.data, srvlen);
neg->service_len = srvlen;
+ NET_EPOCH_ENTER(et);
pppoe_start(sp);
+ NET_EPOCH_EXIT(et);
break;
}
case NGM_PPPOE_LISTEN:
@@ -1168,8 +1172,10 @@
m->m_pkthdr.len = m->m_len = sizeof(*wh) + sizeof(*tag) +
ourmsg->data_len;
wh->ph.length = htons(sizeof(*tag) + ourmsg->data_len);
+ NET_EPOCH_ENTER(et);
NG_SEND_DATA_ONLY(error,
privp->ethernet_hook, m);
+ NET_EPOCH_EXIT(et);
}
break;
}
@@ -1211,8 +1217,10 @@
m->m_pkthdr.len = m->m_len = sizeof(*wh) + sizeof(*tag) +
ourmsg->data_len;
wh->ph.length = htons(sizeof(*tag) + ourmsg->data_len);
+ NET_EPOCH_ENTER(et);
NG_SEND_DATA_ONLY(error,
privp->ethernet_hook, m);
+ NET_EPOCH_EXIT(et);
}
break;
}

File Metadata

Mime Type
text/plain
Expires
Sat, Oct 25, 12:04 AM (10 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
24130280
Default Alt Text
D26226.id76414.diff (2 KB)

Event Timeline