summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2012-09-19 15:31:24 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2012-09-19 15:31:24 +0000
commit3bc312edb6d9fed06aea01fd31bccf25730708f9 (patch)
treeca2adf8e297008ce3a8592f903162c3033ccda09
parentc009a7194dd1b52cf29f3e3d5438ec0376f04042 (diff)
inherit IFCAP_CSUM_* from the parent interface
in my tree for a while and I forgot what exactly triggered it, but in one way or another this comes from the netbsd camp ok benno mpf
-rw-r--r--sys/netinet/ip_carp.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
index c593ac70b02..ac2b058d036 100644
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_carp.c,v 1.195 2012/04/11 17:42:53 mikeb Exp $ */
+/* $OpenBSD: ip_carp.c,v 1.196 2012/09/19 15:31:23 henning Exp $ */
/*
* Copyright (c) 2002 Michael Shalayeff. All rights reserved.
@@ -1864,6 +1864,8 @@ carp_set_ifp(struct carp_softc *sc, struct ifnet *ifp)
if (ncif != NULL)
ifp->if_carp = (caddr_t)ncif;
sc->sc_carpdev = ifp;
+ sc->sc_if.if_capabilities = ifp->if_capabilities &
+ IFCAP_CSUM_MASK;
cif = (struct carp_if *)ifp->if_carp;
TAILQ_FOREACH(vr, &cif->vhif_vrs, sc_list) {
if (vr == sc)