Commit 6024935f authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller

llc2: Fix silent failure of llc_station_init()

llc_station_init() creates and processes an event skb with no effect
other than to change the state from DOWN to UP.  Allocation failure is
reported, but then ignored by its caller, llc2_init().  Remove this
possibility by simply initialising the state as UP.
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4855d6f3
...@@ -133,7 +133,7 @@ extern int llc_build_and_send_ui_pkt(struct llc_sap *sap, struct sk_buff *skb, ...@@ -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_sap_handler(struct llc_sap *sap, struct sk_buff *skb);
extern void llc_conn_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); extern void llc_station_exit(void);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
......
...@@ -687,12 +687,8 @@ static void llc_station_rcv(struct sk_buff *skb) ...@@ -687,12 +687,8 @@ static void llc_station_rcv(struct sk_buff *skb)
llc_station_state_process(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.mac_pdu_q);
skb_queue_head_init(&llc_main_station.ev_q.list); skb_queue_head_init(&llc_main_station.ev_q.list);
spin_lock_init(&llc_main_station.ev_q.lock); spin_lock_init(&llc_main_station.ev_q.lock);
...@@ -700,20 +696,9 @@ int __init llc_station_init(void) ...@@ -700,20 +696,9 @@ int __init llc_station_init(void)
(unsigned long)&llc_main_station); (unsigned long)&llc_main_station);
llc_main_station.ack_timer.expires = jiffies + llc_main_station.ack_timer.expires = jiffies +
sysctl_llc_station_ack_timeout; sysctl_llc_station_ack_timeout;
skb = alloc_skb(0, GFP_ATOMIC);
if (!skb)
goto out;
rc = 0;
llc_set_station_handler(llc_station_rcv); 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.maximum_retry = 1;
llc_main_station.state = LLC_STATION_STATE_DOWN; llc_main_station.state = LLC_STATION_STATE_UP;
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;
} }
void __exit llc_station_exit(void) void __exit llc_station_exit(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment