merge in klp-factoryrom-release history after reset to klp-release
merge in KFS78N (no-op)
SecondaryTableController: force the MSS to match pmtu on TCP SYN

Without this change, the VPN sets up a tun/ppp that needs a small
MTU, and during TCP SYN the MSS will end up matching the outgoing iface
MTU which is potentially too big.
This leads to connection flakiness. The wrong MSS is visible by
tcpdump-ing on the tun/ppp device.

With this change, the MSS now is correct.
It requires the kernel to be configured with
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
If kernel is not configured, it silently fails.

Bug: 11579326
Change-Id: I254d8c39435b92dff91931e461e1efb8b35f6b1e
Merge tag 'android-4.4.1_r1' into HEAD

Android 4.4.1 Release 1
SoftapControllerTI: update parameters for setSoftap

The parameters used to call setSoftap were changed in Android
4.4. Adapt SoftapControllerTI to this change.

Change-Id: I31c096f93cbbb2c9da3f9f5329177813835d347f
netd: Rename QualcommSoftapCmd.cpp to QsoftapCmd.cpp

 * For matching CAF upstream

Change-Id: I7d6e33c2f18ed4a6390d73767442d60cb42a5f8b
netd: Test the return value from snprintf() in runCommand()

Properly test the return value from snprintf() in runCommand() to
avoid error conditions.

Change-Id: Idfa099e5eb2b8ff3f5b67a0a3aea3174045f4563
CRs-fixed: 549627
netd: Add dhcp option while starting dnsmasq.

Add dhcp-authoritative option which restores non-RFC
compliant but desirable behaviour of pre-2.14 versions and
avoids long timeouts while DHCP clients try to renew leases
which are unknown to dnsmasq.

Change-Id: I99d699b8d796b91cfb088510726cbf5998a2bac6
CRs-Fixed: 580493
netd: Validate input argument for Route commands

Check for valid command line argument that is
passed to RouteController module.

CRs-fixed: 569443
Change-Id: I06516d96fa1ab188e4ab3f81bf6c81be56b41aa5
RouteController: use fixed priority for ip rule

Use fixed priority when adding source policy rules

CR-fixed: 613222
Change-Id: I3182777db6b665c6adc94f65e91b429aac733875
netd: Use append to add routes to secondary routing table

Use <ip route append> instead of <ip route add>
to add routes to the secondary routing table. This
is because adding a route with same v6 address but
different device name fails by using <ip route add>

CRs-Fixed: 618837
Change-Id: Id880e1a155856a5a3afad75135091a17ace07414
Netd: Do not reset routing policies

Stop flushing of all routing policies when resetting to default rule
configuration. This is detrimental to other policy routes set on the
system and creates a conflict. Tethering related rules are already
removed by NatController so this step is unnecessary.

Change-Id: Id9026c089262e37fffe6e5db8eb8e0ccf3338c94
Merge branch 'cm/cm-11.0'

Conflicts:
	Android.mk