upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert change to struct ifnet. Use ifnet pointer in softc. Embedding

Browse source 
ifnet into smth will soon be removed.

Requested by:	brooks
This commit is contained in:
Gleb Smirnoff 2005-03-01 10:59:14 +00:00
parent 72847b8fff
commit 3a84d72a78
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sys/net/if_var.h
View file

@ -147,12 +147,7 @@ struct ifnet {
*/
struct knlist if_klist; /* events attached to this if */
int if_pcount; /* number of promiscuous listeners */
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 carp_if *if_carp; /* carp interface structure */
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 */

2
sys/netinet/ip_carp.c
View file

@ -90,7 +90,7 @@ SYSCTL_DECL(_net_inet_carp);
struct carp_softc {
struct arpcom sc_ac; /* Interface clue */
#define sc_if sc_ac.ac_if
#define sc_carpdev sc_ac.ac_if.if_carpdev
struct ifnet *sc_carpdev; /* Pointer to parent interface */
struct in_ifaddr *sc_ia; /* primary iface address */
struct ip_moptions sc_imo;
#ifdef INET6