forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking fixes from David Miller: 1) Fix checksumming regressions, from Tom Herbert. 2) Undo unintentional permissions changes for SCTP rto_alpha and rto_beta sysfs knobs, from Denial Borkmann. 3) VXLAN, like other IP tunnels, should advertize it's encapsulation size using dev->needed_headroom instead of dev->hard_header_len. From Cong Wang. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: net: sctp: fix permissions for rto_alpha and rto_beta knobs vxlan: Checksum fixes net: add skb_pop_rcv_encapsulation udp: call __skb_checksum_complete when doing full checksum net: Fix save software checksum complete net: Fix GSO constants to match NETIF flags udp: ipv4: do not waste time in __udp4_lib_mcast_demux_lookup vxlan: use dev->needed_headroom instead of dev->hard_header_len MAINTAINERS: update cxgb4 maintainer
- Loading branch information
Showing
10 changed files
with
96 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2594,7 +2594,7 @@ S: Supported | |
F: drivers/infiniband/hw/cxgb3/ | ||
|
||
CXGB4 ETHERNET DRIVER (CXGB4) | ||
M: Dimitris Michailidis <dm@chelsio.com> | ||
M: Hariprasad S <hariprasad@chelsio.com> | ||
L: [email protected] | ||
W: http://www.chelsio.com | ||
S: Supported | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -34,6 +34,8 @@ | |
* Sridhar Samudrala <[email protected]> | ||
*/ | ||
|
||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
|
||
#include <net/sctp/structs.h> | ||
#include <net/sctp/sctp.h> | ||
#include <linux/sysctl.h> | ||
|
@@ -46,6 +48,11 @@ static int sack_timer_min = 1; | |
static int sack_timer_max = 500; | ||
static int addr_scope_max = 3; /* check sctp_scope_policy_t in include/net/sctp/constants.h for max entries */ | ||
static int rwnd_scale_max = 16; | ||
static int rto_alpha_min = 0; | ||
static int rto_beta_min = 0; | ||
static int rto_alpha_max = 1000; | ||
static int rto_beta_max = 1000; | ||
|
||
static unsigned long max_autoclose_min = 0; | ||
static unsigned long max_autoclose_max = | ||
(MAX_SCHEDULE_TIMEOUT / HZ > UINT_MAX) | ||
|
@@ -64,6 +71,9 @@ static int proc_sctp_do_rto_min(struct ctl_table *ctl, int write, | |
static int proc_sctp_do_rto_max(struct ctl_table *ctl, int write, | ||
void __user *buffer, size_t *lenp, | ||
loff_t *ppos); | ||
static int proc_sctp_do_alpha_beta(struct ctl_table *ctl, int write, | ||
void __user *buffer, size_t *lenp, | ||
loff_t *ppos); | ||
static int proc_sctp_do_auth(struct ctl_table *ctl, int write, | ||
void __user *buffer, size_t *lenp, | ||
loff_t *ppos); | ||
|
@@ -126,15 +136,19 @@ static struct ctl_table sctp_net_table[] = { | |
.procname = "rto_alpha_exp_divisor", | ||
.data = &init_net.sctp.rto_alpha, | ||
.maxlen = sizeof(int), | ||
.mode = 0444, | ||
.proc_handler = proc_dointvec, | ||
.mode = 0644, | ||
.proc_handler = proc_sctp_do_alpha_beta, | ||
.extra1 = &rto_alpha_min, | ||
.extra2 = &rto_alpha_max, | ||
}, | ||
{ | ||
.procname = "rto_beta_exp_divisor", | ||
.data = &init_net.sctp.rto_beta, | ||
.maxlen = sizeof(int), | ||
.mode = 0444, | ||
.proc_handler = proc_dointvec, | ||
.mode = 0644, | ||
.proc_handler = proc_sctp_do_alpha_beta, | ||
.extra1 = &rto_beta_min, | ||
.extra2 = &rto_beta_max, | ||
}, | ||
{ | ||
.procname = "max_burst", | ||
|
@@ -403,6 +417,16 @@ static int proc_sctp_do_rto_max(struct ctl_table *ctl, int write, | |
return ret; | ||
} | ||
|
||
static int proc_sctp_do_alpha_beta(struct ctl_table *ctl, int write, | ||
void __user *buffer, size_t *lenp, | ||
loff_t *ppos) | ||
{ | ||
pr_warn_once("Changing rto_alpha or rto_beta may lead to " | ||
"suboptimal rtt/srtt estimations!\n"); | ||
|
||
return proc_dointvec_minmax(ctl, write, buffer, lenp, ppos); | ||
} | ||
|
||
static int proc_sctp_do_auth(struct ctl_table *ctl, int write, | ||
void __user *buffer, size_t *lenp, | ||
loff_t *ppos) | ||
|