39c39
< * $FreeBSD: head/sys/netgraph/ng_ppp.c 129823 2004-05-29 00:51:19Z julian $
---
> * $FreeBSD: head/sys/netgraph/ng_ppp.c 131155 2004-06-26 22:24:16Z julian $
141d140
< meta_p meta; /* Fragment meta */
230c229
< static void ng_ppp_get_packet(node_p node, struct mbuf **mp, meta_p *metap);
---
> static void ng_ppp_get_packet(node_p node, struct mbuf **mp);
236c235
< static int ng_ppp_mp_output(node_p node, struct mbuf *m, meta_p meta);
---
> static int ng_ppp_mp_output(node_p node, struct mbuf *m);
1006,1009c1005
< meta_p meta;
<
< /* strip off and discard the queue item */
< NGI_GET_META(item, meta);
---
> /* discard the queue item */
1011c1007
< return ng_ppp_mp_output(node, m, meta);
---
> return ng_ppp_mp_output(node, m);
1097d1092
< meta_p meta;
1100d1094
< NGI_GET_META(item, meta);
1113d1106
< NG_FREE_META(meta);
1116,1117c1109
< if (m->m_len < 2 && (m = m_pullup(m, 2)) == NULL) {
< NG_FREE_META(meta);
---
> if (m->m_len < 2 && (m = m_pullup(m, 2)) == NULL)
1119c1111
< }
---
>
1132d1123
< NG_FREE_META(meta);
1135,1136c1126
< if (m->m_len < 4 && (m = m_pullup(m, 4)) == NULL) {
< NG_FREE_META(meta);
---
> if (m->m_len < 4 && (m = m_pullup(m, 4)) == NULL)
1138c1128
< }
---
>
1147d1136
< frag->meta = meta;
1155d1143
< NG_FREE_META(meta);
1173d1160
< NG_FREE_META(meta);
1190d1176
< NG_FREE_META(frag->meta);
1242c1228
< ng_ppp_get_packet(node_p node, struct mbuf **mp, meta_p *metap)
---
> ng_ppp_get_packet(node_p node, struct mbuf **mp)
1256c1242
< if (tail == NULL) {
---
> if (tail == NULL)
1258,1259c1244
< *metap = qent->meta; /* inherit first frag's meta */
< } else {
---
> else {
1262d1246
< NG_FREE_META(qent->meta); /* drop other frags' metas */
1317d1300
< NG_FREE_META(qent->meta);
1334d1316
< meta_p meta;
1339,1340c1321,1322
< ng_ppp_get_packet(node, &m, &meta);
< item = ng_package_data(m, meta);
---
> ng_ppp_get_packet(node, &m);
> item = ng_package_data(m, NULL);
1347,1348c1329,1330
< ng_ppp_get_packet(node, &m, &meta);
< item = ng_package_data(m, meta);
---
> ng_ppp_get_packet(node, &m);
> item = ng_package_data(m, NULL);
1383d1364
< NG_FREE_META(qent->meta);
1414d1394
< meta_p meta;
1462d1441
< NG_FREE_META(qent->meta);
1469c1448
< ng_ppp_get_packet(node, &m, &meta);
---
> ng_ppp_get_packet(node, &m);
1485c1464
< item = ng_package_data(m, meta);
---
> item = ng_package_data(m, NULL);
1526c1505
< ng_ppp_mp_output(node_p node, struct mbuf *m, meta_p meta)
---
> ng_ppp_mp_output(node_p node, struct mbuf *m)
1538d1516
< NG_FREE_META(meta);
1584d1561
< meta_p meta2;
1600d1576
< NG_FREE_META(meta);
1635d1610
< NG_FREE_META(meta);
1639,1641d1613
< /* Copy the meta information, if any */
< meta2 = lastFragment ? meta : ng_copy_meta(meta);
<
1643c1615
< item = ng_package_data(m2, meta2);
---
> item = ng_package_data(m2, NULL);
1646c1618
< if (!lastFragment) {
---
> if (!lastFragment)
1648,1649d1619
< NG_FREE_META(meta);
< }
2059d2028
< NG_FREE_META(qent->meta);