Commit d555f592 authored by Ron Mercer's avatar Ron Mercer Committed by David S. Miller
Browse files

qlge: Increase filtering for inbound csum settings. 



Chip does not do UDP checksum when fragmentation occurs.

Signed-off-by: default avatarRon Mercer <ron.mercer@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a75ee7f1

drivers/net/qlge/qlge.h

+1 −0
Original line number Diff line number Diff line
@@ -977,6 +977,7 @@ struct ib_mac_iocb_rsp { 
	u8 flags1;

#define IB_MAC_IOCB_RSP_OI	0x01	/* Overide intr delay */

#define IB_MAC_IOCB_RSP_I	0x02	/* Disble Intr Generation */

#define IB_MAC_CSUM_ERR_MASK 0x1c	/* A mask to use for csum errs */

#define IB_MAC_IOCB_RSP_TE	0x04	/* Checksum error */

#define IB_MAC_IOCB_RSP_NU	0x08	/* No checksum rcvd */

#define IB_MAC_IOCB_RSP_IE	0x10	/* IPv4 checksum error */

drivers/net/qlge/qlge_main.c

+28 −13
Original line number Diff line number Diff line
@@ -1531,22 +1531,37 @@ static void ql_process_mac_rx_intr(struct ql_adapter *qdev, 
	if (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_P) {

		QPRINTK(qdev, RX_STATUS, DEBUG, "Promiscuous Packet.\n");

	}

	if (ib_mac_rsp->flags1 & (IB_MAC_IOCB_RSP_IE | IB_MAC_IOCB_RSP_TE)) {

		QPRINTK(qdev, RX_STATUS, ERR,

			"Bad checksum for this %s packet.\n",

			((ib_mac_rsp->

			  flags2 & IB_MAC_IOCB_RSP_T) ? "TCP" : "UDP"));





	skb->protocol = eth_type_trans(skb, ndev);

	skb->ip_summed = CHECKSUM_NONE;

	} else if (qdev->rx_csum &&

		   ((ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_T) ||

		    ((ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_U) &&

		     !(ib_mac_rsp->flags1 & IB_MAC_IOCB_RSP_NU)))) {

		QPRINTK(qdev, RX_STATUS, DEBUG, "RX checksum done!\n");



	/* If rx checksum is on, and there are no

	 * csum or frame errors.

	 */

	if (qdev->rx_csum &&

		!(ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_ERR_MASK) &&

		!(ib_mac_rsp->flags1 & IB_MAC_CSUM_ERR_MASK)) {

		/* TCP frame. */

		if (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_T) {

			QPRINTK(qdev, RX_STATUS, DEBUG,

					"TCP checksum done!\n");

			skb->ip_summed = CHECKSUM_UNNECESSARY;

		} else if ((ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_U) &&

				(ib_mac_rsp->flags3 & IB_MAC_IOCB_RSP_V4)) {

		/* Unfragmented ipv4 UDP frame. */

			struct iphdr *iph = (struct iphdr *) skb->data;

			if (!(iph->frag_off &

				cpu_to_be16(IP_MF|IP_OFFSET))) {

				skb->ip_summed = CHECKSUM_UNNECESSARY;

				QPRINTK(qdev, RX_STATUS, DEBUG,

						"TCP checksum done!\n");

			}

		}

	}



	qdev->stats.rx_packets++;

	qdev->stats.rx_bytes += skb->len;

	skb->protocol = eth_type_trans(skb, ndev);

	skb_record_rx_queue(skb, rx_ring - &qdev->rx_ring[0]);

	if (qdev->vlgrp && (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_V)) {

		QPRINTK(qdev, RX_STATUS, DEBUG,