diff options
| author |   David L Stevens <david.stevens@oracle.com> | 2015-01-13 12:45:05 -0500 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-01-13 17:24:21 -0500 |
| commit | 86cfeab6b510a2fe94683bf71f9b96b686e2e0ce (patch) | |
| tree | 47158b07586febd9b5ed7acfe9f7e420c3b07fde /drivers/net/ethernet/sun/sunvnet.c | |
| parent | mISDN: avoid arch specific __builtin_return_address call (diff) | |
| download | linux-dev-86cfeab6b510a2fe94683bf71f9b96b686e2e0ce.tar.xz linux-dev-86cfeab6b510a2fe94683bf71f9b96b686e2e0ce.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/sun/sunvnet.c')
| -rw-r--r-- | drivers/net/ethernet/sun/sunvnet.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sun/sunvnet.c b/drivers/net/ethernet/sun/sunvnet.c index d2835bf7b4fb..b5a1d3d7b0bf 100644 --- 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; } |