From mboxrd@z Thu Jan 1 00:00:00 1970 From: Oliver Hartkopp Subject: Re: [iproute2 1/2] Update CAN netlink header Date: Mon, 21 Jul 2014 19:51:43 +0200 Message-ID: <53CD532F.90905@hartkopp.net> References: <1405935800-26622-1-git-send-email-nebaruzdin@gmail.com> <1405935800-26622-2-git-send-email-nebaruzdin@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Return-path: Received: from mo4-p00-ob.smtp.rzone.de ([81.169.146.162]:22676 "EHLO mo4-p00-ob.smtp.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933094AbaGURvt (ORCPT ); Mon, 21 Jul 2014 13:51:49 -0400 In-Reply-To: <1405935800-26622-2-git-send-email-nebaruzdin@gmail.com> Sender: linux-can-owner@vger.kernel.org List-ID: To: Nikita Edward Baruzdin Cc: "linux-can@vger.kernel.org" Hello Nikita, On 21.07.2014 11:43, Nikita Edward Baruzdin wrote: > Signed-off-by: Nikita Edward Baruzdin > --- > include/linux/can/netlink.h | 12 ++++++++---- > * CAN device statistics > @@ -122,9 +124,11 @@ enum { > IFLA_CAN_RESTART_MS, > IFLA_CAN_RESTART, > IFLA_CAN_BERR_COUNTER, > + IFLA_CAN_DATA_BITTIMING, > + IFLA_CAN_DATA_BITTIMING_CONST, > __IFLA_CAN_MAX > }; This change has already been applied to the iproute2 git repository from Stephen Hemminger: http://git.kernel.org/cgit/linux/kernel/git/shemminger/iproute2.git/ See: http://git.kernel.org/cgit/linux/kernel/git/shemminger/iproute2.git/diff/include/linux/can/netlink.h?id=e4d5edba68970124c5ce245a11a5c5cd4dde9ae1 The best is, to wait until Stephen has pulled the Linux headers into his tree. This will usually happen when the merge window for the Kernel 3.17(!) is closed - e.g. in 4-6 weeks from now. After the kernel header update in the iproute2 git repository it makes sense to post your patch 2/2 as iproute2: add support for CAN presume-ack feature and send this simultaneously on linux-can and linux-netdev ML. So let's wait for Stephen updating his iproute2 tree ... Thanks, Oliver