caif: Move refcount from service layer to sock and dev.
Instead of having reference counts in caif service layers, we hook into existing refcount handling in socket layer and netdevice. Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
cb3cb423a0
commit
43e3692101
@@ -10,6 +10,7 @@
|
||||
#include <linux/stddef.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/kref.h>
|
||||
#include <linux/rculist.h>
|
||||
|
||||
struct cfsrvl {
|
||||
struct cflayer layer;
|
||||
@@ -17,9 +18,11 @@ struct cfsrvl {
|
||||
bool phy_flow_on;
|
||||
bool modem_flow_on;
|
||||
bool supports_flowctrl;
|
||||
void (*release)(struct kref *);
|
||||
void (*release)(struct cflayer *layer);
|
||||
struct dev_info dev_info;
|
||||
struct kref ref;
|
||||
void (*hold)(struct cflayer *lyr);
|
||||
void (*put)(struct cflayer *lyr);
|
||||
struct rcu_head rcu;
|
||||
};
|
||||
|
||||
struct cflayer *cfvei_create(u8 linkid, struct dev_info *dev_info);
|
||||
@@ -29,6 +32,10 @@ struct cflayer *cfvidl_create(u8 linkid, struct dev_info *dev_info);
|
||||
struct cflayer *cfrfml_create(u8 linkid, struct dev_info *dev_info,
|
||||
int mtu_size);
|
||||
struct cflayer *cfdbgl_create(u8 linkid, struct dev_info *dev_info);
|
||||
|
||||
void cfsrvl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl,
|
||||
int phyid);
|
||||
|
||||
bool cfsrvl_phyid_match(struct cflayer *layer, int phyid);
|
||||
|
||||
void cfsrvl_init(struct cfsrvl *service,
|
||||
@@ -40,23 +47,19 @@ u8 cfsrvl_getphyid(struct cflayer *layer);
|
||||
|
||||
static inline void cfsrvl_get(struct cflayer *layr)
|
||||
{
|
||||
struct cfsrvl *s;
|
||||
if (layr == NULL)
|
||||
struct cfsrvl *s = container_of(layr, struct cfsrvl, layer);
|
||||
if (layr == NULL || layr->up == NULL || s->hold == NULL)
|
||||
return;
|
||||
s = container_of(layr, struct cfsrvl, layer);
|
||||
kref_get(&s->ref);
|
||||
|
||||
s->hold(layr->up);
|
||||
}
|
||||
|
||||
static inline void cfsrvl_put(struct cflayer *layr)
|
||||
{
|
||||
struct cfsrvl *s;
|
||||
if (layr == NULL)
|
||||
struct cfsrvl *s = container_of(layr, struct cfsrvl, layer);
|
||||
if (layr == NULL || layr->up == NULL || s->hold == NULL)
|
||||
return;
|
||||
s = container_of(layr, struct cfsrvl, layer);
|
||||
|
||||
WARN_ON(!s->release);
|
||||
if (s->release)
|
||||
kref_put(&s->ref, s->release);
|
||||
s->put(layr->up);
|
||||
}
|
||||
|
||||
#endif /* CFSRVL_H_ */
|
||||
|
Reference in New Issue
Block a user