linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / net / llc / llc_core.c

diff --git a/net/llc/llc_core.c b/net/llc/llc_core.c
index d12413c..ab0fcd3 100644 (file)
--- a/net/llc/llc_core.c
+++ b/net/llc/llc_core.c
@@ -33,9 +33,10 @@ unsigned char llc_station_mac_sa[ETH_ALEN];
  */
 static struct llc_sap *llc_sap_alloc(void)
 {
-       struct llc_sap *sap = kzalloc(sizeof(*sap), GFP_ATOMIC);
+       struct llc_sap *sap = kmalloc(sizeof(*sap), GFP_ATOMIC);
 
        if (sap) {
+               memset(sap, 0, sizeof(*sap));
                sap->state = LLC_SAP_STATE_ACTIVE;
                memcpy(sap->laddr.mac, llc_station_mac_sa, ETH_ALEN);
                rwlock_init(&sap->sk_list.lock);
@@ -126,6 +127,7 @@ struct llc_sap *llc_sap_open(unsigned char lsap,
                goto out;
        sap->laddr.lsap = lsap;
        sap->rcv_func   = func;
+       llc_sap_hold(sap);
        llc_add_sap(sap);
 out:
        write_unlock_bh(&llc_sap_list_lock);