From patchwork Fri Jan 16 19:06:39 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Hartkopp X-Patchwork-Id: 19045 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id DA0D0DE2A0 for ; Sat, 17 Jan 2009 06:06:49 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762192AbZAPTGq (ORCPT ); Fri, 16 Jan 2009 14:06:46 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1762811AbZAPTGp (ORCPT ); Fri, 16 Jan 2009 14:06:45 -0500 Received: from mo-p00-ob.rzone.de ([81.169.146.161]:65321 "EHLO mo-p00-ob.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761882AbZAPTGo (ORCPT ); Fri, 16 Jan 2009 14:06:44 -0500 X-RZG-CLASS-ID: mo00 X-RZG-AUTH: :I2ANY0W6W/eA95XfH/xfO6gOxLxTty/udEMngcJ/VAKW226lDNJVyuYELTI4OtQ= Received: from [192.168.11.14] (p5B22BD3E.dip.t-dialin.net [91.34.189.62]) by post.strato.de (klopstock mo8) (RZmta 18.10) with ESMTP id f016f3l0GIVmR7 ; Fri, 16 Jan 2009 20:06:39 +0100 (MET) Message-ID: <4970DABF.40200@hartkopp.net> Date: Fri, 16 Jan 2009 20:06:39 +0100 From: Oliver Hartkopp User-Agent: Mozilla-Thunderbird 2.0.0.19 (X11/20090103) MIME-Version: 1.0 To: Stephen Hemminger CC: netdev@vger.kernel.org Subject: Re: [ANNOUNCE] iproute2 v2.6.28 References: <20090115130845.01d7ebf4@extreme> In-Reply-To: <20090115130845.01d7ebf4@extreme> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Stephen Hemminger wrote: > New version of iproute2 utilities that includes bug fixes and > support for all the new features in kernel 2.6.28. > Hello Stephen, your mail reminded me that some defines for the Controller Area Network (CAN) are still missing since 2.6.25. It's not a big problem, but it makes a better show in 'ip link show' on CAN interfaces :-) I also moved __PF(CAN,can) in ll_proto.c to the same position where it can be found in if_ether.h . The only thing i did not know if the __PF(CAN,can) in ll_types.c needs to be put in #ifdef ARPHDR_CAN like __PF(HWX25,hwx25) is or not. You definitely know that better than me. Regards, Oliver iproute2: add missing defines for Controller Area Network Signed-off-by: Oliver Hartkopp diff -u -r iproute2-2.6.28-orig/ip/ipaddress.c iproute2-2.6.28/ip/ipaddress.c --- iproute2-2.6.28-orig/ip/ipaddress.c 2009-01-15 21:25:04.000000000 +0100 +++ iproute2-2.6.28/ip/ipaddress.c 2009-01-16 19:33:22.000000000 +0100 @@ -109,6 +109,7 @@ _PF(UP); _PF(LOWER_UP); _PF(DORMANT); + _PF(ECHO); #undef _PF if (flags) fprintf(fp, "%x", flags); diff -u -r iproute2-2.6.28-orig/lib/ll_proto.c iproute2-2.6.28/lib/ll_proto.c --- iproute2-2.6.28-orig/lib/ll_proto.c 2009-01-15 21:25:04.000000000 +0100 +++ iproute2-2.6.28/lib/ll_proto.c 2009-01-16 19:46:43.000000000 +0100 @@ -84,6 +84,7 @@ __PF(WAN_PPP,wan_ppp) __PF(PPP_MP,ppp_mp) __PF(LOCALTALK,localtalk) +__PF(CAN,can) __PF(PPPTALK,ppptalk) __PF(TR_802_2,tr_802_2) __PF(MOBITEX,mobitex) @@ -94,7 +95,6 @@ #endif __PF(TIPC,tipc) __PF(AOE,aoe) -__PF(CAN,can) { 0x8100, "802.1Q" }, { ETH_P_IP, "ipv4" }, diff -u -r iproute2-2.6.28-orig/lib/ll_types.c iproute2-2.6.28/lib/ll_types.c --- iproute2-2.6.28-orig/lib/ll_types.c 2009-01-15 21:25:04.000000000 +0100 +++ iproute2-2.6.28/lib/ll_types.c 2009-01-16 19:27:35.000000000 +0100 @@ -70,6 +70,7 @@ #ifdef ARPHRD_HWX25 __PF(HWX25,hwx25) #endif +__PF(CAN,can) __PF(PPP,ppp) __PF(HDLC,hdlc) __PF(LAPB,lapb)