2.6.11.7 X.25 : x25tap

diff -uprN -X dontdiff linux-2.6.11.7-vanilla/drivers/net/Kconfig linux-2.6.11.7/drivers/net/Kconfig
@@ -128,6 +128,24 @@ config ETHERTAP
 
 	  If you don't know what to use this for, you don't need it.
 
+config X25TAP
+	tristate "X.25 network tap"
+	depends on NETDEVICES && EXPERIMENTAL && NETLINK_DEV && X25
+	---help---
+	  This is a very simple X.25 driver. It bounces X.25 level2 frames
+	  to user space and expects X.25 frames to be written back to it.
+
+	  Connection state handling is left to the user pluged into the tap
+	  as explained in Documentation/networking/x25-iface.txt
+
+	  As this is an X.25 level 2 device you can use it for user level
+	  drivers and for building bridging tunnels (XOT).
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called x25tap.
+
+	  If your using xotd or similar program say N.
+
 config NET_SB1000
 	tristate "General Instruments Surfboard 1000"
 	depends on NETDEVICES && PNP

diff -uprN -X dontdiff linux-2.6.11.7-vanilla/drivers/net/Makefile linux-2.6.11.7/drivers/net/Makefile
@@ -69,6 +69,7 @@ obj-$(CONFIG_HAMACHI) += hamachi.o
 obj-$(CONFIG_NET) += Space.o loopback.o
 obj-$(CONFIG_SEEQ8005) += seeq8005.o
 obj-$(CONFIG_ETHERTAP) += ethertap.o
+obj-$(CONFIG_X25TAP) += x25tap.o
 obj-$(CONFIG_NET_SB1000) += sb1000.o
 obj-$(CONFIG_MAC8390) += mac8390.o 8390.o
 obj-$(CONFIG_APNE) += apne.o 8390.o