From patchwork Tue Jul 15 17:46:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Maloy X-Patchwork-Id: 370102 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 629BB1400A3 for ; Wed, 16 Jul 2014 03:46:26 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757420AbaGORqV (ORCPT ); Tue, 15 Jul 2014 13:46:21 -0400 Received: from smtp104.biz.mail.gq1.yahoo.com ([98.137.12.179]:29204 "HELO smtp104.biz.mail.gq1.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1755080AbaGORqR (ORCPT ); Tue, 15 Jul 2014 13:46:17 -0400 Received: (qmail 49783 invoked from network); 15 Jul 2014 17:46:16 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s1024; t=1405446376; bh=QKvKRd/RIiYRIBgclf6sB9kJftjbpPGwW0JWwcI/+y4=; h=X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:X-Rocket-Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References; b=HTzgl2NsXib69G8oFem9hEU8HlueSxIrVSn4o0lK91gJh+5Rwfw0sz4cyvVKnLj9JWFNay/zQFOMDRnjSW5Y3FKQgY7bVnwc8IQGrtxed92wjRLyKPWKJaVCLlevSuTX/ScvVpmWl1MfOczeJh28O06KF4pact3k43u/6e69Ou0= X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: Oy_05C0VM1nb_2GUU6EVJXsNR_VlvzXuVzygF7XqKmDI40z aQhTozOAf4qc0QdUJ3dpffO8Xz5IbgQu7R3BlRtK7jQAuG3HDzFBN6_cmKCR PjpNina1nB1VvScpKu4pH3rHnOROmCcgALttlW82mdi2V.xPbuWmfz1s0kDC WSevWW.0luk82LcaUpOdTz2oc7LRwz2sYqEDWUni6SspYGjOdUqGREUS2Hwx epm4RAoYt0woNyisckOLLzVCc3z6R0bWYGosIaYgqJFKKi758A29fDgvyqmw 0UpVfLtxWVlag9HnqmN7lAUF5g7j7Fa58ZnApGzD1lTWx0Qi8CC1vfDh5sUF pt9Isctvr7sZobZ5LCi28MPe91l6hC7xzioz76Tz8X0lqEX_g4TCkwZ1NsBS MV2TXVdk0FVg0q1Gt2RhcScAAHYnoJg3ysLQ1hIDFlx.2D5zl5mFQzDA0qxj WCOlTZvEJO9HSXhifgHpd_ZZPcfnukm99VKyhCqiP3dNeiNHj_.CA7PmKR92 9S3Vhbw6Kd1OjNNe.BT4KtkwtK7wlSCiFvAaZ3jPWiE4- X-Yahoo-SMTP: gPXIZm2swBAFQJ_Vx0CebjUfUdhJ X-Rocket-Received: from goethe.globalsuite.net (jon.maloy@69.165.177.132 with plain [208.71.40.208]) by smtp104.biz.mail.gq1.yahoo.com with SMTP; 15 Jul 2014 10:46:16 -0700 PDT From: Jon Maloy To: davem@davemloft.net Cc: netdev@vger.kernel.org, Paul Gortmaker , erik.hugne@ericsson.com, ying.xue@windriver.com, maloy@donjonn.com, tipc-discussion@lists.sourceforge.net, Jon Maloy Subject: [PATCH net-next 2/7] tipc: let internal link users call the new link send function Date: Tue, 15 Jul 2014 13:46:05 -0400 Message-Id: <1405446370-11781-3-git-send-email-jon.maloy@ericsson.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1405446370-11781-1-git-send-email-jon.maloy@ericsson.com> References: <1405446370-11781-1-git-send-email-jon.maloy@ericsson.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We convert the link internal users (changeover protocol, broadcast synchronization) to use the new packet send function. Signed-off-by: Jon Maloy Reviewed-by: Erik Hugne Reviewed-by: Ying Xue --- net/tipc/link.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/net/tipc/link.c b/net/tipc/link.c index 367b0f5..d1255ba 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c @@ -999,7 +999,7 @@ int tipc_link_xmit2(struct sk_buff *buf, u32 dnode, u32 selector) * * Called with node locked */ -static void tipc_link_sync_xmit(struct tipc_link *l) +static void tipc_link_sync_xmit(struct tipc_link *link) { struct sk_buff *buf; struct tipc_msg *msg; @@ -1009,10 +1009,9 @@ static void tipc_link_sync_xmit(struct tipc_link *l) return; msg = buf_msg(buf); - tipc_msg_init(msg, BCAST_PROTOCOL, STATE_MSG, INT_H_SIZE, l->addr); - msg_set_last_bcast(msg, l->owner->bclink.acked); - link_add_chain_to_outqueue(l, buf, 0); - tipc_link_push_queue(l); + tipc_msg_init(msg, BCAST_PROTOCOL, STATE_MSG, INT_H_SIZE, link->addr); + msg_set_last_bcast(msg, link->owner->bclink.acked); + __tipc_link_xmit2(link, buf); } /* @@ -1859,7 +1858,7 @@ static void tipc_link_tunnel_xmit(struct tipc_link *l_ptr, } skb_copy_to_linear_data(buf, tunnel_hdr, INT_H_SIZE); skb_copy_to_linear_data_offset(buf, INT_H_SIZE, msg, length); - __tipc_link_xmit(tunnel, buf); + __tipc_link_xmit2(tunnel, buf); } @@ -1892,7 +1891,7 @@ void tipc_link_failover_send_queue(struct tipc_link *l_ptr) if (buf) { skb_copy_to_linear_data(buf, &tunnel_hdr, INT_H_SIZE); msg_set_size(&tunnel_hdr, INT_H_SIZE); - __tipc_link_xmit(tunnel, buf); + __tipc_link_xmit2(tunnel, buf); } else { pr_warn("%sunable to send changeover msg\n", link_co_err); @@ -1965,7 +1964,7 @@ void tipc_link_dup_queue_xmit(struct tipc_link *l_ptr, skb_copy_to_linear_data(outbuf, &tunnel_hdr, INT_H_SIZE); skb_copy_to_linear_data_offset(outbuf, INT_H_SIZE, iter->data, length); - __tipc_link_xmit(tunnel, outbuf); + __tipc_link_xmit2(tunnel, outbuf); if (!tipc_link_is_up(l_ptr)) return; iter = iter->next;