diff mbox

[1/5] Phonet: allocate a non-Ethernet ARP type

Message ID 1229522874-20636-1-git-send-email-remi.denis-courmont@nokia.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Rémi Denis-Courmont Dec. 17, 2008, 2:07 p.m. UTC
Also leave some room for more 802.11 types.

Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
---
 include/linux/if_arp.h |    2 ++
 net/core/dev.c         |    8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

Comments

Marcel Holtmann Dec. 17, 2008, 8:07 p.m. UTC | #1
Hi Remi,

> Also leave some room for more 802.11 types.
> 
> Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
> ---
>  include/linux/if_arp.h |    2 ++
>  net/core/dev.c         |    8 ++++----
>  2 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h
> index 4d34018..11df77a 100644
> --- a/include/linux/if_arp.h
> +++ b/include/linux/if_arp.h
> @@ -87,6 +87,8 @@
>  #define ARPHRD_IEEE80211_PRISM 802	/* IEEE 802.11 + Prism2 header  */
>  #define ARPHRD_IEEE80211_RADIOTAP 803	/* IEEE 802.11 + radiotap header */
>  
> +#define ARPHRD_PHONET	820		/* PhoNet media type		*/
> +
>  #define ARPHRD_VOID	  0xFFFF	/* Void type, nothing is known */
>  #define ARPHRD_NONE	  0xFFFE	/* zero header length */

what kind of communication are you doing over that device. Is it pure IP
communication or a PhoNet specific one. In case of pure and simple IP,
then please use the officially assigned Pure IP type from here:

http://www.iana.org/assignments/arp-parameters/arp-parameters.xhtml

Regards

Marcel


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Rémi Denis-Courmont Dec. 17, 2008, 10:18 p.m. UTC | #2
Le mercredi 17 décembre 2008, Marcel Holtmann a écrit :
> what kind of communication are you doing over that device.

Phonet packets on the wire. That is to say, Phonet packets including the 
leading media type byte, which the Linux Phonet implementation consider 
to be the Phonet "link-layer", and is not visible to the Phonet sockets 
stack.

No IP here.
David Miller Dec. 17, 2008, 11:52 p.m. UTC | #3
From: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
Date: Wed, 17 Dec 2008 16:07:50 +0200

> Also leave some room for more 802.11 types.
> 
> Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h
index 4d34018..11df77a 100644
--- a/include/linux/if_arp.h
+++ b/include/linux/if_arp.h
@@ -87,6 +87,8 @@ 
 #define ARPHRD_IEEE80211_PRISM 802	/* IEEE 802.11 + Prism2 header  */
 #define ARPHRD_IEEE80211_RADIOTAP 803	/* IEEE 802.11 + radiotap header */
 
+#define ARPHRD_PHONET	820		/* PhoNet media type		*/
+
 #define ARPHRD_VOID	  0xFFFF	/* Void type, nothing is known */
 #define ARPHRD_NONE	  0xFFFE	/* zero header length */
 
diff --git a/net/core/dev.c b/net/core/dev.c
index d8d7d1f..15aab0c 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -283,8 +283,8 @@  static const unsigned short netdev_lock_type[] =
 	 ARPHRD_PIMREG, ARPHRD_HIPPI, ARPHRD_ASH, ARPHRD_ECONET,
 	 ARPHRD_IRDA, ARPHRD_FCPP, ARPHRD_FCAL, ARPHRD_FCPL,
 	 ARPHRD_FCFABRIC, ARPHRD_IEEE802_TR, ARPHRD_IEEE80211,
-	 ARPHRD_IEEE80211_PRISM, ARPHRD_IEEE80211_RADIOTAP, ARPHRD_VOID,
-	 ARPHRD_NONE};
+	 ARPHRD_IEEE80211_PRISM, ARPHRD_IEEE80211_RADIOTAP, ARPHRD_PHONET,
+	 ARPHRD_VOID, ARPHRD_NONE};
 
 static const char *netdev_lock_name[] =
 	{"_xmit_NETROM", "_xmit_ETHER", "_xmit_EETHER", "_xmit_AX25",
@@ -300,8 +300,8 @@  static const char *netdev_lock_name[] =
 	 "_xmit_PIMREG", "_xmit_HIPPI", "_xmit_ASH", "_xmit_ECONET",
 	 "_xmit_IRDA", "_xmit_FCPP", "_xmit_FCAL", "_xmit_FCPL",
 	 "_xmit_FCFABRIC", "_xmit_IEEE802_TR", "_xmit_IEEE80211",
-	 "_xmit_IEEE80211_PRISM", "_xmit_IEEE80211_RADIOTAP", "_xmit_VOID",
-	 "_xmit_NONE"};
+	 "_xmit_IEEE80211_PRISM", "_xmit_IEEE80211_RADIOTAP", "_xmit_PHONET",
+	 "_xmit_VOID", "_xmit_NONE"};
 
 static struct lock_class_key netdev_xmit_lock_key[ARRAY_SIZE(netdev_lock_type)];
 static struct lock_class_key netdev_addr_lock_key[ARRAY_SIZE(netdev_lock_type)];