[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <48CC1607.9060901@garzik.org>
Date: Sat, 13 Sep 2008 15:35:35 -0400
From: Jeff Garzik <jeff@...zik.org>
To: Divy Le Ray <divy@...lsio.com>
CC: netdev@...r.kernel.org, linux-kernel@...r.kernel.org,
swise@...ngridcomputing.com
Subject: Re: [PATCH 1/1 2.6.28] cxgb3 - remove duplicate tests in lro
Divy Le Ray wrote:
> From: Divy Le Ray <divy@...lsio.com>
>
> The generic lro code checks TCP flags/options.
> Remove duplicate tests done in the driver.
>
> Signed-off-by: Divy Le Ray <divy@...lsio.com>
> ---
>
> drivers/net/cxgb3/sge.c | 35 -----------------------------------
> 1 files changed, 0 insertions(+), 35 deletions(-)
>
> diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c
> index 1b0861d..f78a42c 100644
> --- a/drivers/net/cxgb3/sge.c
> +++ b/drivers/net/cxgb3/sge.c
> @@ -1937,38 +1937,6 @@ static inline int lro_frame_ok(const struct cpl_rx_pkt *p)
> eh->h_proto == htons(ETH_P_IP) && ih->ihl == (sizeof(*ih) >> 2);
> }
>
> -#define TCP_FLAG_MASK (TCP_FLAG_CWR | TCP_FLAG_ECE | TCP_FLAG_URG |\
> - TCP_FLAG_ACK | TCP_FLAG_PSH | TCP_FLAG_RST |\
> - TCP_FLAG_SYN | TCP_FLAG_FIN)
> -#define TSTAMP_WORD ((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) |\
> - (TCPOPT_TIMESTAMP << 8) | TCPOLEN_TIMESTAMP)
> -
> -/**
> - * lro_segment_ok - check if a TCP segment is eligible for LRO
> - * @tcph: the TCP header of the packet
> - *
> - * Returns true if a TCP packet is eligible for LRO. This requires that
> - * the packet have only the ACK flag set and no TCP options besides
> - * time stamps.
> - */
> -static inline int lro_segment_ok(const struct tcphdr *tcph)
> -{
> - int optlen;
> -
> - if (unlikely((tcp_flag_word(tcph) & TCP_FLAG_MASK) != TCP_FLAG_ACK))
> - return 0;
> -
> - optlen = (tcph->doff << 2) - sizeof(*tcph);
> - if (optlen) {
> - const u32 *opt = (const u32 *)(tcph + 1);
> -
> - if (optlen != TCPOLEN_TSTAMP_ALIGNED ||
> - *opt != htonl(TSTAMP_WORD) || !opt[2])
> - return 0;
> - }
> - return 1;
> -}
> -
> static int t3_get_lro_header(void **eh, void **iph, void **tcph,
> u64 *hdr_flags, void *priv)
applied
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists