Page MenuHomeFreeBSD
Files F156478044

D52465.id.diff
No OneTemporary
Actions

D52465.id.diff
View Options

diff --git a/share/man/man4/epair.4 b/share/man/man4/epair.4
--- a/share/man/man4/epair.4
+++ b/share/man/man4/epair.4
@@ -25,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd September 4, 2025
+.Dd January 30, 2026
.Dt EPAIR 4
.Os
.Sh NAME
@@ -113,6 +113,7 @@
.Nm
has RXCSUM and RXCSUM6 enabled because it may receive a packet where the
checksum has already been validated by a physical interface.
+.Pp
The
.Nm
supports TXCSUM and TXCSUM6 for TCP and UDP, but only by forwarding the order
@@ -131,6 +132,23 @@
In case one end is in a bridge and the bridge disabled TXCSUM or TXCSUM6,
this avoids a sender to send packets with checksum offloading into the
bridge by using the other end.
+.Pp
+The
+.Nm
+supports VLAN_HWTAGGING without actually adding a VLAN tag.
+The sending
+.Nm
+end just forwards the offloading information to the other end.
+The receiving
+.Nm
+end leaves the offloading information set to pretend that there was a VLAN tag
+in the Ethernet header, which has been removed already.
+To avoid a situation where the receiving
+.Nm
+end has VLAN_HWTAGGING disabled, this capability is synchronized between the
+.Nm
+interface pair (i.e., enabling/disabling the capability on one end
+enables/disables it on the other end).
.Sh SEE ALSO
.Xr ioctl 2 ,
.Xr altq 4 ,
diff --git a/sys/net/if_epair.c b/sys/net/if_epair.c
--- a/sys/net/if_epair.c
+++ b/sys/net/if_epair.c
@@ -150,10 +150,6 @@
m->m_pkthdr.csum_flags &= ~CSUM_SND_TAG;
}
- /* Clear vlan information. */
- m->m_flags &= ~M_VLANTAG;
- m->m_pkthdr.ether_vtag = 0;
-
m_tag_delete_nonpersistent(m);
}
@@ -493,6 +489,7 @@
ifp->if_capenable = ifr->ifr_reqcap | IFCAP_RXCSUM |
IFCAP_RXCSUM_IPV6;
epair_caps_changed(ifp);
+ VLAN_CAPABILITIES(ifp);
/*
* If IFCAP_TXCSUM(_IPV6) has been changed, change it on the
* other epair interface as well.
@@ -501,17 +498,23 @@
* In that case this capability needs to be disabled on the
* other epair interface to avoid sending packets in the bridge
* that rely on this capability.
+ * Do the same for IFCAP_VLAN_HWTAGGING. If the sending epair
+ * end has this capability enabled, the other end has to have
+ * it enabled too. Otherwise, epair would have to add the VLAN
+ * tag in the Ethernet header.
*/
sc = ifp->if_softc;
if ((ifp->if_capenable ^ sc->oifp->if_capenable) &
- (IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6)) {
+ (IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6 | IFCAP_VLAN_HWTAGGING)) {
sc->oifp->if_capenable &=
- ~(IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6);
+ ~(IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6 |
+ IFCAP_VLAN_HWTAGGING);
sc->oifp->if_capenable |= ifp->if_capenable &
- (IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6);
+ (IFCAP_TXCSUM | IFCAP_TXCSUM_IPV6 |
+ IFCAP_VLAN_HWTAGGING);
epair_caps_changed(sc->oifp);
+ VLAN_CAPABILITIES(sc->oifp);
}
- VLAN_CAPABILITIES(ifp);
error = 0;
break;
@@ -626,10 +629,11 @@
ifp->if_dname = epairname;
ifp->if_dunit = unit;
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
- ifp->if_capabilities = IFCAP_VLAN_MTU | IFCAP_TXCSUM |
- IFCAP_TXCSUM_IPV6 | IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6;
- ifp->if_capenable = IFCAP_VLAN_MTU | IFCAP_TXCSUM |
- IFCAP_TXCSUM_IPV6 | IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6;
+ ifp->if_capabilities =
+ IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING |
+ IFCAP_TXCSUM | IFCAP_RXCSUM |
+ IFCAP_TXCSUM_IPV6 | IFCAP_RXCSUM_IPV6;
+ ifp->if_capenable = ifp->if_capabilities;
epair_caps_changed(ifp);
ifp->if_transmit = epair_transmit;
ifp->if_qflush = epair_qflush;

File Metadata

Mime Type
text/plain
Expires
Thu, May 14, 10:53 PM (15 h, 31 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33065335
Default Alt Text
D52465.id.diff (3 KB)

Event Timeline