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: David L Stevens <david.stevens@oracle.com>
Acked-by: Sowmini Varadhan <sowmini.varadhan@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/sun/sunvnet.c b/drivers/net/ethernet/sun/sunvnet.c
index d2835bf7b4fbef1744bf2bd6d840acfe47863a39..b5a1d3d7b0bf627b3748e371e6adc940d82309a9 100644 (file)
--- a/drivers/net/ethernet/sun/sunvnet.c
+++ b/drivers/net/ethernet/sun/sunvnet.c
@@ -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;
        }