Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0be4acec authored by Ursula Braun's avatar Ursula Braun Committed by Jeff Garzik
Browse files

s390: fix Oops when unloading module netiucv 



don't remove an entry from iucv_connection_list in netiucv_exit().
netiucv_free_netdevice is called anyway, which takes care of entry
removal.

Signed-off-by: default avatarUrsula Braun <braunu@de.ibm.com>
Signed-off-by: default avatarFrank Pavlic <fpavlic@de.ibm.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 1f8bdae9

drivers/s390/net/netiucv.c

+3 −2
Original line number Diff line number Diff line
@@ -1862,12 +1862,14 @@ static void netiucv_remove_connection(struct iucv_connection *conn) 
	write_lock_bh(&iucv_connection_rwlock);

	list_del_init(&conn->list);

	write_unlock_bh(&iucv_connection_rwlock);

	fsm_deltimer(&conn->timer);

	netiucv_purge_skb_queue(&conn->collect_queue);

	if (conn->path) {

		iucv_path_sever(conn->path, iucvMagic);

		kfree(conn->path);

		conn->path = NULL;

	}

	fsm_deltimer(&conn->timer);

	netiucv_purge_skb_queue(&conn->commit_queue);

	kfree_fsm(conn->fsm);

	kfree_skb(conn->rx_buff);

	kfree_skb(conn->tx_buff);
@@ -2115,7 +2117,6 @@ static void __exit netiucv_exit(void) 
	while (!list_empty(&iucv_connection_list)) {

		cp = list_entry(iucv_connection_list.next,

				struct iucv_connection, list);

		list_del(&cp->list);

		ndev = cp->netdev;

		priv = netdev_priv(ndev);

		dev = priv->dev;