4646#define BCLINK_WIN_DEFAULT 20 /* bcast link window size (default) */
4747
4848/**
49- * struct bcbearer_pair - a pair of bearers used by broadcast link
49+ * struct tipc_bcbearer_pair - a pair of bearers used by broadcast link
5050 * @primary: pointer to primary bearer
5151 * @secondary: pointer to secondary bearer
5252 *
5353 * Bearers must have same priority and same set of reachable destinations
5454 * to be paired.
5555 */
5656
57- struct bcbearer_pair {
57+ struct tipc_bcbearer_pair {
5858 struct tipc_bearer * primary ;
5959 struct tipc_bearer * secondary ;
6060};
6161
6262/**
63- * struct bcbearer - bearer used by broadcast link
63+ * struct tipc_bcbearer - bearer used by broadcast link
6464 * @bearer: (non-standard) broadcast bearer structure
6565 * @media: (non-standard) broadcast media structure
6666 * @bpairs: array of bearer pairs
@@ -74,11 +74,11 @@ struct bcbearer_pair {
7474 * prevented through use of the spinlock "bc_lock".
7575 */
7676
77- struct bcbearer {
77+ struct tipc_bcbearer {
7878 struct tipc_bearer bearer ;
7979 struct tipc_media media ;
80- struct bcbearer_pair bpairs [MAX_BEARERS ];
81- struct bcbearer_pair bpairs_temp [TIPC_MAX_LINK_PRI + 1 ];
80+ struct tipc_bcbearer_pair bpairs [MAX_BEARERS ];
81+ struct tipc_bcbearer_pair bpairs_temp [TIPC_MAX_LINK_PRI + 1 ];
8282 struct tipc_node_map remains ;
8383 struct tipc_node_map remains_new ;
8484};
@@ -100,10 +100,10 @@ struct tipc_bclink {
100100 struct tipc_node * retransmit_to ;
101101};
102102
103- static struct bcbearer bcast_bearer ;
103+ static struct tipc_bcbearer bcast_bearer ;
104104static struct tipc_bclink bcast_link ;
105105
106- static struct bcbearer * bcbearer = & bcast_bearer ;
106+ static struct tipc_bcbearer * bcbearer = & bcast_bearer ;
107107static struct tipc_bclink * bclink = & bcast_link ;
108108static struct link * bcl = & bcast_link .link ;
109109
@@ -677,8 +677,8 @@ static int tipc_bcbearer_send(struct sk_buff *buf,
677677
678678void tipc_bcbearer_sort (void )
679679{
680- struct bcbearer_pair * bp_temp = bcbearer -> bpairs_temp ;
681- struct bcbearer_pair * bp_curr ;
680+ struct tipc_bcbearer_pair * bp_temp = bcbearer -> bpairs_temp ;
681+ struct tipc_bcbearer_pair * bp_curr ;
682682 int b_index ;
683683 int pri ;
684684
0 commit comments