diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-09-24 23:15:15 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-09-24 23:15:15 -0400 |
| commit | c373ba999103fa794f041eab5bd490714d2dee88 (patch) | |
| tree | 8f2b445b1e0af2491c83527967dbcda76054a486 /net/phonet/sysctl.c | |
| parent | 6f3529f00a0a9ac06413d18d3926adf099cb59af (diff) | |
| parent | 851b147e4411df6a1e7e90e2a609773c277eefd2 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/phonet/sysctl.c')
| -rw-r--r-- | net/phonet/sysctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/phonet/sysctl.c b/net/phonet/sysctl.c index 7b5749ee2765..2220f3322326 100644 --- a/net/phonet/sysctl.c +++ b/net/phonet/sysctl.c | |||
| @@ -56,7 +56,7 @@ void phonet_get_local_port_range(int *min, int *max) | |||
| 56 | } while (read_seqretry(&local_port_range_lock, seq)); | 56 | } while (read_seqretry(&local_port_range_lock, seq)); |
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | static int proc_local_port_range(ctl_table *table, int write, struct file *filp, | 59 | static int proc_local_port_range(ctl_table *table, int write, |
| 60 | void __user *buffer, | 60 | void __user *buffer, |
| 61 | size_t *lenp, loff_t *ppos) | 61 | size_t *lenp, loff_t *ppos) |
| 62 | { | 62 | { |
| @@ -70,7 +70,7 @@ static int proc_local_port_range(ctl_table *table, int write, struct file *filp, | |||
| 70 | .extra2 = &local_port_range_max, | 70 | .extra2 = &local_port_range_max, |
| 71 | }; | 71 | }; |
| 72 | 72 | ||
| 73 | ret = proc_dointvec_minmax(&tmp, write, filp, buffer, lenp, ppos); | 73 | ret = proc_dointvec_minmax(&tmp, write, buffer, lenp, ppos); |
| 74 | 74 | ||
| 75 | if (write && ret == 0) { | 75 | if (write && ret == 0) { |
| 76 | if (range[1] < range[0]) | 76 | if (range[1] < range[0]) |