Changeset 10842

Timestamp:

11/10/08 18:16:02 (5 years ago)

Author:

BrainSlayer

Message:

ethernet over ip tunnel

Location:

src/linux/ar531x/linux-2.6.23

Files:

• include/linux/in.h (modified) (1 diff)
• net/core/dev.c (modified) (1 diff)
• net/ipv4/Kconfig (modified) (1 diff)
• net/ipv4/Makefile (modified) (1 diff)
• net/ipv4/etherip.c (added)

src/linux/ar531x/linux-2.6.23/include/linux/in.h

@@ -42 +42 @@
   IPPROTO_AH = 51,             /* Authentication Header protocol       */
   IPPROTO_BEETPH = 94,         /* IP option pseudo header for BEET */
+  IPPROTO_ETHERIP = 97,         /* Ethernet-in-IP tunneling (rfc 3378)  */
   IPPROTO_PIM    = 103,         /* Protocol Independent Multicast       */
 

src/linux/ar531x/linux-2.6.23/net/core/dev.c

@@ -1782 +1782 @@
 
         __get_cpu_var(netdev_rx_stat).total++;
+
+#ifdef CONFIG_BRIDGE
+        /* Optimisation for framebursting (allow interleaving of pkts by
+         * immediately processing the rx pkt instead of Qing the pkt and deferring
+         * the processing). Only optimise for bridging and guard against non
+         * TASKLET based netif_rx calls.
+         */
+        if (!in_irq() && (skb->dev->br_port != NULL) && br_handle_frame_hook != NULL) {
+                local_irq_restore(flags);
+                return netif_receive_skb(skb);
+        }
+#endif          
+
         if (queue->input_pkt_queue.qlen <= netdev_max_backlog) {
                 if (queue->input_pkt_queue.qlen) {

src/linux/ar531x/linux-2.6.23/net/ipv4/Kconfig

@@ -226 +226 @@
           to do that, say Y here and to "IP multicast routing" below.
 
+config NET_ETHERIP
+        tristate "IP: ethernet-in-IP tunneling"
+        depends on INET
+        help
+          Tunneling means encapsulating data of one protocol type within
+          another protocol and sending it over a channel that understands the
+          encapsulating protocol. This particular tunneling driver implements
+          the etherip Ethernet-in-IP protocol as described in RFC 3378.
+
 config IP_MROUTE
         bool "IP: multicast routing"

src/linux/ar531x/linux-2.6.23/net/ipv4/Makefile

@@ -20 +20 @@
 obj-$(CONFIG_NET_IPIP) += ipip.o
 obj-$(CONFIG_NET_IPGRE) += ip_gre.o
+obj-$(CONFIG_NET_ETHERIP) += etherip.o
 obj-$(CONFIG_SYN_COOKIES) += syncookies.o
 obj-$(CONFIG_INET_AH) += ah4.o