diff options
| author | Sjur Brændeland <sjur.brandeland@stericsson.com> | 2011-04-11 10:11:29 +0000 |
|---|---|---|
| committer | Robert Marklund <robert.marklund@stericsson.com> | 2011-10-05 12:10:41 +0200 |
| commit | 70c63b7c54a55d5f538509d487ebe5d94e96e496 (patch) | |
| tree | 4794142c173c44d130d79916bdea7ec13604a402 /net | |
| parent | 660387374979ec7b5a31980fc2dfcd2085be705b (diff) | |
caif: Bugfix use for_each_safe when removing list nodes.
Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Change-Id: I7fec5eb6d17e01a87e89c2e7adec72d2f8babf83
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/21520
Reviewed-by: Erwan BRACQ <erwan.bracq@stericsson.com>
Tested-by: Erwan BRACQ <erwan.bracq@stericsson.com>
Reviewed-by: QATEST
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/caif/cfmuxl.c | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/net/caif/cfmuxl.c b/net/caif/cfmuxl.c index c23979e79df..4884e189ad5 100644 --- a/net/caif/cfmuxl.c +++ b/net/caif/cfmuxl.c @@ -247,27 +247,12 @@ static void cfmuxl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl, int phyid) { struct cfmuxl *muxl = container_obj(layr); + struct list_head *node, *next; struct cflayer *layer; - int idx; - - rcu_read_lock(); - list_for_each_entry_rcu(layer, &muxl->srvl_list, node) { - - if (cfsrvl_phyid_match(layer, phyid) && layer->ctrlcmd) { - - if ((ctrl == _CAIF_CTRLCMD_PHYIF_DOWN_IND || - ctrl == CAIF_CTRLCMD_REMOTE_SHUTDOWN_IND) && - layer->id != 0) { - - idx = layer->id % UP_CACHE_SIZE; - spin_lock_bh(&muxl->receive_lock); - rcu_assign_pointer(muxl->up_cache[idx], NULL); - list_del_rcu(&layer->node); - spin_unlock_bh(&muxl->receive_lock); - } - /* NOTE: ctrlcmd is not allowed to block */ + list_for_each_safe(node, next, &muxl->srvl_list) { + layer = list_entry(node, struct cflayer, node); + if (cfsrvl_phyid_match(layer, phyid)) layer->ctrlcmd(layer, ctrl, phyid); } - } rcu_read_unlock(); } |