Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73d6ac63 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

caif: code cleanup 



Cleanup of new CAIF code.
  * make local functions static
  * remove code that is never used
  * expand get_caif_conf() since wrapper is no longer needed
  * make args to comparison functions const
  * rename connect_req_to_link_param to keep exported names
    consistent

Compile tested only.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Acked-by: default avatarSjur Brændeland <sjur.brandeland@stericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1c01a80c

include/net/caif/caif_dev.h

+5 −22
Original line number Original line Diff line number Diff line
@@ -74,18 +74,7 @@ int caif_connect_client(struct caif_connect_request *conn_req, 
int caif_disconnect_client(struct cflayer *client_layer);

int caif_disconnect_client(struct cflayer *client_layer);





/**

/**

 * caif_release_client - Release adaptation layer reference to client.

 * caif_connect_req_to_link_param - Translate configuration parameters

 *

 * @client_layer: Client layer.

 *

 * Releases a client/adaptation layer use of the caif stack.

 * This function must be used after caif_disconnect_client to

 * decrease the reference count of the service layer.

 */

void caif_release_client(struct cflayer *client_layer);



/**

 * connect_req_to_link_param - Translate configuration parameters

 *				    from socket format to internal format.

 *				    from socket format to internal format.

 * @cnfg:	Pointer to configuration handler

 * @cnfg:	Pointer to configuration handler

 * @con_req:	Configuration parameters supplied in function

 * @con_req:	Configuration parameters supplied in function
@@ -94,14 +83,8 @@ void caif_release_client(struct cflayer *client_layer); 
 *			 setting up channels.

 *			 setting up channels.

 *

 *

 */

 */

int connect_req_to_link_param(struct cfcnfg *cnfg,

int caif_connect_req_to_link_param(struct cfcnfg *cnfg,

				   struct caif_connect_request *con_req,

				   struct caif_connect_request *con_req,

				struct cfctrl_link_param *channel_setup_param);

				   struct cfctrl_link_param *setup_param);



/**

 * get_caif_conf() - Get the configuration handler.

 */

struct cfcnfg *get_caif_conf(void);







#endif /* CAIF_DEV_H_ */
 
#endif /* CAIF_DEV_H_ */

include/net/caif/cfctrl.h

+1 −11
Original line number Original line Diff line number Diff line
@@ -121,19 +121,9 @@ int cfctrl_linkup_request(struct cflayer *cfctrl, 
			   struct cflayer *user_layer);

			   struct cflayer *user_layer);

int  cfctrl_linkdown_req(struct cflayer *cfctrl, u8 linkid,

int  cfctrl_linkdown_req(struct cflayer *cfctrl, u8 linkid,

			 struct cflayer *client);

			 struct cflayer *client);

void cfctrl_sleep_req(struct cflayer *cfctrl);



void cfctrl_wake_req(struct cflayer *cfctrl);

void cfctrl_getstartreason_req(struct cflayer *cfctrl);

struct cflayer *cfctrl_create(void);

struct cflayer *cfctrl_create(void);

void cfctrl_set_dnlayer(struct cflayer *this, struct cflayer *dn);

void cfctrl_set_uplayer(struct cflayer *this, struct cflayer *up);

struct cfctrl_rsp *cfctrl_get_respfuncs(struct cflayer *layer);

struct cfctrl_rsp *cfctrl_get_respfuncs(struct cflayer *layer);

bool cfctrl_req_eq(struct cfctrl_request_info *r1,

		   struct cfctrl_request_info *r2);

void cfctrl_insert_req(struct cfctrl *ctrl,

			      struct cfctrl_request_info *req);

struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,

					      struct cfctrl_request_info *req);

void cfctrl_cancel_req(struct cflayer *layr, struct cflayer *adap_layer);

void cfctrl_cancel_req(struct cflayer *layr, struct cflayer *adap_layer);





#endif				/* CFCTRL_H_ */
 
#endif				/* CFCTRL_H_ */

include/net/caif/cfmuxl.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -16,7 +16,5 @@ int cfmuxl_set_uplayer(struct cflayer *layr, struct cflayer *up, u8 linkid); 
struct cflayer *cfmuxl_remove_dnlayer(struct cflayer *layr, u8 phyid);

struct cflayer *cfmuxl_remove_dnlayer(struct cflayer *layr, u8 phyid);

int cfmuxl_set_dnlayer(struct cflayer *layr, struct cflayer *up, u8 phyid);

int cfmuxl_set_dnlayer(struct cflayer *layr, struct cflayer *up, u8 phyid);

struct cflayer *cfmuxl_remove_uplayer(struct cflayer *layr, u8 linkid);

struct cflayer *cfmuxl_remove_uplayer(struct cflayer *layr, u8 linkid);

bool cfmuxl_is_phy_inuse(struct cflayer *layr, u8 phyid);

u8 cfmuxl_get_phyid(struct cflayer *layr, u8 channel_id);





#endif				/* CFMUXL_H_ */
 
#endif				/* CFMUXL_H_ */

include/net/caif/cfpkt.h

+0 −75
Original line number Original line Diff line number Diff line
@@ -16,12 +16,6 @@ struct cfpkt; 
 */

 */

struct cfpkt *cfpkt_create(u16 len);

struct cfpkt *cfpkt_create(u16 len);





