Merge branch 'net-mana-next'
Haiyang Zhang says: ==================== net: mana: Add handling of CQE_RX_TRUNCATED and a cleanup Add handling of CQE_RX_TRUNCATED and a cleanup patch ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
b58ef6b70a
@ -1085,8 +1085,10 @@ static void mana_process_rx_cqe(struct mana_rxq *rxq, struct mana_cq *cq,
|
||||
break;
|
||||
|
||||
case CQE_RX_TRUNCATED:
|
||||
netdev_err(ndev, "Dropped a truncated packet\n");
|
||||
return;
|
||||
++ndev->stats.rx_dropped;
|
||||
rxbuf_oob = &rxq->rx_oobs[rxq->buf_index];
|
||||
netdev_warn_once(ndev, "Dropped a truncated packet\n");
|
||||
goto drop;
|
||||
|
||||
case CQE_RX_COALESCED_4:
|
||||
netdev_err(ndev, "RX coalescing is unsupported\n");
|
||||
@ -1102,9 +1104,6 @@ static void mana_process_rx_cqe(struct mana_rxq *rxq, struct mana_cq *cq,
|
||||
return;
|
||||
}
|
||||
|
||||
if (oob->cqe_hdr.cqe_type != CQE_RX_OKAY)
|
||||
return;
|
||||
|
||||
pktlen = oob->ppi[0].pkt_len;
|
||||
|
||||
if (pktlen == 0) {
|
||||
@ -1154,6 +1153,7 @@ static void mana_process_rx_cqe(struct mana_rxq *rxq, struct mana_cq *cq,
|
||||
|
||||
mana_rx_skb(old_buf, oob, rxq);
|
||||
|
||||
drop:
|
||||
mana_move_wq_tail(rxq->gdma_rq, rxbuf_oob->wqe_inf.wqe_size_in_bu);
|
||||
|
||||
mana_post_pkt_rxq(rxq);
|
||||
|
Loading…
x
Reference in New Issue
Block a user