1c1
< /* $FreeBSD: head/sys/netipsec/ipsec_input.c 249294 2013-04-09 07:11:22Z ae $ */
---
> /* $FreeBSD: head/sys/netipsec/ipsec_input.c 252028 2013-06-20 11:44:16Z ae $ */
102,103c102,109
< #define IPSEC_ISTAT(p,x,y,z) ((p) == IPPROTO_ESP ? (x)++ : \
< (p) == IPPROTO_AH ? (y)++ : (z)++)
---
> #define IPSEC_ISTAT(proto, name) do { \
> if ((proto) == IPPROTO_ESP) \
> ESPSTAT_INC(esps_##name); \
> else if ((proto) == IPPROTO_AH) \
> AHSTAT_INC(ahs_##name); \
> else \
> IPCOMPSTAT_INC(ipcomps_##name); \
> } while (0)
128,129c134
< IPSEC_ISTAT(sproto, V_espstat.esps_input, V_ahstat.ahs_input,
< V_ipcompstat.ipcomps_input);
---
> IPSEC_ISTAT(sproto, input);
141,142c146
< IPSEC_ISTAT(sproto, V_espstat.esps_pdrops, V_ahstat.ahs_pdrops,
< V_ipcompstat.ipcomps_pdrops);
---
> IPSEC_ISTAT(sproto, pdrops);
148,149c152
< IPSEC_ISTAT(sproto, V_espstat.esps_hdrops, V_ahstat.ahs_hdrops,
< V_ipcompstat.ipcomps_hdrops);
---
> IPSEC_ISTAT(sproto, hdrops);
200,201c203
< IPSEC_ISTAT(sproto, V_espstat.esps_nopf, V_ahstat.ahs_nopf,
< V_ipcompstat.ipcomps_nopf);
---
> IPSEC_ISTAT(sproto, nopf);
211,212c213
< IPSEC_ISTAT(sproto, V_espstat.esps_notdb, V_ahstat.ahs_notdb,
< V_ipcompstat.ipcomps_notdb);
---
> IPSEC_ISTAT(sproto, notdb);
221,222c222
< IPSEC_ISTAT(sproto, V_espstat.esps_noxform, V_ahstat.ahs_noxform,
< V_ipcompstat.ipcomps_noxform);
---
> IPSEC_ISTAT(sproto, noxform);
324,325c324
< IPSEC_ISTAT(sproto, V_espstat.esps_badkcr, V_ahstat.ahs_badkcr,
< V_ipcompstat.ipcomps_badkcr);
---
> IPSEC_ISTAT(sproto, badkcr);
339,340c338
< IPSEC_ISTAT(sproto, V_espstat.esps_hdrops, V_ahstat.ahs_hdrops,
< V_ipcompstat.ipcomps_hdrops);
---
> IPSEC_ISTAT(sproto, hdrops);
360,362c358
< IPSEC_ISTAT(sproto, V_espstat.esps_hdrops,
< V_ahstat.ahs_hdrops,
< V_ipcompstat.ipcomps_hdrops);
---
> IPSEC_ISTAT(sproto, hdrops);
391,393c387
< IPSEC_ISTAT(sproto, V_espstat.esps_pdrops,
< V_ahstat.ahs_pdrops,
< V_ipcompstat.ipcomps_pdrops);
---
> IPSEC_ISTAT(sproto, pdrops);
404,406c398
< IPSEC_ISTAT(sproto, V_espstat.esps_hdrops,
< V_ahstat.ahs_hdrops,
< V_ipcompstat.ipcomps_hdrops);
---
> IPSEC_ISTAT(sproto, hdrops);
433,435c425
< IPSEC_ISTAT(sproto, V_espstat.esps_pdrops,
< V_ahstat.ahs_pdrops,
< V_ipcompstat.ipcomps_pdrops);
---
> IPSEC_ISTAT(sproto, pdrops);
456,457c446
< IPSEC_ISTAT(sproto, V_espstat.esps_hdrops,
< V_ahstat.ahs_hdrops, V_ipcompstat.ipcomps_hdrops);
---
> IPSEC_ISTAT(sproto, hdrops);
497,499c486
< IPSEC_ISTAT(sproto, V_espstat.esps_qfull, V_ahstat.ahs_qfull,
< V_ipcompstat.ipcomps_qfull);
<
---
> IPSEC_ISTAT(sproto, qfull);
551,553c538
< IPSEC_ISTAT(proto, V_espstat.esps_hdrops,
< V_ahstat.ahs_hdrops,
< V_ipcompstat.ipcomps_hdrops);
---
> IPSEC_ISTAT(proto, hdrops);
598,599c583
< IPSEC_ISTAT(sproto, V_espstat.esps_badkcr, V_ahstat.ahs_badkcr,
< V_ipcompstat.ipcomps_badkcr);
---
> IPSEC_ISTAT(sproto, badkcr);
612,613c596
< IPSEC_ISTAT(sproto, V_espstat.esps_hdrops, V_ahstat.ahs_hdrops,
< V_ipcompstat.ipcomps_hdrops);
---
> IPSEC_ISTAT(sproto, hdrops);
631,633c614
< IPSEC_ISTAT(sproto, V_espstat.esps_hdrops,
< V_ahstat.ahs_hdrops,
< V_ipcompstat.ipcomps_hdrops);
---
> IPSEC_ISTAT(sproto, hdrops);
658,659c639
< IPSEC_ISTATsproto, (V_espstat.esps_pdrops,
< V_ahstat.ahs_pdrops, V_ipcompstat.ipcomps_pdrops);
---
> IPSEC_ISTAT(sproto, pdrops);
671,673c651
< IPSEC_ISTAT(sproto, V_espstat.esps_hdrops,
< V_ahstat.ahs_hdrops,
< V_ipcompstat.ipcomps_hdrops);
---
> IPSEC_ISTAT(sproto, hdrops);
700,701c678
< IPSEC_ISTAT(sproto, V_espstat.esps_pdrops,
< V_ahstat.ahs_pdrops, V_ipcompstat.ipcomps_pdrops);
---
> IPSEC_ISTAT(sproto, pdrops);
721,722c698
< IPSEC_ISTAT(sproto, V_espstat.esps_hdrops,
< V_ahstat.ahs_hdrops, V_ipcompstat.ipcomps_hdrops);
---
> IPSEC_ISTAT(sproto, hdrops);