diff options
| author | glebius <glebius@FreeBSD.org> | 2005-02-26 13:55:07 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2005-02-26 13:55:07 +0000 |
| commit | e553dfbef0f3fb12062d3d02c0380662d43abe11 (patch) | |
| tree | 4452009e6b29b0a04b85f8c9a99705ad00d5ab8b /sys/net/if_var.h | |
| parent | 74b299286f0a062001aa205cca1380fc49282058 (diff) | |
| download | FreeBSD-src-e553dfbef0f3fb12062d3d02c0380662d43abe11.zip FreeBSD-src-e553dfbef0f3fb12062d3d02c0380662d43abe11.tar.gz | |
Remove carp_softc.sc_ifp member in favor of union pointers in struct ifnet.
Obtained from: OpenBSD
Diffstat (limited to 'sys/net/if_var.h')
| -rw-r--r-- | sys/net/if_var.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sys/net/if_var.h b/sys/net/if_var.h index 78eea2c..7c5cb8b 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -147,7 +147,12 @@ struct ifnet { */ struct knlist if_klist; /* events attached to this if */ int if_pcount; /* number of promiscuous listeners */ - struct carp_if *if_carp; /* carp interface structure */ + union { + struct carp_if *carp_s; /* carp structure (used by !carp ifs) */ + struct ifnet *carp_d; /* ptr to carpdev (used by carp ifs) */ + } if_carp_ptr; +#define if_carp if_carp_ptr.carp_s +#define if_carpdev if_carp_ptr.carp_d struct bpf_if *if_bpf; /* packet filter structure */ u_short if_index; /* numeric abbreviation for this if */ short if_timer; /* time 'til if_watchdog called */ |