/* Create a CAIF packet.

 * data Data to copy.

 * len Length of packet to be created

 * @return New packet.

 */

struct cfpkt *cfpkt_create_uplink(const unsigned char *data, unsigned int len);

/*

/*

 * Destroy a CAIF Packet.

 * Destroy a CAIF Packet.

 * pkt Packet to be destoyed.

 * pkt Packet to be destoyed.
@@ -181,22 +175,6 @@ u16 cfpkt_iterate(struct cfpkt *pkt, 
		u16 (*iter_func)(u16 chks, void *buf, u16 len),

		u16 (*iter_func)(u16 chks, void *buf, u16 len),

		u16 data);

		u16 data);





/* Append by giving user access to packet buffer

 * cfpkt Packet to append to

 * buf Buffer inside pkt that user shall copy data into

 * buflen Length of buffer and number of bytes added to packet

 * @return 0 on error, 1 on success

 */

int cfpkt_raw_append(struct cfpkt *cfpkt, void **buf, unsigned int buflen);



/* Extract by giving user access to packet buffer

 * cfpkt Packet to extract from

 * buf Buffer inside pkt that user shall copy data from

 * buflen Length of buffer and number of bytes removed from packet

 * @return 0 on error, 1 on success

 */

int cfpkt_raw_extract(struct cfpkt *cfpkt, void **buf, unsigned int buflen);



/* Map from a "native" packet (e.g. Linux Socket Buffer) to a CAIF packet.

/* Map from a "native" packet (e.g. Linux Socket Buffer) to a CAIF packet.

 *  dir - Direction indicating whether this packet is to be sent or received.

 *  dir - Direction indicating whether this packet is to be sent or received.

 *  nativepkt  - The native packet to be transformed to a CAIF packet

 *  nativepkt  - The native packet to be transformed to a CAIF packet
@@ -210,59 +188,6 @@ struct cfpkt *cfpkt_fromnative(enum caif_direction dir, void *nativepkt); 
 */

 */

void *cfpkt_tonative(struct cfpkt *pkt);

void *cfpkt_tonative(struct cfpkt *pkt);





/*

 * Insert a packet in the packet queue.

 * pktq Packet queue to insert into

 * pkt Packet to be inserted in queue

 * prio Priority of packet

 */

void cfpkt_queue(struct cfpktq *pktq, struct cfpkt *pkt,

		 unsigned short prio);



/*

 * Remove a packet from the packet queue.

 * pktq Packet queue to fetch packets from.

 * @return Dequeued packet.

 */

struct cfpkt *cfpkt_dequeue(struct cfpktq *pktq);



/*

 * Peek into a packet from the packet queue.

 * pktq Packet queue to fetch packets from.

 * @return Peeked packet.

 */

struct cfpkt *cfpkt_qpeek(struct cfpktq *pktq);



/*

 * Initiates the packet queue.

 * @return Pointer to new packet queue.

 */

struct cfpktq *cfpktq_create(void);



/*

 * Get the number of packets in the queue.

 * pktq Packet queue to fetch count from.

 * @return Number of packets in queue.

 */

int cfpkt_qcount(struct cfpktq *pktq);



/*

 * Put content of packet into buffer for debuging purposes.

 * pkt Packet to copy data from

 * buf Buffer to copy data into

 * buflen Length of data to copy

 * @return Pointer to copied data

 */

char *cfpkt_log_pkt(struct cfpkt *pkt, char *buf, int buflen);



/*

 * Clones a packet and releases the original packet.

 * This is used for taking ownership of a packet e.g queueing.

 * pkt Packet to clone and release.

 * @return Cloned packet.

 */

struct cfpkt *cfpkt_clone_release(struct cfpkt *pkt);







/*

/*

 * Returns packet information for a packet.

 * Returns packet information for a packet.

include/net/caif/cfsrvl.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -22,7 +22,6 @@ struct cfsrvl { 
	struct kref ref;

	struct kref ref;

};

};





void cfsrvl_release(struct kref *kref);

struct cflayer *cfvei_create(u8 linkid, struct dev_info *dev_info);

struct cflayer *cfvei_create(u8 linkid, struct dev_info *dev_info);

struct cflayer *cfdgml_create(u8 linkid, struct dev_info *dev_info);

struct cflayer *cfdgml_create(u8 linkid, struct dev_info *dev_info);

struct cflayer *cfutill_create(u8 linkid, struct dev_info *dev_info);

struct cflayer *cfutill_create(u8 linkid, struct dev_info *dev_info);
@@ -31,7 +30,7 @@ struct cflayer *cfrfml_create(u8 linkid, struct dev_info *dev_info, 
				int mtu_size);

				int mtu_size);

struct cflayer *cfdbgl_create(u8 linkid, struct dev_info *dev_info);

struct cflayer *cfdbgl_create(u8 linkid, struct dev_info *dev_info);

bool cfsrvl_phyid_match(struct cflayer *layer, int phyid);

bool cfsrvl_phyid_match(struct cflayer *layer, int phyid);

void cfservl_destroy(struct cflayer *layer);



void cfsrvl_init(struct cfsrvl *service,

void cfsrvl_init(struct cfsrvl *service,

			u8 channel_id,

			u8 channel_id,

			struct dev_info *dev_info,

			struct dev_info *dev_info,