Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
d7d823ed
Commit
d7d823ed
authored
Aug 04, 2002
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge master.kernel.org:/home/davem/BK/net-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
parents
e4e08ed2
5f0a9571
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
0 deletions
+4
-0
net/802/sysctl_net_802.c
net/802/sysctl_net_802.c
+4
-0
No files found.
net/802/sysctl_net_802.c
View file @
d7d823ed
...
...
@@ -14,9 +14,12 @@
#include <linux/sysctl.h>
#include <linux/config.h>
#ifdef CONFIG_TR
extern
int
sysctl_tr_rif_timeout
;
#endif
struct
ctl_table
tr_table
[]
=
{
#ifdef CONFIG_TR
{
.
ctl_name
=
NET_TR_RIF_TIMEOUT
,
.
procname
=
"rif_timeout"
,
...
...
@@ -25,5 +28,6 @@ struct ctl_table tr_table[] = {
.
mode
=
0644
,
.
proc_handler
=
&
proc_dointvec
},
#endif
/* CONFIG_TR */
{
0
},
};
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment