d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backout changes from r228571. Remove if_data from struct ifa_msghdr again.

Browse Source 
While this breaks carp on HEAD temporary, it restores the upgrade path from
stable, and head before 20111215.

Reviewed by:	glebius, brooks
This commit is contained in:
Bjoern A. Zeeb 2012-02-11 05:59:54 +00:00
parent 4c91ddd690
commit e82cf13bfb
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libc/net/getifaddrs.c
View File

@ -76,7 +76,7 @@ __FBSDID("$FreeBSD$");
#define HAVE_IFM_DATA
#endif
#if (_BSDI_VERSION >= 199802) || (__FreeBSD_version >= 1000003)
#if _BSDI_VERSION >= 199802
/* ifam_data is very specific to recent versions of bsdi */
#define HAVE_IFAM_DATA
#endif

2
sys/net/if.h
View File

@ -267,8 +267,6 @@ struct ifa_msghdr {
int ifam_flags; /* value of ifa_flags */
u_short ifam_index; /* index for associated ifp */
int ifam_metric; /* value of ifa_metric */
struct if_data ifam_data;/* statistics and other data about if or
* address */
};
/*

4
sys/net/rtsock.c
View File

@ -1606,10 +1606,6 @@ sysctl_iflist(int af, struct walkarg *w)
ifam->ifam_flags = ifa->ifa_flags;
ifam->ifam_metric = ifa->ifa_metric;
ifam->ifam_addrs = info.rti_addrs;
ifam->ifam_data = ifa->if_data;
if (carp_get_vhid_p != NULL)
ifam->ifam_data.ifi_vhid =
(*carp_get_vhid_p)(ifa);
error = SYSCTL_OUT(w->w_req, w->w_tmem, len);
if (error)
goto done;