Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86cfeab6 authored by David L Stevens's avatar David L Stevens Committed by David S. Miller
Browse files

sunvnet: fix rx packet length check to allow for TSO 



This patch fixes the rx packet length check in the sunvnet driver to allow
for a TSO max packet length greater than the LDC channel negotiated MTU.
These are negotiated separately and there is no requirement that
port->tsolen be less than port->rmtu, but if it isn't, it'll drop packets
with rx length errors.

Signed-off-by: default avatarDavid L Stevens <david.stevens@oracle.com>
Acked-by: default avatarSowmini Varadhan <sowmini.varadhan@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3e7a8716

drivers/net/ethernet/sun/sunvnet.c

+6 −1
Original line number Diff line number Diff line
@@ -351,10 +351,15 @@ static int vnet_rx_one(struct vnet_port *port, struct vio_net_desc *desc) 
	unsigned int len = desc->size;

	unsigned int copy_len;

	struct sk_buff *skb;

	int maxlen;

	int err;



	err = -EMSGSIZE;

	if (unlikely(len < ETH_ZLEN || len > port->rmtu)) {

	if (port->tso && port->tsolen > port->rmtu)

		maxlen = port->tsolen;

	else

		maxlen = port->rmtu;

	if (unlikely(len < ETH_ZLEN || len > maxlen)) {

		dev->stats.rx_length_errors++;

		goto out_dropped;

	}