diff options
| author | dim <dim@FreeBSD.org> | 2015-02-22 16:04:37 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-02-22 16:04:37 +0000 |
| commit | 9bd5a747dd2c968d97a8932065fb94723bbeae9c (patch) | |
| tree | 62a36bf13e95aeb90982314c4943a29b289e60ee /sys/net/if_var.h | |
| parent | 1e024675bcd5e4ace8bffb2dd6afd3fa8b8ad7f3 (diff) | |
| parent | 88c4104dd7fac3a58708a6de5dcd21610a7f0316 (diff) | |
| download | FreeBSD-src-9bd5a747dd2c968d97a8932065fb94723bbeae9c.zip FreeBSD-src-9bd5a747dd2c968d97a8932065fb94723bbeae9c.tar.gz | |
Merge ^/head r279023 through r279162.
Diffstat (limited to 'sys/net/if_var.h')
| -rw-r--r-- | sys/net/if_var.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sys/net/if_var.h b/sys/net/if_var.h index 98e9828..e7166f2 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -365,8 +365,6 @@ EVENTHANDLER_DECLARE(group_change_event, group_change_event_handler_t); #define TOEDEV(ifp) ((ifp)->if_llsoftc) -#endif /* _KERNEL */ - /* * The ifaddr structure contains information about one address * of an interface. They are maintained by the different address families, @@ -377,7 +375,6 @@ EVENTHANDLER_DECLARE(group_change_event, group_change_event_handler_t); * chunk of malloc'ed memory, where we store the three addresses * (ifa_addr, ifa_dstaddr and ifa_netmask) referenced here. */ -#if defined(_KERNEL) || defined(_WANT_IFADDR) struct ifaddr { struct sockaddr *ifa_addr; /* address of interface */ struct sockaddr *ifa_dstaddr; /* other end of p-to-p link */ @@ -389,6 +386,8 @@ struct ifaddr { void (*ifa_rtrequest) /* check or clean routes (+ or -)'d */ (int, struct rtentry *, struct rt_addrinfo *); u_short ifa_flags; /* mostly rt_flags for cloning */ +#define IFA_ROUTE RTF_UP /* route installed */ +#define IFA_RTSELF RTF_HOST /* loopback route to self installed */ u_int ifa_refcnt; /* references to this structure */ counter_u64_t ifa_ipackets; @@ -396,11 +395,6 @@ struct ifaddr { counter_u64_t ifa_ibytes; counter_u64_t ifa_obytes; }; -#endif - -#ifdef _KERNEL -#define IFA_ROUTE RTF_UP /* route installed */ -#define IFA_RTSELF RTF_HOST /* loopback route to self installed */ /* For compatibility with other BSDs. SCTP uses it. */ #define ifa_list ifa_link |
