From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753471AbYIMTft (ORCPT ); Sat, 13 Sep 2008 15:35:49 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752691AbYIMTfj (ORCPT ); Sat, 13 Sep 2008 15:35:39 -0400 Received: from srv5.dvmed.net ([207.36.208.214]:39083 "EHLO mail.dvmed.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752652AbYIMTfi (ORCPT ); Sat, 13 Sep 2008 15:35:38 -0400 Message-ID: <48CC1607.9060901@garzik.org> Date: Sat, 13 Sep 2008 15:35:35 -0400 From: Jeff Garzik User-Agent: Thunderbird 2.0.0.16 (X11/20080723) MIME-Version: 1.0 To: Divy Le Ray CC: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, swise@opengridcomputing.com Subject: Re: [PATCH 1/1 2.6.28] cxgb3 - remove duplicate tests in lro References: <20080905053413.11654.33295.stgit@speedy5> In-Reply-To: <20080905053413.11654.33295.stgit@speedy5> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -4.4 (----) X-Spam-Report: SpamAssassin version 3.2.5 on srv5.dvmed.net summary: Content analysis details: (-4.4 points, 5.0 required) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Divy Le Ray wrote: > From: Divy Le Ray > > The generic lro code checks TCP flags/options. > Remove duplicate tests done in the driver. > > Signed-off-by: Divy Le Ray > --- > > 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