projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into for_paulus
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
sysctl.h
diff --git
a/include/linux/sysctl.h
b/include/linux/sysctl.h
index 81480e6134674c19030f48336ca718ab40fbb100..665412c4f4b910cdc8c60da3174a1f48ccbbd61d 100644
(file)
--- a/
include/linux/sysctl.h
+++ b/
include/linux/sysctl.h
@@
-699,7
+699,8
@@
enum {
NET_X25_CALL_REQUEST_TIMEOUT=2,
NET_X25_RESET_REQUEST_TIMEOUT=3,
NET_X25_CLEAR_REQUEST_TIMEOUT=4,
- NET_X25_ACK_HOLD_BACK_TIMEOUT=5
+ NET_X25_ACK_HOLD_BACK_TIMEOUT=5,
+ NET_X25_FORWARD=6
};
/* /proc/sys/net/token-ring */