From patchwork Tue Jun 24 11:34:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Paasch X-Patchwork-Id: 4408061 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 79E0C9F37C for ; Tue, 24 Jun 2014 11:34:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6B6CF202D1 for ; Tue, 24 Jun 2014 11:34:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6C8BE20266 for ; Tue, 24 Jun 2014 11:34:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752582AbaFXLex (ORCPT ); Tue, 24 Jun 2014 07:34:53 -0400 Received: from mail-wi0-f174.google.com ([209.85.212.174]:36732 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751676AbaFXLew (ORCPT ); Tue, 24 Jun 2014 07:34:52 -0400 Received: by mail-wi0-f174.google.com with SMTP id bs8so5827240wib.7 for ; Tue, 24 Jun 2014 04:34:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=OqRS3IqkgdpZhx96b5ecNOYFYjD5M8HdN/PskNcs48U=; b=E4UwAP1n1MyYeGTR0G2Oc2b1Zr+VmJ0tHZINIGKd4kHqM3wZ3U7VKLcjdG6yfYB+HW coDCbFB+/8InpZ/XuomXFlBxfO2eCI8kjQ1wtAQDGid0biYqEAC3CCfkWyVTYAxLyR93 z5Hm+w082b96nAubfhcNwtzxIdFdN1X71D3w5Qy6fdqkTr201qey9qkTzr1SwzbyKt+C gXY0tLMF/oL9TyDnBugWJ7syCyT7jasPYaZb+6m/gZT4vm7m1rCDUAEO1MEBXZ2sPFI9 2NdwDK8DsA9ZROmdJSTTw09a+cWpUklUZouLtxXVRKroEsueYU0LQu5mFiZEB6Ufh0R+ d8Xw== X-Received: by 10.180.198.44 with SMTP id iz12mr1554978wic.49.1403609691286; Tue, 24 Jun 2014 04:34:51 -0700 (PDT) Received: from localhost ([2001:6a8:3080:2:10ae:f919:4e52:f49c]) by mx.google.com with ESMTPSA id f6sm42418320wiy.19.2014.06.24.04.34.50 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 24 Jun 2014 04:34:50 -0700 (PDT) From: Christoph Paasch To: linux-rdma@vger.kernel.org Cc: Steve Wise , Roland Dreier , Sean Hefty , Hal Rosenstock Subject: [PATCH] cxgb4: Remove duplicate tcp-options clearing Date: Tue, 24 Jun 2014 13:34:02 +0200 Message-Id: <1403609642-27757-1-git-send-email-christoph.paasch@uclouvain.be> X-Mailer: git-send-email 1.9.3 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP tmp_opt is memset to 0. Thus, no need for another call to tcp_clear_options which simply sets some fields explicitly to 0 again. Cc: Steve Wise Cc: Roland Dreier Cc: Sean Hefty Cc: Hal Rosenstock Cc: linux-rdma@vger.kernel.org Signed-off-by: Christoph Paasch Acked-by: Steve Wise --- drivers/infiniband/hw/cxgb4/cm.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c index 96d7131ab974..2106a6dc62b3 100644 --- a/drivers/infiniband/hw/cxgb4/cm.c +++ b/drivers/infiniband/hw/cxgb4/cm.c @@ -3326,7 +3326,6 @@ static void build_cpl_pass_accept_req(struct sk_buff *skb, int stid , u8 tos) * to generate cpl_pass_accept_req. */ memset(&tmp_opt, 0, sizeof(tmp_opt)); - tcp_clear_options(&tmp_opt); tcp_parse_options(skb, &tmp_opt, 0, NULL); req = (struct cpl_pass_accept_req *)__skb_push(skb, sizeof(*req));