Author: mav
Date: Thu Aug 18 10:44:35 2016
New Revision: 304389
URL: https://svnweb.freebsd.org/changeset/base/304389
Log:
MFC r302494: Synchronize MTU code with Linux.
It is mandatory for transport compatibility.
Modified:
stable/10/sys/dev/ntb/if_ntb/if_ntb.c
stable/10/sys/dev/ntb/ntb_transport.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/ntb/if_ntb/if_ntb.c
==============================================================================
--- stable/10/sys/dev/ntb/if_ntb/if_ntb.c Thu Aug 18 10:43:59 2016
(r304388)
+++ stable/10/sys/dev/ntb/if_ntb/if_ntb.c Thu Aug 18 10:44:35 2016
(r304389)
@@ -125,8 +125,7 @@ ntb_net_attach(device_t dev)
ether_ifattach(ifp, sc->eaddr);
ifp->if_capabilities = IFCAP_HWCSUM | IFCAP_JUMBO_MTU;
ifp->if_capenable = ifp->if_capabilities;
- ifp->if_mtu = ntb_transport_max_size(sc->qp) - ETHER_HDR_LEN -
- ETHER_CRC_LEN;
+ ifp->if_mtu = ntb_transport_max_size(sc->qp) - ETHER_HDR_LEN;
ntb_transport_link_up(sc->qp);
return (0);
@@ -177,7 +176,7 @@ ntb_ioctl(struct ifnet *ifp, u_long comm
case SIOCSIFMTU:
{
if (ifr->ifr_mtu > ntb_transport_max_size(sc->qp) -
- ETHER_HDR_LEN - ETHER_CRC_LEN) {
+ ETHER_HDR_LEN) {
error = EINVAL;
break;
}
Modified: stable/10/sys/dev/ntb/ntb_transport.c
==============================================================================
--- stable/10/sys/dev/ntb/ntb_transport.c Thu Aug 18 10:43:59 2016
(r304388)
+++ stable/10/sys/dev/ntb/ntb_transport.c Thu Aug 18 10:44:35 2016
(r304389)
@@ -493,8 +493,7 @@ ntb_transport_init_queue(struct ntb_tran
qp->rx_info = (void *)(qp->tx_mw + tx_size);
/* Due to house-keeping, there must be at least 2 buffs */
- qp->tx_max_frame = qmin(tx_size / 2,
- transport_mtu + sizeof(struct ntb_payload_header));
+ qp->tx_max_frame = qmin(transport_mtu, tx_size / 2);
qp->tx_max_entry = tx_size / qp->tx_max_frame;
callout_init(&qp->link_work, 0);
@@ -1174,8 +1173,7 @@ ntb_transport_setup_qp_mw(struct ntb_tra
qp->remote_rx_info = (void*)(qp->rx_buff + rx_size);
/* Due to house-keeping, there must be at least 2 buffs */
- qp->rx_max_frame = qmin(rx_size / 2,
- transport_mtu + sizeof(struct ntb_payload_header));
+ qp->rx_max_frame = qmin(transport_mtu, rx_size / 2);
qp->rx_max_entry = rx_size / qp->rx_max_frame;
qp->rx_index = 0;
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
