Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/netinet carp: Remove media, software should use link sta...
details: https://anonhg.NetBSD.org/src/rev/7840962b40ac
branches: trunk
changeset: 940528:7840962b40ac
user: roy <roy%NetBSD.org@localhost>
date: Fri Oct 09 08:10:41 2020 +0000
description:
carp: Remove media, software should use link status.
carp literally has no media just like ppp, vlan, etc.
diffstat:
sys/netinet/ip_carp.c | 37 ++-----------------------------------
1 files changed, 2 insertions(+), 35 deletions(-)
diffs (100 lines):
diff -r bb71e60173ad -r 7840962b40ac sys/netinet/ip_carp.c
--- a/sys/netinet/ip_carp.c Fri Oct 09 07:03:20 2020 +0000
+++ b/sys/netinet/ip_carp.c Fri Oct 09 08:10:41 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_carp.c,v 1.110 2020/02/06 23:30:20 thorpej Exp $ */
+/* $NetBSD: ip_carp.c,v 1.111 2020/10/09 08:10:41 roy Exp $ */
/* $OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $ */
/*
@@ -33,7 +33,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.110 2020/02/06 23:30:20 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.111 2020/10/09 08:10:41 roy Exp $");
/*
* TODO:
@@ -67,7 +67,6 @@
#include <net/pfil.h>
#include <net/if_types.h>
#include <net/if_ether.h>
-#include <net/if_media.h>
#include <net/route.h>
#include <net/netisr.h>
#include <net/net_stats.h>
@@ -116,7 +115,6 @@
#define sc_carpdev sc_ac.ec_if.if_carpdev
int ah_cookie;
int lh_cookie;
- struct ifmedia sc_im; /* ifmedia for link status */
struct ip_moptions sc_imo;
#ifdef INET6
struct ip6_moptions sc_im6o;
@@ -228,8 +226,6 @@
static int carp_ether_addmulti(struct carp_softc *, struct ifreq *);
static int carp_ether_delmulti(struct carp_softc *, struct ifreq *);
static void carp_ether_purgemulti(struct carp_softc *);
-static int carp_mediachange(struct ifnet *ifp);
-static void carp_mediastatus(struct ifnet *ifp, struct ifmediareq *imr);
static void carp_update_link_state(struct carp_softc *sc);
static void sysctl_net_inet_carp_setup(struct sysctllog **);
@@ -890,8 +886,6 @@
return rv;
}
- ifmedia_init(&sc->sc_im, 0, carp_mediachange, carp_mediastatus);
- sc->sc_im.ifm_media = IFM_CARP;
ether_ifattach(ifp, NULL);
carp_set_enaddr(sc);
/* Overwrite ethernet defaults */
@@ -910,7 +904,6 @@
carpdetach(ifp->if_softc);
ether_ifdetach(ifp);
if_detach(ifp);
- ifmedia_fini(&sc->sc_im);
callout_destroy(&sc->sc_ad_tmo);
callout_destroy(&sc->sc_md_tmo);
callout_destroy(&sc->sc_md6_tmo);
@@ -2173,10 +2166,6 @@
error = 0;
break;
- case SIOCGIFMEDIA:
- error = ifmedia_ioctl(ifp, ifr, &sc->sc_im, cmd);
- break;
-
default:
error = ether_ioctl(ifp, cmd, data);
}
@@ -2212,28 +2201,6 @@
}
}
-static int
-carp_mediachange(struct ifnet *ifp)
-{
- return (0);
-}
-
-static void
-carp_mediastatus(struct ifnet *ifp, struct ifmediareq *imr)
-{
- switch (ifp->if_link_state) {
- case LINK_STATE_UP:
- imr->ifm_status = IFM_AVALID | IFM_ACTIVE;
- break;
- case LINK_STATE_DOWN:
- imr->ifm_status = IFM_AVALID;
- break;
- default:
- imr->ifm_status = 0;
- break;
- }
-}
-
static void
carp_set_state(struct carp_softc *sc, int state)
{
Home |
Main Index |
Thread Index |
Old Index