[PATCH] if: restore token ring ARP type to header

[PATCH] if: restore token ring ARP type to header

[Stephen Hemminger]

Recent removal of Token Ring breaks the build of iproute2.

Even though Token Ring support is gone from the kernel, it is worth
keeping the the definition of the TR ARP type to avoid breaking
userspace programs that use this file.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>

--- a/include/linux/if_arp.h	2012-05-22 08:24:26.816834997 -0700
+++ b/include/linux/if_arp.h	2012-05-22 13:57:24.037399528 -0700
@@ -82,7 +82,7 @@
 #define ARPHRD_FCPL	786		/* Fibrechannel public loop	*/
 #define ARPHRD_FCFABRIC	787		/* Fibrechannel fabric		*/
 	/* 787->799 reserved for fibrechannel media types */
-/* 800 used to be used for token ring */
+#define ARPHRD_IEEE802_TR 800		/* Magic type ident for TR	*/
 #define ARPHRD_IEEE80211 801		/* IEEE 802.11			*/
 #define ARPHRD_IEEE80211_PRISM 802	/* IEEE 802.11 + Prism2 header  */
 #define ARPHRD_IEEE80211_RADIOTAP 803	/* IEEE 802.11 + radiotap header */

Re: [PATCH] if: restore token ring ARP type to header

[David Miller]

From: Stephen Hemminger <shemminger@vyatta.com>
Date: Tue, 22 May 2012 14:01:05 -0700

> Recent removal of Token Ring breaks the build of iproute2.
> 
> Even though Token Ring support is gone from the kernel, it is worth
> keeping the the definition of the TR ARP type to avoid breaking
> userspace programs that use this file.
> 
> Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>

Agreed, and applied, thanks Stephen.

Re: [PATCH] if: restore token ring ARP type to header

[Paul Gortmaker]

On Tue, May 22, 2012 at 5:01 PM, Stephen Hemminger
<shemminger@vyatta.com> wrote:
> Recent removal of Token Ring breaks the build of iproute2.
>
> Even though Token Ring support is gone from the kernel, it is worth
> keeping the the definition of the TR ARP type to avoid breaking
> userspace programs that use this file.

Thanks Stephen,  I was trying to force errors in kernel builds by
doing these kinds of define changes while doing my delete tests.

But I was not doing userspace builds, however....

Looking back at the changes I've made, the only thing similar that
I can see is the ipx.h changes:

diff --git a/include/linux/ipx.h b/include/linux/ipx.h
index 3d48014..8f02439 100644
--- a/include/linux/ipx.h
+++ b/include/linux/ipx.h
@@ -38,7 +38,7 @@ struct ipx_interface_definition {
 #define IPX_FRAME_8022		2
 #define IPX_FRAME_ETHERII	3
 #define IPX_FRAME_8023		4
-#define IPX_FRAME_TR_8022       5 /* obsolete */
+/* obsolete token ring was	5 */
 	unsigned char ipx_special;
 #define IPX_SPECIAL_NONE	0
 #define IPX_PRIMARY		1

Please let me/netdev know if the above also happens to trigger any
sort of userspace fallout, and we'll fix it up ASAP.

Thanks,
Paul.

Re: [PATCH] if: restore token ring ARP type to header

[Stephen Hemminger]

On Tue, 22 May 2012 22:28:28 -0400
Paul Gortmaker <paul.gortmaker@windriver.com> wrote:

> On Tue, May 22, 2012 at 5:01 PM, Stephen Hemminger
> <shemminger@vyatta.com> wrote:
> > Recent removal of Token Ring breaks the build of iproute2.
> >
> > Even though Token Ring support is gone from the kernel, it is worth
> > keeping the the definition of the TR ARP type to avoid breaking
> > userspace programs that use this file.
> 
> Thanks Stephen,  I was trying to force errors in kernel builds by
> doing these kinds of define changes while doing my delete tests.
> 
> But I was not doing userspace builds, however....
> 
> Looking back at the changes I've made, the only thing similar that
> I can see is the ipx.h changes:
> 
> diff --git a/include/linux/ipx.h b/include/linux/ipx.h
> index 3d48014..8f02439 100644
> --- a/include/linux/ipx.h
> +++ b/include/linux/ipx.h
> @@ -38,7 +38,7 @@ struct ipx_interface_definition {
>  #define IPX_FRAME_8022		2
>  #define IPX_FRAME_ETHERII	3
>  #define IPX_FRAME_8023		4
> -#define IPX_FRAME_TR_8022       5 /* obsolete */
> +/* obsolete token ring was	5 */
>  	unsigned char ipx_special;
>  #define IPX_SPECIAL_NONE	0
>  #define IPX_PRIMARY		1
> 
> Please let me/netdev know if the above also happens to trigger any
> sort of userspace fallout, and we'll fix it up ASAP.
> 
> Thanks,
> Paul.

Assume any header processed as part of 'make headers_install' is
part of kernel API and must not get broken. Therefor ipx.h
must be fixed as well. Local debug stuff should not be committed
to upstream repository!