summaryrefslogtreecommitdiffstats
path: root/sys/i4b
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2004-07-06 06:43:45 +0000
committerru <ru@FreeBSD.org>2004-07-06 06:43:45 +0000
commitc7f4960c7966fefb0a5ee928efa3727b2b855493 (patch)
tree35041d0e9147a474664e3682057db257c4589c82 /sys/i4b
parentfef549cb0131530fbf9f34d7c9a80e54a6d775b7 (diff)
downloadFreeBSD-src-c7f4960c7966fefb0a5ee928efa3727b2b855493.zip
FreeBSD-src-c7f4960c7966fefb0a5ee928efa3727b2b855493.tar.gz
Catch up with the new world order of Netgraph metas.
(This one was the last, according to grep(1).) Submitted by: Gleb Smirnoff
Diffstat (limited to 'sys/i4b')
-rw-r--r--sys/i4b/driver/i4b_ing.c18
1 files changed, 3 insertions, 15 deletions
diff --git a/sys/i4b/driver/i4b_ing.c b/sys/i4b/driver/i4b_ing.c
index 8db8e0e..e1024e1 100644
--- a/sys/i4b/driver/i4b_ing.c
+++ b/sys/i4b/driver/i4b_ing.c
@@ -734,18 +734,14 @@ ng_ing_rcvdata(hook_p hook, item_p item)
struct ifqueue *xmitq_p;
int s;
struct mbuf *m;
-#ifdef THIS_DOESNT_COMPILE
- meta_p meta;
-#endif
+ struct ng_tag_prio *ptag;
NGI_GET_M(item, m);
- NGI_GET_META(item, meta);
NG_FREE_ITEM(item);
if(NG_HOOK_PRIVATE(hook) == NULL)
{
NG_FREE_M(m);
- NG_FREE_META(meta);
return(ENETDOWN);
}
@@ -760,18 +756,11 @@ ng_ing_rcvdata(hook_p hook, item_p item)
/*
* Now queue the data for when it can be sent
*/
-#ifdef THIS_DOESNT_COMPILE
- if (meta && meta->priority > 0)
- {
+ if ((ptag = (struct ng_tag_prio *)m_tag_locate(m, NGM_GENERIC_COOKIE,
+ NG_TAG_PRIO, NULL)) != NULL && (ptag->priority > NG_PRIO_CUTOFF) )
xmitq_p = (&sc->xmitq_hipri);
- }
else
- {
xmitq_p = (&sc->xmitq);
- }
-#else
- xmitq_p = (&sc->xmitq);
-#endif
s = splimp();
@@ -782,7 +771,6 @@ ng_ing_rcvdata(hook_p hook, item_p item)
IF_UNLOCK(xmitq_p);
splx(s);
NG_FREE_M(m);
- NG_FREE_META(meta);
return(ENOBUFS);
}
OpenPOWER on IntegriCloud