diff options
| author | Alexander Motin <mav@FreeBSD.org> | 2016-07-09 11:58:59 +0000 |
|---|---|---|
| committer | Alexander Motin <mav@FreeBSD.org> | 2016-07-09 11:58:59 +0000 |
| commit | a7e0f01a3d669fc708e6dca3b0134082e97105c5 (patch) | |
| tree | 1d86cdb808af117280f18d8aa9ce2d8c3bbde8ac /sys | |
| parent | 59850913b254aa76c2965e3fd3c31817c27fd4b1 (diff) | |
| download | src-a7e0f01a3d669fc708e6dca3b0134082e97105c5.tar.gz src-a7e0f01a3d669fc708e6dca3b0134082e97105c5.zip | |
Synchronize MTU code with Linux.
It is mandatory for transport compatibility.
Notes
Notes:
svn path=/head/; revision=302494
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ntb/if_ntb/if_ntb.c | 5 | ||||
| -rw-r--r-- | sys/dev/ntb/ntb_transport.c | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/sys/dev/ntb/if_ntb/if_ntb.c b/sys/dev/ntb/if_ntb/if_ntb.c index 37a3afaa9555..d592e09b39dd 100644 --- a/sys/dev/ntb/if_ntb/if_ntb.c +++ b/sys/dev/ntb/if_ntb/if_ntb.c @@ -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 command, caddr_t data) case SIOCSIFMTU: { if (ifr->ifr_mtu > ntb_transport_max_size(sc->qp) - - ETHER_HDR_LEN - ETHER_CRC_LEN) { + ETHER_HDR_LEN) { error = EINVAL; break; } diff --git a/sys/dev/ntb/ntb_transport.c b/sys/dev/ntb/ntb_transport.c index 463a2c29cacc..85647444e923 100644 --- a/sys/dev/ntb/ntb_transport.c +++ b/sys/dev/ntb/ntb_transport.c @@ -489,8 +489,7 @@ ntb_transport_init_queue(struct ntb_transport_ctx *nt, unsigned int qp_num) 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); @@ -1170,8 +1169,7 @@ ntb_transport_setup_qp_mw(struct ntb_transport_ctx *nt, unsigned int qp_num) 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; |