netiucv: change name of nop function (21b26f2f) · Commits · 戴 / test

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>

drivers/s390/net/netiucv.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -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);

Admin message