diff options
| author | Arnaldo Carvalho de Melo <acme@conectiva.com.br> | 2003-04-27 06:04:25 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@conectiva.com.br> | 2003-04-27 06:04:25 -0300 |
| commit | 1d2e977f07249aeaec3314458cf16fb4bd610867 (patch) | |
| tree | e9bcbd751e86c259c349028a310f6a501e81d17f | |
| parent | b1ee64fe12cb23f1e54cac71504ae533fff5f096 (diff) | |
o llc: remove MOD_{INC,DEC}_USE_COUNT
Now the core networking infrastructure will (finally) do that for the net
protocol families, its just a matter of setting the ->owner field in the
registered struct net_proto_family to THIS_MODULE.
| -rw-r--r-- | net/llc/llc_if.c | 9 | ||||
| -rw-r--r-- | net/llc/llc_main.c | 6 |
2 files changed, 3 insertions, 12 deletions
diff --git a/net/llc/llc_if.c b/net/llc/llc_if.c index ffc0771f69e4..7806f24a2bf8 100644 --- a/net/llc/llc_if.c +++ b/net/llc/llc_if.c @@ -43,16 +43,15 @@ struct llc_sap *llc_sap_open(u8 lsap, int (*func)(struct sk_buff *skb, /* verify this SAP is not already open; if so, return error */ struct llc_sap *sap; - MOD_INC_USE_COUNT; sap = llc_sap_find(lsap); if (sap) { /* SAP already exists */ sap = NULL; - goto err; + goto out; } /* sap requested does not yet exist */ sap = llc_sap_alloc(); if (!sap) - goto err; + goto out; /* allocated a SAP; initialize it and clear out its memory pool */ sap->laddr.lsap = lsap; sap->rcv_func = func; @@ -61,9 +60,6 @@ struct llc_sap *llc_sap_open(u8 lsap, int (*func)(struct sk_buff *skb, llc_sap_save(sap); out: return sap; -err: - MOD_DEC_USE_COUNT; - goto out; } /** @@ -76,7 +72,6 @@ err: void llc_sap_close(struct llc_sap *sap) { llc_free_sap(sap); - MOD_DEC_USE_COUNT; } /** diff --git a/net/llc/llc_main.c b/net/llc/llc_main.c index b2326faec470..129778fc71ee 100644 --- a/net/llc/llc_main.c +++ b/net/llc/llc_main.c @@ -224,9 +224,8 @@ struct sock *llc_sk_alloc(int family, int priority) { struct sock *sk = sk_alloc(family, priority, 1, NULL); - MOD_INC_USE_COUNT; if (!sk) - goto decmod; + goto out; if (llc_sk_init(sk)) goto outsk; sock_init_data(NULL, sk); @@ -240,8 +239,6 @@ out: outsk: sk_free(sk); sk = NULL; -decmod: - MOD_DEC_USE_COUNT; goto out; } @@ -279,7 +276,6 @@ void llc_sk_free(struct sock *sk) } #endif sock_put(sk); - MOD_DEC_USE_COUNT; } /** |