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

Commit 1897fe55 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'tipc-Jun24-2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/net-next-2.6

parents cd5f3e20 e4a0aee4

net/tipc/bcast.c

+5 −1
Original line number Diff line number Diff line
@@ -552,12 +552,16 @@ static int tipc_bcbearer_send(struct sk_buff *buf, 
	if (likely(!msg_non_seq(buf_msg(buf)))) {

		struct tipc_msg *msg;



		assert(tipc_bcast_nmap.count != 0);

		bcbuf_set_acks(buf, tipc_bcast_nmap.count);

		msg = buf_msg(buf);

		msg_set_non_seq(msg, 1);

		msg_set_mc_netid(msg, tipc_net_id);

		bcl->stats.sent_info++;



		if (WARN_ON(!tipc_bcast_nmap.count)) {

			dump_stack();

			return 0;

		}

	}



	/* Send buffer over bearers until all targets reached */

net/tipc/bearer.c

+0 −1
Original line number Diff line number Diff line
@@ -402,7 +402,6 @@ void tipc_bearer_lock_push(struct tipc_bearer *b_ptr) 
void tipc_continue(struct tipc_bearer *b_ptr)

{

	spin_lock_bh(&b_ptr->lock);

	b_ptr->continue_count++;

	if (!list_empty(&b_ptr->cong_links))

		tipc_k_signal((Handler)tipc_bearer_lock_push, (unsigned long)b_ptr);

	b_ptr->blocked = 0;

net/tipc/bearer.h

+0 −2
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ struct media { 
 * @link_req: ptr to (optional) structure making periodic link setup requests

 * @links: list of non-congested links associated with bearer

 * @cong_links: list of congested links associated with bearer

 * @continue_count: # of times bearer has resumed after congestion or blocking

 * @active: non-zero if bearer structure is represents a bearer

 * @net_plane: network plane ('A' through 'H') currently associated with bearer

 * @nodes: indicates which nodes in cluster can be reached through bearer
@@ -129,7 +128,6 @@ struct tipc_bearer { 
	struct link_req *link_req;

	struct list_head links;

	struct list_head cong_links;

	u32 continue_count;

	int active;

	char net_plane;

	struct tipc_node_map nodes;

net/tipc/core.h

+0 −6
Original line number Diff line number Diff line
@@ -61,12 +61,6 @@ 
struct tipc_msg;	/* msg.h */

struct print_buf;	/* log.h */



/*

 * TIPC sanity test macros

 */



#define assert(i)  BUG_ON(!(i))



/*

 * TIPC system monitoring code

 */

net/tipc/link.c

+3 −3
Original line number Diff line number Diff line
@@ -1572,7 +1572,7 @@ static struct sk_buff *link_insert_deferred_queue(struct link *l_ptr, 
static int link_recv_buf_validate(struct sk_buff *buf)

{

	static u32 min_data_hdr_size[8] = {

		SHORT_H_SIZE, MCAST_H_SIZE, LONG_H_SIZE, DIR_MSG_H_SIZE,

		SHORT_H_SIZE, MCAST_H_SIZE, NAMED_H_SIZE, BASIC_H_SIZE,

		MAX_H_SIZE, MAX_H_SIZE, MAX_H_SIZE, MAX_H_SIZE

		};
@@ -2553,7 +2553,7 @@ int tipc_link_recv_fragment(struct sk_buff **pending, struct sk_buff **fb, 
		u32 msg_sz = msg_size(imsg);

		u32 fragm_sz = msg_data_sz(fragm);

		u32 exp_fragm_cnt = msg_sz/fragm_sz + !!(msg_sz % fragm_sz);

		u32 max =  TIPC_MAX_USER_MSG_SIZE + LONG_H_SIZE;

		u32 max =  TIPC_MAX_USER_MSG_SIZE + NAMED_H_SIZE;

		if (msg_type(imsg) == TIPC_MCAST_MSG)

			max = TIPC_MAX_USER_MSG_SIZE + MCAST_H_SIZE;

		if (msg_size(imsg) > max) {
@@ -2882,7 +2882,7 @@ static int tipc_link_stats(const char *name, char *buf, const u32 buf_size) 
		profile_total = 1;

	tipc_printf(&pb, "  TX profile sample:%u packets  average:%u octets\n"

			 "  0-64:%u%% -256:%u%% -1024:%u%% -4096:%u%% "

			 "-16354:%u%% -32768:%u%% -66000:%u%%\n",

			 "-16384:%u%% -32768:%u%% -66000:%u%%\n",

		    l_ptr->stats.msg_length_counts,

		    l_ptr->stats.msg_lengths_total / profile_total,

		    percent(l_ptr->stats.msg_length_profile[0], profile_total),