 f2527ec436
			
		
	
	
	f2527ec436
	
	
	
		
			
			Changes: o Bugfix: SO_PRIORITY for SOL_SOCKET could not be handled in caif's setsockopt, using the struct sock attribute priority instead. o Bugfix: SO_BINDTODEVICE for SOL_SOCKET could not be handled in caif's setsockopt, using the struct sock attribute ifindex instead. o Wrong assert statement for RFM layer segmentation. o CAIF Debug channels was not working over SPI, caif_payload_info containing padding info must be initialized. o Check on pointer before dereferencing when unregister dev in caif_dev.c Signed-off-by: Sjur Braendeland <sjur.brandeland@stericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
		
			
				
	
	
		
			56 lines
		
	
	
	
		
			1.6 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			56 lines
		
	
	
	
		
			1.6 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Copyright (C) ST-Ericsson AB 2010
 | |
|  * Author:	Sjur Brendeland/sjur.brandeland@stericsson.com
 | |
|  * License terms: GNU General Public License (GPL) version 2
 | |
|  */
 | |
| 
 | |
| #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__
 | |
| 
 | |
| #include <linux/stddef.h>
 | |
| #include <linux/slab.h>
 | |
| #include <net/caif/caif_layer.h>
 | |
| #include <net/caif/cfsrvl.h>
 | |
| #include <net/caif/cfpkt.h>
 | |
| 
 | |
| #define container_obj(layr) ((struct cfsrvl *) layr)
 | |
| 
 | |
| static int cfdbgl_receive(struct cflayer *layr, struct cfpkt *pkt);
 | |
| static int cfdbgl_transmit(struct cflayer *layr, struct cfpkt *pkt);
 | |
| 
 | |
| struct cflayer *cfdbgl_create(u8 channel_id, struct dev_info *dev_info)
 | |
| {
 | |
| 	struct cfsrvl *dbg = kmalloc(sizeof(struct cfsrvl), GFP_ATOMIC);
 | |
| 	if (!dbg) {
 | |
| 		pr_warn("Out of memory\n");
 | |
| 		return NULL;
 | |
| 	}
 | |
| 	caif_assert(offsetof(struct cfsrvl, layer) == 0);
 | |
| 	memset(dbg, 0, sizeof(struct cfsrvl));
 | |
| 	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);
 | |
| 	return &dbg->layer;
 | |
| }
 | |
| 
 | |
| static int cfdbgl_receive(struct cflayer *layr, struct cfpkt *pkt)
 | |
| {
 | |
| 	return layr->up->receive(layr->up, pkt);
 | |
| }
 | |
| 
 | |
| static int cfdbgl_transmit(struct cflayer *layr, struct cfpkt *pkt)
 | |
| {
 | |
| 	struct cfsrvl *service = container_obj(layr);
 | |
| 	struct caif_payload_info *info;
 | |
| 	int ret;
 | |
| 
 | |
| 	if (!cfsrvl_ready(service, &ret))
 | |
| 		return ret;
 | |
| 
 | |
| 	/* Add info for MUX-layer to route the packet out */
 | |
| 	info = cfpkt_info(pkt);
 | |
| 	info->channel_id = service->layer.id;
 | |
| 	info->dev_info = &service->dev_info;
 | |
| 
 | |
| 	return layr->dn->transmit(layr->dn, pkt);
 | |
| }
 |