70c70
< __FBSDID("$FreeBSD: head/sys/netinet/ip_mroute.c 261024 2014-01-22 10:57:42Z glebius $");
---
> __FBSDID("$FreeBSD: head/sys/netinet/ip_mroute.c 269699 2014-08-08 01:57:15Z kevlo $");
250c250
< .pr_output = (pr_output_t*)rip_output,
---
> .pr_output = (pr_output_t *)rip_output,
1721,1722c1721,1722
< static void
< X_rsvp_input(struct mbuf *m, int off __unused)
---
> static int
> X_rsvp_input(struct mbuf **mp, int *offp, int proto)
1723a1724
> struct mbuf *m;
1724a1726,1727
> m = *mp;
> *mp = NULL;
1726a1730
> return (IPPROTO_DONE);
2559,2560c2563,2564
< void
< pim_input(struct mbuf *m, int iphlen)
---
> int
> pim_input(struct mbuf **mp, int *offp, int proto)
2561a2566
> struct mbuf *m = *mp;
2563a2569
> int iphlen = *offp;
2567a2574,2575
> *mp = NULL;
>
2580c2588
< return;
---
> return (IPPROTO_DONE);
2598c2606
< return;
---
> return (IPPROTO_DONE);
2623c2631
< return;
---
> return (IPPROTO_DONE);
2632c2640
< return;
---
> return (IPPROTO_DONE);
2657c2665
< return;
---
> return (IPPROTO_DONE);
2671c2679
< return;
---
> return (IPPROTO_DONE);
2685c2693
< return;
---
> return (IPPROTO_DONE);
2694c2702
< return;
---
> return (IPPROTO_DONE);
2733c2741
< return;
---
> return (IPPROTO_DONE);
2769c2777,2778
< rip_input(m, iphlen);
---
> *mp = m;
> rip_input(mp, offp, proto);
2771c2780
< return;
---
> return (IPPROTO_DONE);