Hi Mark,

You've got my Ack for this patch (too)(again).

Stéphane.Le 27 janv. 2015 17:41, Marc Kleine-Budde <mkl@pengutronix.de> a écrit :
>
> From: Stephane Grosjean <s.grosjean@peak-system.com> 
>
> Export the ctrlmode_supported value from the core file to each adapter specific 
> file. This has been mandatory for supporting the new CANFD extension. 
>
> Signed-off-by: Stephane Grosjean <s.grosjean@peak-system.com> 
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> 
> --- 
> drivers/net/can/usb/peak_usb/pcan_usb.c      | 1 + 
> drivers/net/can/usb/peak_usb/pcan_usb_core.c | 3 +-- 
> drivers/net/can/usb/peak_usb/pcan_usb_core.h | 1 + 
> drivers/net/can/usb/peak_usb/pcan_usb_pro.c  | 1 + 
> 4 files changed, 4 insertions(+), 2 deletions(-) 
>
> diff --git a/drivers/net/can/usb/peak_usb/pcan_usb.c b/drivers/net/can/usb/peak_usb/pcan_usb.c 
> index d57d3f64a5bf..72427f21edff 100644 
> --- a/drivers/net/can/usb/peak_usb/pcan_usb.c 
> +++ b/drivers/net/can/usb/peak_usb/pcan_usb.c 
> @@ -859,6 +859,7 @@ const struct peak_usb_adapter pcan_usb = { 
> .name = "PCAN-USB", 
> .device_id = PCAN_USB_PRODUCT_ID, 
> .ctrl_count = 1, 
> + .ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES | CAN_CTRLMODE_LISTENONLY, 
> .clock = { 
> .freq = PCAN_USB_CRYSTAL_HZ / 2 , 
> }, 
> diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_core.c b/drivers/net/can/usb/peak_usb/pcan_usb_core.c 
> index 729b80d78322..2768399a52fa 100644 
> --- a/drivers/net/can/usb/peak_usb/pcan_usb_core.c 
> +++ b/drivers/net/can/usb/peak_usb/pcan_usb_core.c 
> @@ -750,8 +750,7 @@ static int peak_usb_create_dev(const struct peak_usb_adapter *peak_usb_adapter, 
> dev->can.bittiming_const = &peak_usb_adapter->bittiming_const; 
> dev->can.do_set_bittiming = peak_usb_set_bittiming; 
> dev->can.do_set_mode = peak_usb_set_mode; 
> - dev->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES | 
> -       CAN_CTRLMODE_LISTENONLY; 
> + dev->can.ctrlmode_supported = peak_usb_adapter->ctrlmode_supported; 
>
> netdev->netdev_ops = &peak_usb_netdev_ops; 
>
> diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_core.h b/drivers/net/can/usb/peak_usb/pcan_usb_core.h 
> index 10f2fcac7c13..54fdb5978a05 100644 
> --- a/drivers/net/can/usb/peak_usb/pcan_usb_core.h 
> +++ b/drivers/net/can/usb/peak_usb/pcan_usb_core.h 
> @@ -44,6 +44,7 @@ struct peak_usb_device; 
> struct peak_usb_adapter { 
> char *name; 
> u32 device_id; 
> + u32 ctrlmode_supported; 
> struct can_clock clock; 
> const struct can_bittiming_const bittiming_const; 
> unsigned int ctrl_count; 
> diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_pro.c b/drivers/net/can/usb/peak_usb/pcan_usb_pro.c 
> index 56855b2b1fa1..03f517160a67 100644 
> --- a/drivers/net/can/usb/peak_usb/pcan_usb_pro.c 
> +++ b/drivers/net/can/usb/peak_usb/pcan_usb_pro.c 
> @@ -1016,6 +1016,7 @@ const struct peak_usb_adapter pcan_usb_pro = { 
> .name = "PCAN-USB Pro", 
> .device_id = PCAN_USBPRO_PRODUCT_ID, 
> .ctrl_count = PCAN_USBPRO_CHANNEL_COUNT, 
> + .ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES | CAN_CTRLMODE_LISTENONLY, 
> .clock = { 
> .freq = PCAN_USBPRO_CRYSTAL_HZ, 
> }, 
> -- 
> 2.1.4 
>