xnu-4903.241.1.tar.gz

[apple/xnu.git] / bsd / netinet6 / ipsec.h

diff --git a/bsd/netinet6/ipsec.h b/bsd/netinet6/ipsec.h
index 7a422a69051fa468b315102e0c08abe886a10376..e016082475d024cf25ad3711ef7fba150450666b 100644 (file)
--- a/bsd/netinet6/ipsec.h
+++ b/bsd/netinet6/ipsec.h
@@ -290,13 +290,18 @@ struct ipsecstat {
        { "esp_randpad", CTLTYPE_INT }, \
 }
 
+#if defined(__ARM__)
+#define IPSEC_IS_P2ALIGNED(p)        IS_P2ALIGNED(p, sizeof (u_int32_t))
+#define IPSEC_GET_P2UNALIGNED_OFS(p) (sizeof(u_int32_t) - (((uintptr_t)(p)) & ((uintptr_t)(sizeof(u_int32_t)) - 1)))
+#else
 #define IPSEC_IS_P2ALIGNED(p)        1
 #define IPSEC_GET_P2UNALIGNED_OFS(p) 0
+#endif
 
 struct ipsec_output_state {
        int tunneled;
        struct mbuf *m;
-       struct route ro;
+       struct route_in6 ro;
        struct sockaddr *dst;
        u_int outgoing_if;
 };
@@ -362,12 +367,10 @@ extern int ipsec4_output(struct ipsec_output_state *, struct secpolicy *, int);
 #if INET
 extern struct mbuf * ipsec4_splithdr(struct mbuf *);
 extern int ipsec4_encapsulate(struct mbuf *, struct secasvar *);
-extern int ipsec4_encapsulate_utun_esp_keepalive(struct mbuf **, struct secasvar *);
 #endif
 #if INET6
 extern struct mbuf * ipsec6_splithdr(struct mbuf *);
 extern int ipsec6_encapsulate(struct mbuf *, struct secasvar *);
-extern int ipsec6_encapsulate_utun_esp_keepalive(struct mbuf **, struct secasvar *);
 #endif
 extern int ipsec4_tunnel_validate(struct mbuf *, int, u_int, struct secasvar *, sa_family_t *);
 extern struct mbuf *ipsec_copypkt(struct mbuf *);