From: Kevin Darbyshire-Bryant Date: Wed, 6 Jul 2016 10:29:34 +0000 (+0100) Subject: samba: update smb template socket options defaults X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=17f4d3967eec59db147d2f5b1c45dc9cf30a883e;p=openwrt%2Fstaging%2Fnbd.git samba: update smb template socket options defaults Removed socket options = TCP_NODELAY IPTOS_LOWDELAY TCP_NODELAY (disables Nagle algorithm) is default since samba2. IPTOS_LOWDELAY sets DSCP 0x10 coding (CS2) The alternate IPTOS_THROUGHPUT sets DSCP 0x08 coding (CS1) CS1 is a scavenger class, whilst CS2 is more OAM/interactive (SNMP,SSH,syslog) Using CS2 is definitely an abuse of DSCP classification, CS1 less so however even if the ISP takes note of DSCP codings having a default that sets traffic to CS2 is wrong. Better to use the default Best Effort class. Signed-off-by: Kevin Darbyshire-Bryant --- diff --git a/package/network/services/samba36/files/smb.conf.template b/package/network/services/samba36/files/smb.conf.template index 7a996b8286..48e575a406 100644 --- a/package/network/services/samba36/files/smb.conf.template +++ b/package/network/services/samba36/files/smb.conf.template @@ -21,7 +21,6 @@ preferred master = yes security = user smb passwd file = /etc/samba/smbpasswd - socket options = TCP_NODELAY IPTOS_LOWDELAY syslog = 2 use sendfile = yes writeable = yes