Skip to content

L
linux
Commit 21eca083 authored by Jamal Hadi Salim's avatar Jamal Hadi Salim Committed by Linus Torvalds
Browse files
Options

[NET]: Add ARPHRD_NONE and use it in tun driver.

parent 0d570a57
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
drivers/net/tun.c
View file @ 21eca083
...@@ -129,8 +129,8 @@ static void tun_net_init(struct net_device *dev) ...@@ -129,8 +129,8 @@ static void tun_net_init(struct net_device *dev)
dev->addr_len = 0; dev->addr_len = 0;
dev->mtu = 1500; dev->mtu = 1500;
/* Type PPP seems most suitable */ /* Zero header length */
dev->type = ARPHRD_PPP; dev->type = ARPHRD_NONE;
dev->flags = IFF_POINTOPOINT | IFF_NOARP | IFF_MULTICAST; dev->flags = IFF_POINTOPOINT | IFF_NOARP | IFF_MULTICAST;
dev->tx_queue_len = 10; dev->tx_queue_len = 10;
break; break;
......
include/linux/if_arp.h
View file @ 21eca083
...@@ -86,6 +86,7 @@ ...@@ -86,6 +86,7 @@
#define ARPHRD_IEEE80211_PRISM 802 /* IEEE 802.11 + Prism2 header */ #define ARPHRD_IEEE80211_PRISM 802 /* IEEE 802.11 + Prism2 header */
#define ARPHRD_VOID 0xFFFF /* Void type, nothing is known */ #define ARPHRD_VOID 0xFFFF /* Void type, nothing is known */
#define ARPHRD_NONE 0xFFFE /* zero header length */
/* ARP protocol opcodes. */ /* ARP protocol opcodes. */
#define ARPOP_REQUEST 1 /* ARP request */ #define ARPOP_REQUEST 1 /* ARP request */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7