diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-02-09 16:20:52 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-02-09 16:20:52 +0800 |
| commit | 054f8fe34189a62a0b87700c062a18c3a8421615 (patch) | |
| tree | 805b9cc11d537a66870978b1ea51fc66c5a8f9a9 /net/core/sysctl_net_core.c | |
| parent | 108df9c204f549150c7e1e3262ffd19bd624269e (diff) | |
| parent | 53752ea210016b548cfc3898e6a5ea338fcb6c2c (diff) | |
Merge remote-tracking branch 'lts/linux-3.18.y' into linux-linaro-lsk-v3.18lsk-v3.18-17.03lsk-v3.18-17.02
Conflicts:
arch/x86/boot/compressed/misc.h
Diffstat (limited to 'net/core/sysctl_net_core.c')
| -rw-r--r-- | net/core/sysctl_net_core.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c index 8725b91120f8..d0f4b177532d 100644 --- a/net/core/sysctl_net_core.c +++ b/net/core/sysctl_net_core.c @@ -26,6 +26,7 @@ static int zero = 0; static int ushort_max = USHRT_MAX; static int min_sndbuf = SOCK_MIN_SNDBUF; static int min_rcvbuf = SOCK_MIN_RCVBUF; +static int max_skb_frags = MAX_SKB_FRAGS; #ifdef CONFIG_RPS static int rps_sock_flow_sysctl(struct ctl_table *table, int write, @@ -362,6 +363,15 @@ static struct ctl_table net_core_table[] = { .mode = 0644, .proc_handler = proc_dointvec }, + { + .procname = "max_skb_frags", + .data = &sysctl_max_skb_frags, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec_minmax, + .extra1 = &one, + .extra2 = &max_skb_frags, + }, { } }; |