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

Commit ae721f3a authored by Sritej Velaga's avatar Sritej Velaga Committed by David S. Miller
Browse files

qlge: Fix receive path to drop error frames 



o Fix the driver to drop error frames in the receive path
o Update error counter which was not getting incremented

Signed-off-by: default avatarSritej Velaga <sritej.velaga@qlogic.com>
Signed-off-by: default avatarJitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b79d4a8d

drivers/net/ethernet/qlogic/qlge/qlge_main.c

+29 −7
Original line number Diff line number Diff line
@@ -1434,11 +1434,13 @@ static int ql_map_send(struct ql_adapter *qdev, 
}



/* Categorizing receive firmware frame errors */

static void ql_categorize_rx_err(struct ql_adapter *qdev, u8 rx_err)

static void ql_categorize_rx_err(struct ql_adapter *qdev, u8 rx_err,

				 struct rx_ring *rx_ring)

{

	struct nic_stats *stats = &qdev->nic_stats;



	stats->rx_err_count++;

	rx_ring->rx_errors++;



	switch (rx_err & IB_MAC_IOCB_RSP_ERR_MASK) {

	case IB_MAC_IOCB_RSP_ERR_CODE_ERR:
@@ -1474,6 +1476,12 @@ static void ql_process_mac_rx_gro_page(struct ql_adapter *qdev, 
	struct bq_desc *lbq_desc = ql_get_curr_lchunk(qdev, rx_ring);

	struct napi_struct *napi = &rx_ring->napi;



	/* Frame error, so drop the packet. */

	if (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_ERR_MASK) {

		ql_categorize_rx_err(qdev, ib_mac_rsp->flags2, rx_ring);

		put_page(lbq_desc->p.pg_chunk.page);

		return;

	}

	napi->dev = qdev->ndev;



	skb = napi_get_frags(napi);
@@ -1529,6 +1537,12 @@ static void ql_process_mac_rx_page(struct ql_adapter *qdev, 
	addr = lbq_desc->p.pg_chunk.va;

	prefetch(addr);



	/* Frame error, so drop the packet. */

	if (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_ERR_MASK) {

		ql_categorize_rx_err(qdev, ib_mac_rsp->flags2, rx_ring);

		goto err_out;

	}



	/* The max framesize filter on this chip is set higher than

	 * MTU since FCoE uses 2k frames.

	 */
@@ -1614,6 +1628,13 @@ static void ql_process_mac_rx_skb(struct ql_adapter *qdev, 
	memcpy(skb_put(new_skb, length), skb->data, length);

	skb = new_skb;



	/* Frame error, so drop the packet. */

	if (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_ERR_MASK) {

		ql_categorize_rx_err(qdev, ib_mac_rsp->flags2, rx_ring);

		dev_kfree_skb_any(skb);

		return;

	}



	/* loopback self test for ethtool */

	if (test_bit(QL_SELFTEST, &qdev->flags)) {

		ql_check_lb_frame(qdev, skb);
@@ -1919,6 +1940,13 @@ static void ql_process_mac_split_rx_intr(struct ql_adapter *qdev, 
		return;

	}



	/* Frame error, so drop the packet. */

	if (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_ERR_MASK) {

		ql_categorize_rx_err(qdev, ib_mac_rsp->flags2, rx_ring);

		dev_kfree_skb_any(skb);

		return;

	}



	/* The max framesize filter on this chip is set higher than

	 * MTU since FCoE uses 2k frames.

	 */
@@ -2000,12 +2028,6 @@ static unsigned long ql_process_mac_rx_intr(struct ql_adapter *qdev, 


	QL_DUMP_IB_MAC_RSP(ib_mac_rsp);



	/* Frame error, so drop the packet. */

	if (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_ERR_MASK) {

		ql_categorize_rx_err(qdev, ib_mac_rsp->flags2);

		return (unsigned long)length;

	}



	if (ib_mac_rsp->flags4 & IB_MAC_IOCB_RSP_HV) {

		/* The data and headers are split into

		 * separate buffers.