caif: Bugfix not all services uses flow-ctrl.

Flow control is not used by all CAIF services.
The usage of flow control is now part of the gerneal
initialization function for CAIF Services.

Signed-off-by: Sjur Braendeland@stericsson.com
Signed-off-by: David S. Miller <davem@davemloft.net>

8 files changed, 22 insertions, 16 deletions

diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
index fcfda98a5e6d..107c4b2a311e 100644
--- a/net/caif/cfctrl.c
+++ b/net/caif/cfctrl.c
@@ -43,7 +43,7 @@ struct cflayer *cfctrl_create(void)
         memset(&dev_info, 0, sizeof(dev_info));
         dev_info.id = 0xff;
         memset(this, 0, sizeof(*this));
-        cfsrvl_init(&this->serv, 0, &dev_info);
+        cfsrvl_init(&this->serv, 0, &dev_info, false);
         atomic_set(&this->req_seq_no, 1);
         atomic_set(&this->rsp_seq_no, 1);
         this->serv.layer.receive = cfctrl_recv;
diff --git a/net/caif/cfdbgl.c b/net/caif/cfdbgl.c
index ab6b6dc34cf8..676648cac8dd 100644
--- a/net/caif/cfdbgl.c
+++ b/net/caif/cfdbgl.c
@@ -22,7 +22,7 @@ struct cflayer *cfdbgl_create(u8 channel_id, struct dev_info *dev_info)
         }
         caif_assert(offsetof(struct cfsrvl, layer) == 0);
         memset(dbg, 0, sizeof(struct cfsrvl));
-        cfsrvl_init(dbg, channel_id, dev_info);
+        cfsrvl_init(dbg, channel_id, dev_info, false);
         dbg->layer.receive = cfdbgl_receive;
         dbg->layer.transmit = cfdbgl_transmit;
         snprintf(dbg->layer.name, CAIF_LAYER_NAME_SZ - 1, "dbg%d", channel_id);
diff --git a/net/caif/cfdgml.c b/net/caif/cfdgml.c
index 53194840ecb6..32d9f0dc8463 100644
--- a/net/caif/cfdgml.c
+++ b/net/caif/cfdgml.c
@@ -30,7 +30,7 @@ struct cflayer *cfdgml_create(u8 channel_id, struct dev_info *dev_info)
         }
         caif_assert(offsetof(struct cfsrvl, layer) == 0);
         memset(dgm, 0, sizeof(struct cfsrvl));
-        cfsrvl_init(dgm, channel_id, dev_info);
+        cfsrvl_init(dgm, channel_id, dev_info, true);
         dgm->layer.receive = cfdgml_receive;
         dgm->layer.transmit = cfdgml_transmit;
         snprintf(dgm->layer.name, CAIF_LAYER_NAME_SZ - 1, "dgm%d", channel_id);
diff --git a/net/caif/cfrfml.c b/net/caif/cfrfml.c
index fd27b172fb5d..689cbfd0e43d 100644
--- a/net/caif/cfrfml.c
+++ b/net/caif/cfrfml.c
@@ -23,30 +23,26 @@
 
 static int cfrfml_receive(struct cflayer *layr, struct cfpkt *pkt);
 static int cfrfml_transmit(struct cflayer *layr, struct cfpkt *pkt);
-static int cfservl_modemcmd(struct cflayer *layr, enum caif_modemcmd ctrl);
 
 struct cflayer *cfrfml_create(u8 channel_id, struct dev_info *dev_info)
 {
         struct cfsrvl *rfm = kmalloc(sizeof(struct cfsrvl), GFP_ATOMIC);
+
         if (!rfm) {
                 pr_warning("CAIF: %s(): Out of memory\n", __func__);
                 return NULL;
         }
+
         caif_assert(offsetof(struct cfsrvl, layer) == 0);
+
         memset(rfm, 0, sizeof(struct cfsrvl));
-        cfsrvl_init(rfm, channel_id, dev_info);
-        rfm->layer.modemcmd = cfservl_modemcmd;
+        cfsrvl_init(rfm, channel_id, dev_info, false);
         rfm->layer.receive = cfrfml_receive;
         rfm->layer.transmit = cfrfml_transmit;
         snprintf(rfm->layer.name, CAIF_LAYER_NAME_SZ, "rfm%d", channel_id);
         return &rfm->layer;
 }
 
