diff options
| -rw-r--r-- | net/tipc/group.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/tipc/group.c b/net/tipc/group.c index 652fa66a87f6..a352e098f0e7 100644 --- a/net/tipc/group.c +++ b/net/tipc/group.c | |||
| @@ -49,7 +49,6 @@ | |||
| 49 | #define ADV_ACTIVE (ADV_UNIT * 12) | 49 | #define ADV_ACTIVE (ADV_UNIT * 12) |
| 50 | 50 | ||
| 51 | enum mbr_state { | 51 | enum mbr_state { |
| 52 | MBR_QUARANTINED, | ||
| 53 | MBR_DISCOVERED, | 52 | MBR_DISCOVERED, |
| 54 | MBR_JOINING, | 53 | MBR_JOINING, |
| 55 | MBR_PUBLISHED, | 54 | MBR_PUBLISHED, |
| @@ -138,7 +137,7 @@ u16 tipc_group_bc_snd_nxt(struct tipc_group *grp) | |||
| 138 | 137 | ||
| 139 | static bool tipc_group_is_receiver(struct tipc_member *m) | 138 | static bool tipc_group_is_receiver(struct tipc_member *m) |
| 140 | { | 139 | { |
| 141 | return m->state != MBR_QUARANTINED && m->state != MBR_LEAVING; | 140 | return m && m->state != MBR_JOINING && m->state != MBR_LEAVING; |
| 142 | } | 141 | } |
| 143 | 142 | ||
| 144 | static bool tipc_group_is_sender(struct tipc_member *m) | 143 | static bool tipc_group_is_sender(struct tipc_member *m) |
| @@ -690,7 +689,7 @@ void tipc_group_proto_rcv(struct tipc_group *grp, bool *usr_wakeup, | |||
| 690 | case GRP_JOIN_MSG: | 689 | case GRP_JOIN_MSG: |
| 691 | if (!m) | 690 | if (!m) |
| 692 | m = tipc_group_create_member(grp, node, port, | 691 | m = tipc_group_create_member(grp, node, port, |
| 693 | MBR_QUARANTINED); | 692 | MBR_JOINING); |
| 694 | if (!m) | 693 | if (!m) |
| 695 | return; | 694 | return; |
| 696 | m->bc_syncpt = msg_grp_bc_syncpt(hdr); | 695 | m->bc_syncpt = msg_grp_bc_syncpt(hdr); |
