summaryrefslogtreecommitdiffstats
path: root/drivers/s390/net
diff options
context:
space:
mode:
authorUrsula Braun <braunu@de.ibm.com>2008-02-08 13:09:03 +0100
committerJeff Garzik <jeff@garzik.org>2008-02-11 11:14:48 -0500
commit21b26f2fee6883f69f56fb8ff6c2996eda45b063 (patch)
tree21f551d30cd25c7b66a40154643d4495e6aedf27 /drivers/s390/net
parent2219510f083ee4d7e9e6bb0dedda70334f073dc4 (diff)
downloadlinux-21b26f2fee6883f69f56fb8ff6c2996eda45b063.tar.gz
linux-21b26f2fee6883f69f56fb8ff6c2996eda45b063.tar.bz2
linux-21b26f2fee6883f69f56fb8ff6c2996eda45b063.zip
netiucv: change name of nop function
Dummy NOP actions for fsm-statemachines have to be defined separately for every using module of fsm-statemachines. Thus the generic name fsm_action_nop is replaced by module specific name netiucv_action_nop. Signed-off-by: Ursula Braun <braunu@de.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/s390/net')
-rw-r--r--drivers/s390/net/netiucv.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index 05c9e4dbb7be..42d701b5921c 100644
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -573,9 +573,9 @@ static void netiucv_callback_connres(struct iucv_path *path, u8 ipuser[16])
}
/**
- * Dummy NOP action for all statemachines
+ * NOP action for statemachines
*/
-static void fsm_action_nop(fsm_instance *fi, int event, void *arg)
+static void netiucv_action_nop(fsm_instance *fi, int event, void *arg)
{
}
@@ -1111,7 +1111,7 @@ static const fsm_node dev_fsm[] = {
{ DEV_STATE_RUNNING, DEV_EVENT_STOP, dev_action_stop },
{ DEV_STATE_RUNNING, DEV_EVENT_CONDOWN, dev_action_conndown },
- { DEV_STATE_RUNNING, DEV_EVENT_CONUP, fsm_action_nop },
+ { DEV_STATE_RUNNING, DEV_EVENT_CONUP, netiucv_action_nop },
};
static const int DEV_FSM_LEN = sizeof(dev_fsm) / sizeof(fsm_node);