From a97139ef4ef0f29490c01516bba18b3f730afd22 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Mon, 13 Aug 2012 02:49:59 +0000
Subject: [PATCH] --- yaml --- r: 321983 b: refs/heads/master c:
 6024935f5ff5f1646bce8404416318e5fd4a0c4a h: refs/heads/master i:   321981:
 8b211443be0faafb7fee9b71f904948c9a6be009   321979:
 ba3477c9030b6557fbe0f0c97060b1af63ef15c9   321975:
 44eb6a883e397aadfb174b42c9c7856245157e6c   321967:
 4e7346c20209b7128bdcbe373f8a27a4c87fa4ad   321951:
 ae654c143923eb0bc2a16b632e32f2d3880a0f67   321919:
 e83eab381a2c575fe659e4ea6400f59669bd2d46 v: v3

---
 [refs]                      |  2 +-
 trunk/include/net/llc.h     |  2 +-
 trunk/net/llc/llc_station.c | 19 ++-----------------
 3 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 75de615b7b48..4d22a47f3226 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4855d6f3116e891b66198838b683dce3dcf6e874
+refs/heads/master: 6024935f5ff5f1646bce8404416318e5fd4a0c4a
diff --git a/trunk/include/net/llc.h b/trunk/include/net/llc.h
index 226c846cab08..f2d0fc570527 100644
--- a/trunk/include/net/llc.h
+++ b/trunk/include/net/llc.h
@@ -133,7 +133,7 @@ extern int llc_build_and_send_ui_pkt(struct llc_sap *sap, struct sk_buff *skb,
 extern void llc_sap_handler(struct llc_sap *sap, struct sk_buff *skb);
 extern void llc_conn_handler(struct llc_sap *sap, struct sk_buff *skb);
 
-extern int llc_station_init(void);
+extern void llc_station_init(void);
 extern void llc_station_exit(void);
 
 #ifdef CONFIG_PROC_FS
diff --git a/trunk/net/llc/llc_station.c b/trunk/net/llc/llc_station.c
index 6828e39ec2ec..45ddbb93c5d0 100644
--- a/trunk/net/llc/llc_station.c
+++ b/trunk/net/llc/llc_station.c
@@ -687,12 +687,8 @@ static void llc_station_rcv(struct sk_buff *skb)
 	llc_station_state_process(skb);
 }
 
-int __init llc_station_init(void)
+void __init llc_station_init(void)
 {
-	int rc = -ENOBUFS;
-	struct sk_buff *skb;
-	struct llc_station_state_ev *ev;
-
 	skb_queue_head_init(&llc_main_station.mac_pdu_q);
 	skb_queue_head_init(&llc_main_station.ev_q.list);
 	spin_lock_init(&llc_main_station.ev_q.lock);
@@ -700,20 +696,9 @@ int __init llc_station_init(void)
 			(unsigned long)&llc_main_station);
 	llc_main_station.ack_timer.expires  = jiffies +
 						sysctl_llc_station_ack_timeout;
-	skb = alloc_skb(0, GFP_ATOMIC);
-	if (!skb)
-		goto out;
-	rc = 0;
 	llc_set_station_handler(llc_station_rcv);
-	ev = llc_station_ev(skb);
-	memset(ev, 0, sizeof(*ev));
 	llc_main_station.maximum_retry	= 1;
-	llc_main_station.state		= LLC_STATION_STATE_DOWN;
-	ev->type	= LLC_STATION_EV_TYPE_SIMPLE;
-	ev->prim_type	= LLC_STATION_EV_ENABLE_WITHOUT_DUP_ADDR_CHECK;
-	rc = llc_station_next_state(skb);
-out:
-	return rc;
+	llc_main_station.state		= LLC_STATION_STATE_UP;
 }
 
 void __exit llc_station_exit(void)