Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353561
b: refs/heads/master
c: 911f863
h: refs/heads/master
i:
  353559: bd9e487
v: v3
  • Loading branch information
Kees Cook committed Jan 11, 2013
1 parent 71ad687 commit 4fa08a7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 750358ee4f6ebafccf71b36fdc96d738706b4e37
refs/heads/master: 911f86354d432f31b2966f41dcf8de8978a6b494
5 changes: 2 additions & 3 deletions trunk/net/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ config NETWORK_SECMARK

config NETWORK_PHY_TIMESTAMPING
bool "Timestamping in PHY devices"
depends on EXPERIMENTAL
help
This allows timestamping of network packets by PHYs with
hardware timestamping capabilities. This option adds some
Expand Down Expand Up @@ -278,7 +277,7 @@ config NET_PKTGEN

config NET_TCPPROBE
tristate "TCP connection probing"
depends on INET && EXPERIMENTAL && PROC_FS && KPROBES
depends on INET && PROC_FS && KPROBES
---help---
This module allows for capturing the changes to TCP connection
state in response to incoming packets. It is used for debugging
Expand All @@ -295,7 +294,7 @@ config NET_TCPPROBE

config NET_DROP_MONITOR
tristate "Network packet drop alerting service"
depends on INET && EXPERIMENTAL && TRACEPOINTS
depends on INET && TRACEPOINTS
---help---
This feature provides an alerting service to userspace in the
event that packets are discarded in the network stack. Alerts
Expand Down

0 comments on commit 4fa08a7

Please sign in to comment.