Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 7127
b: refs/heads/master
c: 6baf1f4
h: refs/heads/master
i:
  7125: d6a1459
  7123: e705cf6
  7119: 6d56ee1
v: v3
  • Loading branch information
David S. Miller committed Sep 6, 2005
1 parent af310d9 commit 4893215
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 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: aa07ca5793414ce257ad98809147bd1dbb7a3837
refs/heads/master: 6baf1f417d092bd2de7c8892cecad456024c993f
3 changes: 2 additions & 1 deletion trunk/include/net/sock.h
Original file line number Diff line number Diff line change
Expand Up @@ -1377,9 +1377,10 @@ extern void sk_init(void);

#ifdef CONFIG_SYSCTL
extern struct ctl_table core_table[];
extern int sysctl_optmem_max;
#endif

extern int sysctl_optmem_max;

extern __u32 sysctl_wmem_default;
extern __u32 sysctl_rmem_default;

Expand Down
2 changes: 1 addition & 1 deletion trunk/net/core/sock.c
Original file line number Diff line number Diff line change
Expand Up @@ -1719,8 +1719,8 @@ EXPORT_SYMBOL(sock_wfree);
EXPORT_SYMBOL(sock_wmalloc);
EXPORT_SYMBOL(sock_i_uid);
EXPORT_SYMBOL(sock_i_ino);
#ifdef CONFIG_SYSCTL
EXPORT_SYMBOL(sysctl_optmem_max);
#ifdef CONFIG_SYSCTL
EXPORT_SYMBOL(sysctl_rmem_max);
EXPORT_SYMBOL(sysctl_wmem_max);
#endif

0 comments on commit 4893215

Please sign in to comment.