Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23dd4cce authored by Allan Stephens's avatar Allan Stephens Committed by Paul Gortmaker
Browse files

tipc: Combine port structure with tipc_port structure 



Merge two distinct structures containing information about a TIPC port
into a single structure. The structures were previously kept separate
so that public information about a port could be made available to
applications using TIPC's native API, while the remaining information
was kept private for use by TIPC itself. However, now that the native
API has been removed there is no longer any need for this somewhat
confusing arrangement.

Since one of the structures was already embedded within the other, the
change largely involves replacing instances of "publ.foo" with "foo".
The changes do not otherwise alter the operation of TIPC ports.

Signed-off-by: default avatarAllan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
parent dee9f4bc

net/tipc/link.c

+23 −23
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * net/tipc/link.c: TIPC link code

 *

 * Copyright (c) 1996-2007, Ericsson AB

 * Copyright (c) 2004-2007, Wind River Systems

 * Copyright (c) 2004-2007, 2010-2011, Wind River Systems

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -90,7 +90,7 @@ static void link_handle_out_of_seq_msg(struct link *l_ptr, 
static void link_recv_proto_msg(struct link *l_ptr, struct sk_buff *buf);

static int  link_recv_changeover_msg(struct link **l_ptr, struct sk_buff **buf);

static void link_set_supervision_props(struct link *l_ptr, u32 tolerance);

static int  link_send_sections_long(struct port *sender,

static int  link_send_sections_long(struct tipc_port *sender,

				    struct iovec const *msg_sect,

				    u32 num_sect, u32 destnode);

static void link_check_defragm_bufs(struct link *l_ptr);
@@ -406,7 +406,7 @@ static void link_start(struct link *l_ptr) 


static int link_schedule_port(struct link *l_ptr, u32 origport, u32 sz)

{

	struct port *p_ptr;

	struct tipc_port *p_ptr;



	spin_lock_bh(&tipc_port_list_lock);

	p_ptr = tipc_port_lock(origport);
@@ -415,7 +415,7 @@ static int link_schedule_port(struct link *l_ptr, u32 origport, u32 sz) 
			goto exit;

		if (!list_empty(&p_ptr->wait_list))

			goto exit;

		p_ptr->publ.congested = 1;

		p_ptr->congested = 1;

		p_ptr->waiting_pkts = 1 + ((sz - 1) / l_ptr->max_pkt);

		list_add_tail(&p_ptr->wait_list, &l_ptr->waiting_ports);

		l_ptr->stats.link_congs++;
@@ -428,8 +428,8 @@ static int link_schedule_port(struct link *l_ptr, u32 origport, u32 sz) 


void tipc_link_wakeup_ports(struct link *l_ptr, int all)

{

	struct port *p_ptr;

	struct port *temp_p_ptr;

	struct tipc_port *p_ptr;

	struct tipc_port *temp_p_ptr;

	int win = l_ptr->queue_limit[0] - l_ptr->out_queue_size;



	if (all)
@@ -445,11 +445,11 @@ void tipc_link_wakeup_ports(struct link *l_ptr, int all) 
		if (win <= 0)

			break;

		list_del_init(&p_ptr->wait_list);

		spin_lock_bh(p_ptr->publ.lock);

		p_ptr->publ.congested = 0;

		p_ptr->wakeup(&p_ptr->publ);

		spin_lock_bh(p_ptr->lock);

		p_ptr->congested = 0;

		p_ptr->wakeup(p_ptr);

		win -= p_ptr->waiting_pkts;

		spin_unlock_bh(p_ptr->publ.lock);

		spin_unlock_bh(p_ptr->lock);

	}



exit:
@@ -1027,12 +1027,12 @@ int tipc_send_buf_fast(struct sk_buff *buf, u32 destnode) 
 * except for total message length.

 * Returns user data length or errno.

 */

int tipc_link_send_sections_fast(struct port *sender,

int tipc_link_send_sections_fast(struct tipc_port *sender,

				 struct iovec const *msg_sect,

				 const u32 num_sect,

				 u32 destaddr)

{

	struct tipc_msg *hdr = &sender->publ.phdr;

	struct tipc_msg *hdr = &sender->phdr;

	struct link *l_ptr;

	struct sk_buff *buf;

	struct tipc_node *node;
@@ -1045,7 +1045,7 @@ int tipc_link_send_sections_fast(struct port *sender, 
	 * (Must not hold any locks while building message.)

	 */



	res = tipc_msg_build(hdr, msg_sect, num_sect, sender->publ.max_pkt,

	res = tipc_msg_build(hdr, msg_sect, num_sect, sender->max_pkt,

			!sender->user_port, &buf);



	read_lock_bh(&tipc_net_lock);
@@ -1056,7 +1056,7 @@ int tipc_link_send_sections_fast(struct port *sender, 
		if (likely(l_ptr)) {

			if (likely(buf)) {

				res = link_send_buf_fast(l_ptr, buf,

							 &sender->publ.max_pkt);

							 &sender->max_pkt);

				if (unlikely(res < 0))

					buf_discard(buf);

exit:
@@ -1075,7 +1075,7 @@ int tipc_link_send_sections_fast(struct port *sender, 
			if (link_congested(l_ptr) ||

			    !list_empty(&l_ptr->b_ptr->cong_links)) {

				res = link_schedule_port(l_ptr,

							 sender->publ.ref, res);

							 sender->ref, res);

				goto exit;

			}
@@ -1084,12 +1084,12 @@ int tipc_link_send_sections_fast(struct port *sender, 
			 * then re-try fast path or fragment the message

			 */



			sender->publ.max_pkt = l_ptr->max_pkt;

			sender->max_pkt = l_ptr->max_pkt;

			tipc_node_unlock(node);

			read_unlock_bh(&tipc_net_lock);





			if ((msg_hdr_sz(hdr) + res) <= sender->publ.max_pkt)

			if ((msg_hdr_sz(hdr) + res) <= sender->max_pkt)

				goto again;



			return link_send_sections_long(sender, msg_sect,
@@ -1123,14 +1123,14 @@ int tipc_link_send_sections_fast(struct port *sender, 
 *

 * Returns user data length or errno.

 */

static int link_send_sections_long(struct port *sender,

static int link_send_sections_long(struct tipc_port *sender,

				   struct iovec const *msg_sect,

				   u32 num_sect,

				   u32 destaddr)

{

	struct link *l_ptr;

	struct tipc_node *node;

	struct tipc_msg *hdr = &sender->publ.phdr;

	struct tipc_msg *hdr = &sender->phdr;

	u32 dsz = msg_data_sz(hdr);

	u32 max_pkt, fragm_sz, rest;

	struct tipc_msg fragm_hdr;
@@ -1142,7 +1142,7 @@ static int link_send_sections_long(struct port *sender, 


again:

	fragm_no = 1;

	max_pkt = sender->publ.max_pkt - INT_H_SIZE;

	max_pkt = sender->max_pkt - INT_H_SIZE;

		/* leave room for tunnel header in case of link changeover */

	fragm_sz = max_pkt - INT_H_SIZE;

		/* leave room for fragmentation header in each fragment */
@@ -1157,7 +1157,7 @@ static int link_send_sections_long(struct port *sender, 


	tipc_msg_init(&fragm_hdr, MSG_FRAGMENTER, FIRST_FRAGMENT,

		 INT_H_SIZE, msg_destnode(hdr));

	msg_set_link_selector(&fragm_hdr, sender->publ.ref);

	msg_set_link_selector(&fragm_hdr, sender->ref);

	msg_set_size(&fragm_hdr, max_pkt);

	msg_set_fragm_no(&fragm_hdr, 1);
@@ -1238,13 +1238,13 @@ static int link_send_sections_long(struct port *sender, 
	node = tipc_node_find(destaddr);

	if (likely(node)) {

		tipc_node_lock(node);

		l_ptr = node->active_links[sender->publ.ref & 1];

		l_ptr = node->active_links[sender->ref & 1];

		if (!l_ptr) {

			tipc_node_unlock(node);

			goto reject;

		}

		if (l_ptr->max_pkt < max_pkt) {

			sender->publ.max_pkt = l_ptr->max_pkt;

			sender->max_pkt = l_ptr->max_pkt;

			tipc_node_unlock(node);

			for (; buf_chain; buf_chain = buf) {

				buf = buf_chain->next;

net/tipc/link.h

+3 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * net/tipc/link.h: Include file for TIPC link code

 *

 * Copyright (c) 1995-2006, Ericsson AB

 * Copyright (c) 2004-2005, Wind River Systems

 * Copyright (c) 2004-2005, 2010-2011, Wind River Systems

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -211,7 +211,7 @@ struct link { 
	} stats;

};



struct port;

struct tipc_port;



struct link *tipc_link_create(struct bearer *b_ptr, const u32 peer,

			      const struct tipc_media_addr *media_addr);
@@ -230,7 +230,7 @@ void tipc_link_reset(struct link *l_ptr); 
int tipc_link_send(struct sk_buff *buf, u32 dest, u32 selector);

int tipc_link_send_buf(struct link *l_ptr, struct sk_buff *buf);

u32 tipc_link_get_max_pkt(u32 dest, u32 selector);

int tipc_link_send_sections_fast(struct port *sender,

int tipc_link_send_sections_fast(struct tipc_port *sender,

				 struct iovec const *msg_sect,

				 const u32 num_sect,

				 u32 destnode);

net/tipc/port.c

+117 −117

File changed.

Preview size limit exceeded, changes collapsed.

net/tipc/port.h

+29 −38

File changed.

Preview size limit exceeded, changes collapsed.

net/tipc/subscr.c

+3 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * net/tipc/subscr.c: TIPC network topology service

 *

 * Copyright (c) 2000-2006, Ericsson AB

 * Copyright (c) 2005-2007, Wind River Systems

 * Copyright (c) 2005-2007, 2010-2011, Wind River Systems

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -160,7 +160,7 @@ void tipc_subscr_report_overlap(struct subscription *sub, 


static void subscr_timeout(struct subscription *sub)

{

	struct port *server_port;

	struct tipc_port *server_port;



	/* Validate server port reference (in case subscriber is terminating) */
@@ -508,7 +508,7 @@ static void subscr_named_msg_event(void *usr_handle, 


	/* Lock server port (& save lock address for future use) */



	subscriber->lock = tipc_port_lock(subscriber->port_ref)->publ.lock;

	subscriber->lock = tipc_port_lock(subscriber->port_ref)->lock;



	/* Add subscriber to topology server's subscriber list */