Skip to content

Commit

Permalink
Merge branch 'tipc-Dec29-2011' of git://git.kernel.org/pub/scm/linux/…
Browse files Browse the repository at this point in the history 
…kernel/git/paulg/linux
  • Loading branch information
David S. Miller committed Dec 30, 2011
2 parents 7f8e323 + f19765f commit 56be178
Show file tree
Hide file tree
Showing 18 changed files with 248 additions and 237 deletions.
46 changes: 23 additions & 23 deletions net/tipc/bcast.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,21 +46,21 @@
#define BCLINK_WIN_DEFAULT 20 /* bcast link window size (default) */

/**
* struct bcbearer_pair - a pair of bearers used by broadcast link
* struct tipc_bcbearer_pair - a pair of bearers used by broadcast link
* @primary: pointer to primary bearer
* @secondary: pointer to secondary bearer
*
* Bearers must have same priority and same set of reachable destinations
* to be paired.
*/

struct bcbearer_pair {
struct tipc_bcbearer_pair {
struct tipc_bearer *primary;
struct tipc_bearer *secondary;
};

/**
* struct bcbearer - bearer used by broadcast link
* struct tipc_bcbearer - bearer used by broadcast link
* @bearer: (non-standard) broadcast bearer structure
* @media: (non-standard) broadcast media structure
* @bpairs: array of bearer pairs
Expand All @@ -74,17 +74,17 @@ struct bcbearer_pair {
* prevented through use of the spinlock "bc_lock".
*/

struct bcbearer {
struct tipc_bcbearer {
struct tipc_bearer bearer;
struct media media;
struct bcbearer_pair bpairs[MAX_BEARERS];
struct bcbearer_pair bpairs_temp[TIPC_MAX_LINK_PRI + 1];
struct tipc_media media;
struct tipc_bcbearer_pair bpairs[MAX_BEARERS];
struct tipc_bcbearer_pair bpairs_temp[TIPC_MAX_LINK_PRI + 1];
struct tipc_node_map remains;
struct tipc_node_map remains_new;
};

/**
* struct bclink - link used for broadcast messages
* struct tipc_bclink - link used for broadcast messages
* @link: (non-standard) broadcast link structure
* @node: (non-standard) node structure representing b'cast link's peer node
* @bcast_nodes: map of broadcast-capable nodes
Expand All @@ -93,19 +93,19 @@ struct bcbearer {
* Handles sequence numbering, fragmentation, bundling, etc.
*/

struct bclink {
struct link link;
struct tipc_bclink {
struct tipc_link link;
struct tipc_node node;
struct tipc_node_map bcast_nodes;
struct tipc_node *retransmit_to;
};

static struct bcbearer bcast_bearer;
static struct bclink bcast_link;
static struct tipc_bcbearer bcast_bearer;
static struct tipc_bclink bcast_link;

static struct bcbearer *bcbearer = &bcast_bearer;
static struct bclink *bclink = &bcast_link;
static struct link *bcl = &bcast_link.link;
static struct tipc_bcbearer *bcbearer = &bcast_bearer;
static struct tipc_bclink *bclink = &bcast_link;
static struct tipc_link *bcl = &bcast_link.link;

static DEFINE_SPINLOCK(bc_lock);

Expand Down Expand Up @@ -308,7 +308,7 @@ void tipc_bclink_acknowledge(struct tipc_node *n_ptr, u32 acked)

static void bclink_send_ack(struct tipc_node *n_ptr)
{
struct link *l_ptr = n_ptr->active_links[n_ptr->addr & 1];
struct tipc_link *l_ptr = n_ptr->active_links[n_ptr->addr & 1];

if (l_ptr != NULL)
tipc_link_send_proto_msg(l_ptr, STATE_MSG, 0, 0, 0, 0, 0);
Expand Down Expand Up @@ -677,8 +677,8 @@ static int tipc_bcbearer_send(struct sk_buff *buf,

void tipc_bcbearer_sort(void)
{
struct bcbearer_pair *bp_temp = bcbearer->bpairs_temp;
struct bcbearer_pair *bp_curr;
struct tipc_bcbearer_pair *bp_temp = bcbearer->bpairs_temp;
struct tipc_bcbearer_pair *bp_curr;
int b_index;
int pri;

Expand Down Expand Up @@ -893,9 +893,9 @@ static void tipc_nmap_diff(struct tipc_node_map *nm_a,
* tipc_port_list_add - add a port to a port list, ensuring no duplicates
*/

void tipc_port_list_add(struct port_list *pl_ptr, u32 port)
void tipc_port_list_add(struct tipc_port_list *pl_ptr, u32 port)
{
struct port_list *item = pl_ptr;
struct tipc_port_list *item = pl_ptr;
int i;
int item_sz = PLSIZE;
int cnt = pl_ptr->count;
Expand Down Expand Up @@ -927,10 +927,10 @@ void tipc_port_list_add(struct port_list *pl_ptr, u32 port)
*
*/

void tipc_port_list_free(struct port_list *pl_ptr)
void tipc_port_list_free(struct tipc_port_list *pl_ptr)
{
struct port_list *item;
struct port_list *next;
struct tipc_port_list *item;
struct tipc_port_list *next;

for (item = pl_ptr->next; item; item = next) {
next = item->next;
Expand Down
10 changes: 5 additions & 5 deletions net/tipc/bcast.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ struct tipc_node_map {
#define PLSIZE 32

/**
* struct port_list - set of node local destination ports
* struct tipc_port_list - set of node local destination ports
* @count: # of ports in set (only valid for first entry in list)
* @next: pointer to next entry in list
* @ports: array of port references
*/

struct port_list {
struct tipc_port_list {
int count;
struct port_list *next;
struct tipc_port_list *next;
u32 ports[PLSIZE];
};

Expand All @@ -83,8 +83,8 @@ static inline int tipc_nmap_equal(struct tipc_node_map *nm_a, struct tipc_node_m
return !memcmp(nm_a, nm_b, sizeof(*nm_a));
}

void tipc_port_list_add(struct port_list *pl_ptr, u32 port);
void tipc_port_list_free(struct port_list *pl_ptr);
void tipc_port_list_add(struct tipc_port_list *pl_ptr, u32 port);
void tipc_port_list_free(struct tipc_port_list *pl_ptr);

void tipc_bclink_init(void);
void tipc_bclink_stop(void);
Expand Down
42 changes: 22 additions & 20 deletions net/tipc/bearer.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

#define MAX_ADDR_STR 32

static struct media *media_list[MAX_MEDIA];
static struct tipc_media *media_list[MAX_MEDIA];
static u32 media_count;

struct tipc_bearer tipc_bearers[MAX_BEARERS];
Expand All @@ -68,7 +68,7 @@ static int media_name_valid(const char *name)
* tipc_media_find - locates specified media object by name
*/

struct media *tipc_media_find(const char *name)
struct tipc_media *tipc_media_find(const char *name)
{
u32 i;

Expand All @@ -83,7 +83,7 @@ struct media *tipc_media_find(const char *name)
* media_find_id - locates specified media object by type identifier
*/

static struct media *media_find_id(u8 type)
static struct tipc_media *media_find_id(u8 type)
{
u32 i;

Expand All @@ -100,7 +100,7 @@ static struct media *media_find_id(u8 type)
* Bearers for this media type must be activated separately at a later stage.
*/

int tipc_register_media(struct media *m_ptr)
int tipc_register_media(struct tipc_media *m_ptr)
{
int res = -EINVAL;

Expand Down Expand Up @@ -138,7 +138,7 @@ int tipc_register_media(struct media *m_ptr)
void tipc_media_addr_printf(struct print_buf *pb, struct tipc_media_addr *a)
{
char addr_str[MAX_ADDR_STR];
struct media *m_ptr;
struct tipc_media *m_ptr;

m_ptr = media_find_id(a->media_id);

Expand Down Expand Up @@ -185,7 +185,7 @@ struct sk_buff *tipc_media_get_names(void)
*/

static int bearer_name_validate(const char *name,
struct bearer_name *name_parts)
struct tipc_bearer_names *name_parts)
{
char name_copy[TIPC_MAX_BEARER_NAME];
char *media_name;
Expand Down Expand Up @@ -318,7 +318,7 @@ void tipc_bearer_remove_dest(struct tipc_bearer *b_ptr, u32 dest)
static int bearer_push(struct tipc_bearer *b_ptr)
{
u32 res = 0;
struct link *ln, *tln;
struct tipc_link *ln, *tln;

if (b_ptr->blocked)
return 0;
Expand Down Expand Up @@ -364,7 +364,8 @@ void tipc_continue(struct tipc_bearer *b_ptr)
* bearer.lock is busy
*/

static void tipc_bearer_schedule_unlocked(struct tipc_bearer *b_ptr, struct link *l_ptr)
static void tipc_bearer_schedule_unlocked(struct tipc_bearer *b_ptr,
struct tipc_link *l_ptr)
{
list_move_tail(&l_ptr->link_list, &b_ptr->cong_links);
}
Expand All @@ -377,7 +378,7 @@ static void tipc_bearer_schedule_unlocked(struct tipc_bearer *b_ptr, struct link
* bearer.lock is free
*/

void tipc_bearer_schedule(struct tipc_bearer *b_ptr, struct link *l_ptr)
void tipc_bearer_schedule(struct tipc_bearer *b_ptr, struct tipc_link *l_ptr)
{
spin_lock_bh(&b_ptr->lock);
tipc_bearer_schedule_unlocked(b_ptr, l_ptr);
Expand All @@ -390,7 +391,8 @@ void tipc_bearer_schedule(struct tipc_bearer *b_ptr, struct link *l_ptr)
* and if there is, try to resolve it before returning.
* 'tipc_net_lock' is read_locked when this function is called
*/
int tipc_bearer_resolve_congestion(struct tipc_bearer *b_ptr, struct link *l_ptr)
int tipc_bearer_resolve_congestion(struct tipc_bearer *b_ptr,
struct tipc_link *l_ptr)
{
int res = 1;

Expand All @@ -409,7 +411,7 @@ int tipc_bearer_resolve_congestion(struct tipc_bearer *b_ptr, struct link *l_ptr
* tipc_bearer_congested - determines if bearer is currently congested
*/

int tipc_bearer_congested(struct tipc_bearer *b_ptr, struct link *l_ptr)
int tipc_bearer_congested(struct tipc_bearer *b_ptr, struct tipc_link *l_ptr)
{
if (unlikely(b_ptr->blocked))
return 1;
Expand All @@ -425,8 +427,8 @@ int tipc_bearer_congested(struct tipc_bearer *b_ptr, struct link *l_ptr)
int tipc_enable_bearer(const char *name, u32 disc_domain, u32 priority)
{
struct tipc_bearer *b_ptr;
struct media *m_ptr;
struct bearer_name b_name;
struct tipc_media *m_ptr;
struct tipc_bearer_names b_names;
char addr_string[16];
u32 bearer_id;
u32 with_this_prio;
Expand All @@ -438,7 +440,7 @@ int tipc_enable_bearer(const char *name, u32 disc_domain, u32 priority)
name);
return -ENOPROTOOPT;
}
if (!bearer_name_validate(name, &b_name)) {
if (!bearer_name_validate(name, &b_names)) {
warn("Bearer <%s> rejected, illegal name\n", name);
return -EINVAL;
}
Expand All @@ -463,10 +465,10 @@ int tipc_enable_bearer(const char *name, u32 disc_domain, u32 priority)

write_lock_bh(&tipc_net_lock);

m_ptr = tipc_media_find(b_name.media_name);
m_ptr = tipc_media_find(b_names.media_name);
if (!m_ptr) {
warn("Bearer <%s> rejected, media <%s> not registered\n", name,
b_name.media_name);
b_names.media_name);
goto exit;
}

Expand Down Expand Up @@ -544,8 +546,8 @@ int tipc_enable_bearer(const char *name, u32 disc_domain, u32 priority)
int tipc_block_bearer(const char *name)
{
struct tipc_bearer *b_ptr = NULL;
struct link *l_ptr;
struct link *temp_l_ptr;
struct tipc_link *l_ptr;
struct tipc_link *temp_l_ptr;

read_lock_bh(&tipc_net_lock);
b_ptr = tipc_bearer_find(name);
Expand Down Expand Up @@ -579,8 +581,8 @@ int tipc_block_bearer(const char *name)

static void bearer_disable(struct tipc_bearer *b_ptr)
{
struct link *l_ptr;
struct link *temp_l_ptr;
struct tipc_link *l_ptr;
struct tipc_link *temp_l_ptr;

info("Disabling bearer <%s>\n", b_ptr->name);
spin_lock_bh(&b_ptr->lock);
Expand Down
23 changes: 12 additions & 11 deletions net/tipc/bearer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ struct tipc_media_addr {
struct tipc_bearer;

/**
* struct media - TIPC media information available to internal users
* struct tipc_media - TIPC media information available to internal users
* @send_msg: routine which handles buffer transmission
* @enable_bearer: routine which enables a bearer
* @disable_bearer: routine which disables a bearer
Expand All @@ -90,7 +90,7 @@ struct tipc_bearer;
* @name: media name
*/

struct media {
struct tipc_media {
int (*send_msg)(struct sk_buff *buf,
struct tipc_bearer *b_ptr,
struct tipc_media_addr *dest);
Expand Down Expand Up @@ -139,32 +139,32 @@ struct tipc_bearer {
struct tipc_media_addr addr; /* initalized by media */
char name[TIPC_MAX_BEARER_NAME];
spinlock_t lock;
struct media *media;
struct tipc_media *media;
u32 priority;
u32 window;
u32 tolerance;
u32 identity;
struct link_req *link_req;
struct tipc_link_req *link_req;
struct list_head links;
struct list_head cong_links;
int active;
char net_plane;
struct tipc_node_map nodes;
};

struct bearer_name {
struct tipc_bearer_names {
char media_name[TIPC_MAX_MEDIA_NAME];
char if_name[TIPC_MAX_IF_NAME];
};

struct link;
struct tipc_link;

extern struct tipc_bearer tipc_bearers[];

/*
* TIPC routines available to supported media types
*/
int tipc_register_media(struct media *m_ptr);
int tipc_register_media(struct tipc_media *m_ptr);

void tipc_recv_msg(struct sk_buff *buf, struct tipc_bearer *tb_ptr);

Expand All @@ -188,12 +188,13 @@ struct sk_buff *tipc_media_get_names(void);
struct sk_buff *tipc_bearer_get_names(void);
void tipc_bearer_add_dest(struct tipc_bearer *b_ptr, u32 dest);
void tipc_bearer_remove_dest(struct tipc_bearer *b_ptr, u32 dest);
void tipc_bearer_schedule(struct tipc_bearer *b_ptr, struct link *l_ptr);
void tipc_bearer_schedule(struct tipc_bearer *b_ptr, struct tipc_link *l_ptr);
struct tipc_bearer *tipc_bearer_find(const char *name);
struct tipc_bearer *tipc_bearer_find_interface(const char *if_name);
struct media *tipc_media_find(const char *name);
int tipc_bearer_resolve_congestion(struct tipc_bearer *b_ptr, struct link *l_ptr);
int tipc_bearer_congested(struct tipc_bearer *b_ptr, struct link *l_ptr);
struct tipc_media *tipc_media_find(const char *name);
int tipc_bearer_resolve_congestion(struct tipc_bearer *b_ptr,
struct tipc_link *l_ptr);
int tipc_bearer_congested(struct tipc_bearer *b_ptr, struct tipc_link *l_ptr);
void tipc_bearer_stop(void);
void tipc_bearer_lock_push(struct tipc_bearer *b_ptr);

Expand Down
Loading

0 comments on commit 56be178

Please sign in to comment.