3 files changed, 13 insertions, 0 deletions

diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 106c3ba50844..e9581fd9fb66 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -115,6 +115,7 @@ header-y += mqueue.h
 header-y += mtio.h
 header-y += ncp_no.h
 header-y += neighbour.h
+header-y += net_dropmon.h
 header-y += netfilter_arp.h
 header-y += netrom.h
 header-y += nfs2.h
diff --git a/net/Kconfig b/net/Kconfig
index 6b39ede3b1b1..c9fdcd7e71ea 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -222,6 +222,17 @@ config NET_TCPPROBE
         To compile this code as a module, choose M here: the
         module will be called tcp_probe.
 
+config NET_DROP_MONITOR
+        boolean "Network packet drop alerting service"
+        depends on INET && EXPERIMENTAL && TRACEPOINTS
+        ---help---
+        This feature provides an alerting service to userspace in the
+        event that packets are discarded in the network stack.  Alerts
+        are broadcast via netlink socket to any listening user space
+        process.  If you don't need network drop alerts, or if you are ok
+        just checking the various proc files and other utilities for
+        drop statistics, say N here.
+
 endmenu
 
 endmenu
diff --git a/net/core/Makefile b/net/core/Makefile
index d47092bc525c..796f46eece5f 100644
--- a/net/core/Makefile
+++ b/net/core/Makefile
@@ -18,4 +18,5 @@ obj-$(CONFIG_NETPOLL) += netpoll.o
 obj-$(CONFIG_NET_DMA) += user_dma.o
 obj-$(CONFIG_FIB_RULES) += fib_rules.o
 obj-$(CONFIG_TRACEPOINTS) += net-traces.o
+obj-$(CONFIG_NET_DROP_MONITOR) += drop_monitor.o