-static int cfservl_modemcmd(struct cflayer *layr, enum caif_modemcmd ctrl)
-{
-       return -EPROTO;
-}
-
 static int cfrfml_receive(struct cflayer *layr, struct cfpkt *pkt)
 {
         u8 tmp;
diff --git a/net/caif/cfsrvl.c b/net/caif/cfsrvl.c
index 6e5b7079a684..7aa1f03a0151 100644
--- a/net/caif/cfsrvl.c
+++ b/net/caif/cfsrvl.c
@@ -24,8 +24,10 @@ static void cfservl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl,
                                 int phyid)
 {
         struct cfsrvl *service = container_obj(layr);
+
         caif_assert(layr->up != NULL);
         caif_assert(layr->up->ctrlcmd != NULL);
+
         switch (ctrl) {
         case CAIF_CTRLCMD_INIT_RSP:
                 service->open = true;
@@ -89,9 +91,14 @@ static void cfservl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl,
 static int cfservl_modemcmd(struct cflayer *layr, enum caif_modemcmd ctrl)
 {
         struct cfsrvl *service = container_obj(layr);
+
         caif_assert(layr != NULL);
         caif_assert(layr->dn != NULL);
         caif_assert(layr->dn->transmit != NULL);
+
+        if (!service->supports_flowctrl)
+                return 0;
+
         switch (ctrl) {
         case CAIF_MODEMCMD_FLOW_ON_REQ:
                 {
@@ -153,8 +160,10 @@ void cfservl_destroy(struct cflayer *layer)
 }
 
 void cfsrvl_init(struct cfsrvl *service,
-                 u8 channel_id,
-                 struct dev_info *dev_info)
+                        u8 channel_id,
+                        struct dev_info *dev_info,
+                        bool supports_flowctrl
+                        )
 {
         caif_assert(offsetof(struct cfsrvl, layer) == 0);
         service->open = false;
@@ -164,6 +173,7 @@ void cfsrvl_init(struct cfsrvl *service,
         service->layer.ctrlcmd = cfservl_ctrlcmd;
         service->layer.modemcmd = cfservl_modemcmd;
         service->dev_info = *dev_info;
+        service->supports_flowctrl = supports_flowctrl;
         kref_init(&service->ref);
 }
 
diff --git a/net/caif/cfutill.c b/net/caif/cfutill.c
index 5fd2c9ea8b42..ce525cac9064 100644
--- a/net/caif/cfutill.c
+++ b/net/caif/cfutill.c
@@ -31,7 +31,7 @@ struct cflayer *cfutill_create(u8 channel_id, struct dev_info *dev_info)
         }
         caif_assert(offsetof(struct cfsrvl, layer) == 0);
         memset(util, 0, sizeof(struct cfsrvl));
-        cfsrvl_init(util, channel_id, dev_info);
+        cfsrvl_init(util, channel_id, dev_info, true);
         util->layer.receive = cfutill_receive;
         util->layer.transmit = cfutill_transmit;
         snprintf(util->layer.name, CAIF_LAYER_NAME_SZ - 1, "util1");
diff --git a/net/caif/cfveil.c b/net/caif/cfveil.c
index e04f7d964e83..637cb0eee13c 100644
--- a/net/caif/cfveil.c
+++ b/net/caif/cfveil.c
@@ -30,7 +30,7 @@ struct cflayer *cfvei_create(u8 channel_id, struct dev_info *dev_info)
         }
         caif_assert(offsetof(struct cfsrvl, layer) == 0);
         memset(vei, 0, sizeof(struct cfsrvl));
-        cfsrvl_init(vei, channel_id, dev_info);
+        cfsrvl_init(vei, channel_id, dev_info, true);
         vei->layer.receive = cfvei_receive;
         vei->layer.transmit = cfvei_transmit;
         snprintf(vei->layer.name, CAIF_LAYER_NAME_SZ - 1, "vei%d", channel_id);
diff --git a/net/caif/cfvidl.c b/net/caif/cfvidl.c
index 89ad4ea239f1..ada6ee2d48f5 100644
--- a/net/caif/cfvidl.c
+++ b/net/caif/cfvidl.c
@@ -27,7 +27,7 @@ struct cflayer *cfvidl_create(u8 channel_id, struct dev_info *dev_info)
         caif_assert(offsetof(struct cfsrvl, layer) == 0);
 
         memset(vid, 0, sizeof(struct cfsrvl));
-        cfsrvl_init(vid, channel_id, dev_info);
+        cfsrvl_init(vid, channel_id, dev_info, false);
         vid->layer.receive = cfvidl_receive;
         vid->layer.transmit = cfvidl_transmit;
         snprintf(vid->layer.name, CAIF_LAYER_NAME_SZ - 1, "vid1");