From patchwork Thu Feb 24 01:26:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Gortmaker X-Patchwork-Id: 84298 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6734EB717F for ; Thu, 24 Feb 2011 12:27:26 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932172Ab1BXB1V (ORCPT ); Wed, 23 Feb 2011 20:27:21 -0500 Received: from mail.windriver.com ([147.11.1.11]:34546 "EHLO mail.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932155Ab1BXB1T (ORCPT ); Wed, 23 Feb 2011 20:27:19 -0500 Received: from yow-pgortmak-d1.corp.ad.wrs.com (yow-pgortmak-d1.ottawa.windriver.com [128.224.146.65]) by mail.windriver.com (8.14.3/8.14.3) with ESMTP id p1O1QuNX000906; Wed, 23 Feb 2011 17:27:17 -0800 (PST) From: Paul Gortmaker To: davem@davemloft.net Cc: allan.stephens@windriver.com, netdev@vger.kernel.org, Allan Stephens , Paul Gortmaker Subject: [PATCH net-next 17/17] tipc: Avoid reliable broadcast preparation for NACK messages Date: Wed, 23 Feb 2011 20:26:45 -0500 Message-Id: <1298510805-20630-18-git-send-email-paul.gortmaker@windriver.com> X-Mailer: git-send-email 1.7.3.3 In-Reply-To: <1298510805-20630-1-git-send-email-paul.gortmaker@windriver.com> References: <1298510805-20630-1-git-send-email-paul.gortmaker@windriver.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Allan Stephens Enhance TIPC to skip unnecessary (and, in some cases, redundant) preparation work when sending a broadcast link NACK message, since this preparation is only required for broadcast messages that are sent in a reliable manner. This change also fixes a bug that caused NACK messages to be improperly counted as "TX packets" in TIPC's broadcast link statistics. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker --- net/tipc/bcast.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c index 63df42b..7dc1dc7 100644 --- a/net/tipc/bcast.c +++ b/net/tipc/bcast.c @@ -298,6 +298,7 @@ static void bclink_send_nack(struct tipc_node *n_ptr) msg = buf_msg(buf); tipc_msg_init(msg, BCAST_PROTOCOL, STATE_MSG, INT_H_SIZE, n_ptr->addr); + msg_set_non_seq(msg, 1); msg_set_mc_netid(msg, tipc_net_id); msg_set_bcast_ack(msg, mod(n_ptr->bclink.last_in)); msg_set_bcgap_after(msg, n_ptr->bclink.gap_after);