Deleted Added
full compact
9,10c9
< * without modifications are expressly permitted by Sandvine Inc.;
< provided,
---
> * without modifications are expressly permitted by Sandvine Inc.; provided,
12,15c11,12
< * 1. Any and all reproductions of the source or object code must include
< the
< * copyright notice above and the following disclaimer of warranties;
< and
---
> * 1. Any and all reproductions of the source or object code must include the
> * copyright notice above and the following disclaimer of warranties; and
17,20c14,15
< * trademarks, including the mark "SANDVINE" on advertising,
< endorsements,
< * or otherwise except as such appears in the above copyright notice or
< in
---
> * trademarks, including the mark "SANDVINE" on advertising, endorsements,
> * or otherwise except as such appears in the above copyright notice or in
24,29c19,21
< * EXTENT PERMITTED BY LAW, SANDVINE MAKES NO REPRESENTATIONS OR
< WARRANTIES,
< * EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE, INCLUDING WITHOUT
< LIMITATION,
< * ANY AND ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
< PARTICULAR
---
> * EXTENT PERMITTED BY LAW, SANDVINE MAKES NO REPRESENTATIONS OR WARRANTIES,
> * EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE, INCLUDING WITHOUT LIMITATION,
> * ANY AND ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
35,36c27
< * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
< EXEMPLARY,
---
> * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
46c37
< * $FreeBSD: head/sys/netgraph/ng_source.c 106266 2002-10-31 23:03:09Z julian $
---
> * $FreeBSD: head/sys/netgraph/ng_source.c 106319 2002-11-02 01:26:28Z julian $
96,97c87
< struct ifqueue snd_queue; /* packets to send
< */
---
> struct ifqueue snd_queue; /* packets to send */
100,101c90
< u_int64_t packets; /* packets to send
< */
---
> u_int64_t packets; /* packets to send */
298,299c287
< sc->stats.queueFrames =
< sc->snd_queue.ifq_len;
---
> sc->stats.queueFrames = sc->snd_queue.ifq_len;
302,303c290
<
< getmicrotime(&sc->stats.elapsedTime);
---
> getmicrotime(&sc->stats.elapsedTime);
305,306c292
<
< &sc->stats.startTime);
---
> &sc->stats.startTime);
308,309c294
< stats = (struct ng_source_stats
< *)resp->data;
---
> stats = (struct ng_source_stats *)resp->data;
320,321c305,306
< printf("%s: start on node with no output
< hook\n", __FUNCTION__);
---
> printf("%s: start on node with no output hook\n"
> , __FUNCTION__);
365,366c350
< struct source_hookinfo *const hinfo = (struct source_hookinfo *)
< hook->private;
---
> struct source_hookinfo *const hinfo;
368a353
> hinfo = (struct source_hookinfo *) hook->private;
423,425c408,409
< struct source_hookinfo *const hinfo = (struct source_hookinfo *)
< hook->private;
< sc_p sc = (sc_p) hinfo->hook->node->private;
---
> struct source_hookinfo *const hinfo;
> sc_p sc;
426a411,412
> hinfo = (struct source_hookinfo *) hook->private;
> sc = (sc_p) hinfo->hook->node->private;
450,451c436
< NG_MKMESSAGE(msg, NGM_ETHER_COOKIE, NGM_ETHER_GET_IFINDEX, 0,
< M_NOWAIT);
---
> NG_MKMESSAGE(msg, NGM_ETHER_COOKIE, NGM_ETHER_GET_IFINDEX, 0, M_NOWAIT);
476,477c461
< printf("%s: can't find interface %d\n", __FUNCTION__,
< if_index);
---
> printf("%s: can't find interface %d\n", __FUNCTION__, if_index);
492,493c476
< ifp->if_snd.ifq_maxlen,
< NG_SOURCE_DRIVER_IFQ_MAXLEN);
---
> ifp->if_snd.ifq_maxlen, NG_SOURCE_DRIVER_IFQ_MAXLEN);
548,549c531
< if (sc->output_ifp == NULL && ng_source_get_output_ifp(sc)
< != 0)
---
> if (sc->output_ifp == NULL && ng_source_get_output_ifp(sc) != 0)
607,608c589
< sc->intr_ch = timeout(ng_source_intr, sc,
< NG_SOURCE_INTR_TICKS);
---
> sc->intr_ch = timeout(ng_source_intr, sc, NG_SOURCE_INTR_TICKS);