Commit f4f8720f authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller
Browse files

llc2: Call llc_station_exit() on llc2_init() failure path 



Otherwise the station packet handler will remain registered even though
the module is unloaded.

Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6024935f

net/llc/af_llc.c

+3 −2
Original line number Diff line number Diff line
@@ -1206,7 +1206,7 @@ static int __init llc2_init(void) 
	rc = llc_proc_init();

	if (rc != 0) {

		printk(llc_proc_err_msg);

		goto out_unregister_llc_proto;

		goto out_station;

	}

	rc = llc_sysctl_init();

	if (rc) {
@@ -1226,7 +1226,8 @@ static int __init llc2_init(void) 
	llc_sysctl_exit();

out_proc:

	llc_proc_exit();

out_unregister_llc_proto:

out_station:

	llc_station_exit();

	proto_unregister(&llc_proto);

	goto out;

}

net/llc/llc_station.c

+1 −1
Original line number Diff line number Diff line
@@ -701,7 +701,7 @@ void __init llc_station_init(void) 
	llc_main_station.state		= LLC_STATION_STATE_UP;

}



void __exit llc_station_exit(void)

void llc_station_exit(void)

{

	llc_set_station_handler(NULL);

}