OSDN Git Service
Dmitry Shmidt [Tue, 6 Jan 2015 21:41:50 +0000 (13:41 -0800)]
server: softap: Set hw_mode according to selected channel
Change-Id: If3d12d33e857b1438edd504ddbd5e5504673725c
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dan Albert [Tue, 6 Jan 2015 19:56:56 +0000 (19:56 +0000)]
am
3dc3e542: am
1a3c689b: Merge "Fix missing errno.h includes after libc cleanup."
* commit '
3dc3e5423a183930fa981fa010f653be03201774':
Fix missing errno.h includes after libc cleanup.
Dan Albert [Tue, 6 Jan 2015 18:17:46 +0000 (18:17 +0000)]
am
1a3c689b: Merge "Fix missing errno.h includes after libc cleanup."
* commit '
1a3c689be29bfbe0c7f3eb3134e9b2a2208f839c':
Fix missing errno.h includes after libc cleanup.
Dan Albert [Tue, 6 Jan 2015 18:02:09 +0000 (18:02 +0000)]
Merge "Fix missing errno.h includes after libc cleanup."
Dan Albert [Tue, 6 Jan 2015 17:36:17 +0000 (09:36 -0800)]
Fix missing errno.h includes after libc cleanup.
These issues hadn't been found yet because a libc++ header was
unconditionally pulling in errno.h. I've fixed the libc++ header now.
Change-Id: Ib096634cdd231fc75bf7548e4b99babc7442dc53
Elliott Hughes [Mon, 29 Dec 2014 20:07:31 +0000 (20:07 +0000)]
am
9fb832c0: am
8a8b0c6a: Merge "Include what you use: <errno.h>."
* commit '
9fb832c0ee33c74f28cca8593b87ec1942684756':
Include what you use: <errno.h>.
Elliott Hughes [Mon, 29 Dec 2014 20:04:55 +0000 (20:04 +0000)]
am
8a8b0c6a: Merge "Include what you use: <errno.h>."
* commit '
8a8b0c6af6ba45b549228ca4339277f18894f909':
Include what you use: <errno.h>.
Elliott Hughes [Mon, 29 Dec 2014 19:55:14 +0000 (19:55 +0000)]
Merge "Include what you use: <errno.h>."
Elliott Hughes [Mon, 29 Dec 2014 19:48:03 +0000 (11:48 -0800)]
Include what you use: <errno.h>.
Change-Id: Ic970f6bf4558e8e0ef3d7e480c2532c102abfd7c
Erik Kline [Wed, 10 Dec 2014 22:30:05 +0000 (22:30 +0000)]
am
1df4f67e: am
59273ede: Re-add netd support for enabling IPv6 optimistic mode.
* commit '
1df4f67ee49a1ae06478d34167027296d28bffea':
Re-add netd support for enabling IPv6 optimistic mode.
Erik Kline [Wed, 10 Dec 2014 22:21:52 +0000 (22:21 +0000)]
am
59273ede: Re-add netd support for enabling IPv6 optimistic mode.
* commit '
59273ede02fc91d2a3297547d959159c8c6f69f3':
Re-add netd support for enabling IPv6 optimistic mode.
Erik Kline [Tue, 9 Dec 2014 00:57:16 +0000 (00:57 +0000)]
am
67a07780: am
9ccaa16e: Revert "Merge "Add netd support for configuring IPv6 optimistic mode." into lmp-mr1-dev"
* commit '
67a0778055a6ea97331aa1d25b442e3a164a68a2':
Revert "Merge "Add netd support for configuring IPv6 optimistic mode." into lmp-mr1-dev"
Erik Kline [Mon, 8 Dec 2014 19:16:44 +0000 (19:16 +0000)]
am
9ccaa16e: Revert "Merge "Add netd support for configuring IPv6 optimistic mode." into lmp-mr1-dev"
* commit '
9ccaa16ece9059a0e62e16dbc0f8a64fec7eb7a3':
Revert "Merge "Add netd support for configuring IPv6 optimistic mode." into lmp-mr1-dev"
Erik Kline [Mon, 8 Dec 2014 07:05:28 +0000 (16:05 +0900)]
Re-add netd support for enabling IPv6 optimistic mode.
Enables optimistic_dad and use_optimistic on all interfaces
by default.
---
This functionality was originally submitted in ag/569594. Owing
to issues with bind()ing to optimistic addresses (see b/
18609055)
this was reverted in ag/598690.
This reverts the revert. :-)
Bug:
17769720
Change-Id: I156e5636341a846f41fb9a15c84cf06878b239d8
Erik Kline [Fri, 5 Dec 2014 11:17:10 +0000 (20:17 +0900)]
Revert "Merge "Add netd support for configuring IPv6 optimistic mode." into lmp-mr1-dev"
This is to undo ag/569594.
This reverts commit
828f8b88c78e7d7c31b098768df403e4596a91d4, reversing
changes made to
ac7fefcf3d90cf856b0f1664207d056ed1dd4725.
Bug:
18609055
Bug:
17769720
Change-Id: I120745d9d01d731174f477dff9b463dede8523d7
Lorenzo Colitti [Tue, 2 Dec 2014 07:07:43 +0000 (07:07 +0000)]
am
3c34ff3d: am
dadc5f85: Add a command to clear a network\'s DNS servers.
* commit '
3c34ff3d8f53e1bfa4d6b0f790d72317da8c45cf':
Add a command to clear a network's DNS servers.
Lorenzo Colitti [Tue, 2 Dec 2014 07:00:48 +0000 (07:00 +0000)]
am
dadc5f85: Add a command to clear a network\'s DNS servers.
* commit '
dadc5f850ee7a4dbe9ed418ae9d363b237f7a0e8':
Add a command to clear a network's DNS servers.
Lorenzo Colitti [Sat, 29 Nov 2014 04:54:25 +0000 (13:54 +0900)]
Add a command to clear a network's DNS servers.
Bug:
18327075
Change-Id: I0df13ff4a17ee65e640be96695a3af31b020963a
Elliott Hughes [Tue, 25 Nov 2014 19:56:42 +0000 (19:56 +0000)]
am
2ac0dcb4: am
a0b06f61: Merge "Plug some leaks"
* commit '
2ac0dcb47d959c4944a8e38d6b5bdf8daaf86fb5':
Plug some leaks
Elliott Hughes [Tue, 25 Nov 2014 18:52:06 +0000 (18:52 +0000)]
am
a0b06f61: Merge "Plug some leaks"
* commit '
a0b06f61c55be2ecea35d14b621553c00bf287a6':
Plug some leaks
Elliott Hughes [Mon, 24 Nov 2014 18:58:35 +0000 (18:58 +0000)]
Merge "Plug some leaks"
Jesper Hansson [Fri, 27 Apr 2012 11:54:27 +0000 (13:54 +0200)]
Plug some leaks
Change-Id: I4268ea32cfb0ebd6ce5711e30865750dffa94e92
Elliott Hughes [Fri, 14 Nov 2014 00:44:52 +0000 (00:44 +0000)]
am
9aaad858: am
ce0b69e2: Merge "Don\'t send structs containing pointers over sockets."
* commit '
9aaad8581005ec7e0248508ebc3c5f91e4c50913':
Don't send structs containing pointers over sockets.
Elliott Hughes [Thu, 13 Nov 2014 18:03:08 +0000 (18:03 +0000)]
am
ce0b69e2: Merge "Don\'t send structs containing pointers over sockets."
* commit '
ce0b69e25ae35f93ff7253855bf8a38c7fbf0232':
Don't send structs containing pointers over sockets.
Elliott Hughes [Thu, 13 Nov 2014 17:56:05 +0000 (17:56 +0000)]
Merge "Don't send structs containing pointers over sockets."
Elliott Hughes [Thu, 13 Nov 2014 01:01:46 +0000 (17:01 -0800)]
Don't send structs containing pointers over sockets.
Fixes x86-64 netd.
Change-Id: Iee5ef802ebbf2e000b2593643de4eec46f296c04
Sreeram Ramachandran [Tue, 4 Nov 2014 22:24:38 +0000 (22:24 +0000)]
am
02828009: am
584dbee5: Don\'t use framework permission strings for netd permissions.
* commit '
02828009b2ca2d91262b370d58ccee36fe67be06':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Tue, 4 Nov 2014 22:15:52 +0000 (22:15 +0000)]
am
584dbee5: Don\'t use framework permission strings for netd permissions.
* commit '
584dbee59ceb7750e22c48371342635aa6a98517':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Tue, 4 Nov 2014 18:18:25 +0000 (10:18 -0800)]
Don't use framework permission strings for netd permissions.
These framework permission strings were being used as arbitrary labels
that mapped to netd permissions that have completely different meaning.
This leads to confusion, so use different strings.
Bug:
18194858
Change-Id: Ib3ec377ab26ce904d3d4678f04edec6cb1260517
Robert Greenwalt [Tue, 4 Nov 2014 01:17:17 +0000 (01:17 +0000)]
am
5e1d88b5: Write pid file so we can tell when netd bounces. automerge:
347f693
* commit '
5e1d88b58d42b0cb4c3bc9ce1b347a0127a0ea10':
Write pid file so we can tell when netd bounces.
Robert Greenwalt [Mon, 3 Nov 2014 23:59:47 +0000 (23:59 +0000)]
Write pid file so we can tell when netd bounces.
automerge:
347f693
* commit '
347f69312176a54250a35afdc712b044c466fc73':
Write pid file so we can tell when netd bounces.
Robert Greenwalt [Sat, 1 Nov 2014 01:54:06 +0000 (18:54 -0700)]
Write pid file so we can tell when netd bounces.
We clear the file early so people know it's died and rewrite after all the
setup and flushing of data is done so people know when it's safe to
repopulate the data.
bug:
18069270
Change-Id: I954cf43ff02f1d352015f128ef88b659e6d0f95a
Sreeram Ramachandran [Fri, 31 Oct 2014 00:36:24 +0000 (00:36 +0000)]
am
eb4325b0: am
64166e76: Don\'t fail when trying to add routes that already exist.
* commit '
eb4325b0499bc246ed104cf4ad46b84b4e78599e':
Don't fail when trying to add routes that already exist.
Sreeram Ramachandran [Fri, 31 Oct 2014 00:29:45 +0000 (00:29 +0000)]
am
64166e76: Don\'t fail when trying to add routes that already exist.
* commit '
64166e7666e3cc7f4b9c715f2b4e19d28ae44c5a':
Don't fail when trying to add routes that already exist.
Lorenzo Colitti [Fri, 31 Oct 2014 00:24:58 +0000 (00:24 +0000)]
am
dce9d895: am
2b8d1ead: Merge "Add a netd interface command to disable ND offload." into lmp-mr1-dev
* commit '
dce9d8959ac937249d62aebe3d6e044c015b7cff':
Add a netd interface command to disable ND offload.
Erik Kline [Fri, 31 Oct 2014 00:24:57 +0000 (00:24 +0000)]
am
4c631b0d: am
828f8b88: Merge "Add netd support for configuring IPv6 optimistic mode." into lmp-mr1-dev
* commit '
4c631b0d17fcc3bc2d0d43fadeee2296a2aa9d76':
Add netd support for configuring IPv6 optimistic mode.
Lorenzo Colitti [Fri, 31 Oct 2014 00:15:57 +0000 (00:15 +0000)]
am
2b8d1ead: Merge "Add a netd interface command to disable ND offload." into lmp-mr1-dev
* commit '
2b8d1ead4ea2ff8cb5af1ce88033a8ea0d691402':
Add a netd interface command to disable ND offload.
Erik Kline [Fri, 31 Oct 2014 00:15:27 +0000 (00:15 +0000)]
am
828f8b88: Merge "Add netd support for configuring IPv6 optimistic mode." into lmp-mr1-dev
* commit '
828f8b88c78e7d7c31b098768df403e4596a91d4':
Add netd support for configuring IPv6 optimistic mode.
Sreeram Ramachandran [Thu, 30 Oct 2014 17:01:07 +0000 (10:01 -0700)]
Don't fail when trying to add routes that already exist.
Previously, we suppressed failures for the special case of
requestRouteToHost() being called multiple times. Turns out that other
parts of the system also try to add duplicate routes, so just suppress
EEXIST errors in general (as far as adding routes is concerned). For
example, this happens when the WiFi P2P DHCP client renews its lease
and blindly requests to add a route that it had already added before.
Bug:
17205769
Change-Id: I3de557ddb82c95899623aa31b4b3ec7c955f5609
Lorenzo Colitti [Thu, 30 Oct 2014 13:24:39 +0000 (13:24 +0000)]
Merge "Add a netd interface command to disable ND offload." into lmp-mr1-dev
Lorenzo Colitti [Mon, 27 Oct 2014 15:15:07 +0000 (00:15 +0900)]
Add a netd interface command to disable ND offload.
This will be used to support 464xlat on wifi and IPv6 tethering.
Bug:
12111730
Change-Id: I3b97f4dfb787b2c5d5021811c6da51850bdc70d1
Erik Kline [Thu, 30 Oct 2014 03:42:18 +0000 (03:42 +0000)]
Merge "Add netd support for configuring IPv6 optimistic mode." into lmp-mr1-dev
Lorenzo Colitti [Wed, 29 Oct 2014 17:37:31 +0000 (17:37 +0000)]
am
9b1b22ef: Support more than one clatd at a time. automerge:
ac7fefc
* commit '
9b1b22ef23b807897ea5747fbb817e4a75222b2b':
Support more than one clatd at a time.
Lorenzo Colitti [Wed, 29 Oct 2014 17:16:23 +0000 (17:16 +0000)]
Support more than one clatd at a time.
automerge:
ac7fefc
* commit '
ac7fefcf3d90cf856b0f1664207d056ed1dd4725':
Support more than one clatd at a time.
Robert Greenwalt [Wed, 29 Oct 2014 07:12:48 +0000 (07:12 +0000)]
am
3d6c5b01: am
4bcd2b13: am
388cd671: (-s ours) Merge "Fix MDnsSdListener::Monitor::Monitor()"
* commit '
3d6c5b01355a10469ac10538bea365ec34e8e23f':
Lorenzo Colitti [Wed, 29 Oct 2014 07:12:48 +0000 (07:12 +0000)]
am
50b90a07: am
4dc100c4: am
a1067c8d: Improve error return values on network selection.
* commit '
50b90a07f68335492a34e0e85a69413ea22cc43e':
Lorenzo Colitti [Wed, 29 Oct 2014 07:12:47 +0000 (07:12 +0000)]
Gordon Gao [Wed, 29 Oct 2014 07:12:47 +0000 (07:12 +0000)]
Lorenzo Colitti [Wed, 29 Oct 2014 07:12:46 +0000 (07:12 +0000)]
Robert Greenwalt [Wed, 29 Oct 2014 07:00:21 +0000 (07:00 +0000)]
am
4bcd2b13: am
388cd671: (-s ours) Merge "Fix MDnsSdListener::Monitor::Monitor()"
* commit '
4bcd2b139cdb67cfcea47d15b58f38afec0b0859':
Lorenzo Colitti [Wed, 29 Oct 2014 07:00:20 +0000 (07:00 +0000)]
am
4dc100c4: am
a1067c8d: Improve error return values on network selection.
* commit '
4dc100c4e79200152ab5c0f9bc3e00033bfff104':
Lorenzo Colitti [Wed, 29 Oct 2014 07:00:20 +0000 (07:00 +0000)]
Gordon Gao [Wed, 29 Oct 2014 07:00:19 +0000 (07:00 +0000)]
am
bc9da4e6: am
6b6f22fa: Enable tcp mss clamp for Tethering
* commit '
bc9da4e633165700bbcc6ba33e09f100acb88d3f':
Lorenzo Colitti [Wed, 29 Oct 2014 07:00:18 +0000 (07:00 +0000)]
am
10f9a166: am
4c95a125: Support manipulating throw routes.
* commit '
10f9a166f6bfc625a07f67cf3bcc3d96b170a5de':
Lorenzo Colitti [Mon, 20 Oct 2014 08:14:13 +0000 (17:14 +0900)]
Support more than one clatd at a time.
1. Change from a single PID to a map of interface names to PIDs.
2. Make clatd commands take an interface argument.
3. Give the clatd processes names that depend on their parent
interface, e.g., clatd-rmnet0.
Bug:
12111730
Change-Id: Ia770952d6511f8598a3356be5911da4ffa01b46a
Erik Kline [Thu, 9 Oct 2014 06:37:01 +0000 (15:37 +0900)]
Add netd support for configuring IPv6 optimistic mode.
Enables optimistic_dad and use_optimistic on all interfaces
by default.
Bug:
17769720
Change-Id: Ide492e18aa94064b890fef30d31c3a14cfdf4052
Robert Greenwalt [Thu, 9 Oct 2014 22:19:28 +0000 (22:19 +0000)]
am
8214b178: am
388cd671: (-s ours) Merge "Fix MDnsSdListener::Monitor::Monitor()"
* commit '
8214b1782bb67d22629af35e34244f69adb80e02':
Fix MDnsSdListener::Monitor::Monitor()
Robert Greenwalt [Thu, 9 Oct 2014 22:10:38 +0000 (22:10 +0000)]
am
388cd671: (-s ours) Merge "Fix MDnsSdListener::Monitor::Monitor()"
* commit '
388cd671ff5237aabcd728794af49d33e18fda8b':
Fix MDnsSdListener::Monitor::Monitor()
Robert Greenwalt [Thu, 9 Oct 2014 22:07:03 +0000 (22:07 +0000)]
am
388cd671: (-s ours) Merge "Fix MDnsSdListener::Monitor::Monitor()"
* commit '
388cd671ff5237aabcd728794af49d33e18fda8b':
Fix MDnsSdListener::Monitor::Monitor()
Robert Greenwalt [Thu, 9 Oct 2014 19:13:59 +0000 (19:13 +0000)]
Merge "Fix MDnsSdListener::Monitor::Monitor()"
Kévin Petit [Thu, 9 Oct 2014 14:20:56 +0000 (15:20 +0100)]
Fix MDnsSdListener::Monitor::Monitor()
* Initialisation of mLiveCount
The value of mLiveCount was being used without being initialised, and
this was causing the CTS class android.net.wifi.cts.NsdManagerTest
method testAndroidTestCaseSetupProperly test to fail when the calls
to calloc in the MDnsSdListener::Monitor::rescan() method returned a
value of NULL due to the large value of mPollSize, which had been set
to "mLiveCount + 5". The mPollFds and mPollRefs pointers were then used
without checking that they were not NULL, resulting in a segmentation
violation when the NULL pointer value was dereferenced. Initialising
the value of mLiveCount to zero in MDnsSdListener::Monitor::Monitor()
fixes this problem, and the test then passes.
* Also initilize mPollFds, mPollRefs and mPollSize
Change-Id: I1a8f7ee0f3ed38f46854e9ba6d5c432c9412b7c3
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin Petit <kevin.petit@arm.com>
Lorenzo Colitti [Fri, 3 Oct 2014 06:19:49 +0000 (06:19 +0000)]
am
e871b627: am
3d48bc23: am
a1067c8d: Improve error return values on network selection.
* commit '
e871b627fdc4f8d54ae506a83f9024c64ddba260':
Improve error return values on network selection.
Lorenzo Colitti [Fri, 3 Oct 2014 06:19:49 +0000 (06:19 +0000)]
Dmitry Shmidt [Fri, 3 Oct 2014 06:19:48 +0000 (06:19 +0000)]
am
bd0405f3: am
6fa06b78: softap: Ensure entropy file creation
* commit '
bd0405f3c3fb1ca62ee82610b7fb6ad1227e05c3':
softap: Ensure entropy file creation
Lorenzo Colitti [Fri, 3 Oct 2014 06:12:47 +0000 (06:12 +0000)]
am
3d48bc23: am
a1067c8d: Improve error return values on network selection.
* commit '
3d48bc23465becc6992756d4160550bf01799ffc':
Improve error return values on network selection.
Lorenzo Colitti [Fri, 3 Oct 2014 06:12:47 +0000 (06:12 +0000)]
am
1c57d2b7: am
e8164ddc: Fix MSS clamping.
* commit '
1c57d2b7141ba81a2a4e991267082a7258c09015':
Fix MSS clamping.
Dmitry Shmidt [Fri, 3 Oct 2014 06:12:47 +0000 (06:12 +0000)]
am
6fa06b78: softap: Ensure entropy file creation
* commit '
6fa06b78e31f9e99c4e61f2c4c8241823b781f89':
softap: Ensure entropy file creation
Lorenzo Colitti [Fri, 3 Oct 2014 05:55:27 +0000 (05:55 +0000)]
am
a1067c8d: Improve error return values on network selection.
* commit '
a1067c8d2b2165f1058a3a8216bed4efacfa1c80':
Improve error return values on network selection.
Lorenzo Colitti [Fri, 3 Oct 2014 05:54:55 +0000 (05:54 +0000)]
am
e8164ddc: Fix MSS clamping.
* commit '
e8164ddc8204b626c1144a0a504754bf6622c6fd':
Fix MSS clamping.
Lorenzo Colitti [Fri, 3 Oct 2014 02:20:26 +0000 (02:20 +0000)]
am
a1067c8d: Improve error return values on network selection.
* commit '
a1067c8d2b2165f1058a3a8216bed4efacfa1c80':
Improve error return values on network selection.
Lorenzo Colitti [Fri, 3 Oct 2014 01:39:21 +0000 (01:39 +0000)]
am
e8164ddc: Fix MSS clamping.
* commit '
e8164ddc8204b626c1144a0a504754bf6622c6fd':
Fix MSS clamping.
Lorenzo Colitti [Thu, 2 Oct 2014 13:47:41 +0000 (22:47 +0900)]
Improve error return values on network selection.
It's very confusing to see EPERM when opening or connecting a
socket when the problem is not security-related. In the (common)
case where an app cannot select a network because it does not
exist, return ENONET ("Machine is not on network") instead.
Also, return EREMOTEIO for when we can't figure out who the user
is, and use EPERM for VPN denials and EACCES for permission
bits.
Bug:
17702933
Change-Id: Ia680c485e0ea1efad1ad374231d994e9bfd4cd5a
Lorenzo Colitti [Thu, 2 Oct 2014 11:46:23 +0000 (20:46 +0900)]
Fix MSS clamping.
http://ag/553410 added an iptables chain and rule to do MSS
clamping for tethered clients, but did not add the chain to any
other chains, so the rule had no effect.
Fix this by adding the chain to the proper forwarding chains.
Also rename some of the new variables and constants so they are
more consistent with the previous code.
Bug:
17552732
Bug:
17727533
Change-Id: I9fcae31de5c0283d7d9f1dac989de84f77c5e53c
Gordon Gao [Mon, 29 Sep 2014 19:44:52 +0000 (19:44 +0000)]
am
28c0a37f: am
6b6f22fa: Enable tcp mss clamp for Tethering
* commit '
28c0a37f14cdc5b9f23b422541cb4d23567058b5':
Enable tcp mss clamp for Tethering
Dmitry Shmidt [Fri, 5 Sep 2014 23:39:29 +0000 (16:39 -0700)]
softap: Ensure entropy file creation
Bug:
17408011
Change-Id: I558270f1ce2603f305d38ad8604379ea533f0a47
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Gordon Gao [Fri, 26 Sep 2014 23:57:03 +0000 (23:57 +0000)]
am
6b6f22fa: Enable tcp mss clamp for Tethering
* commit '
6b6f22fac4c33fcd349aaf6970bbdc191db752a3':
Enable tcp mss clamp for Tethering
Gordon Gao [Fri, 26 Sep 2014 23:44:04 +0000 (23:44 +0000)]
am
6b6f22fa: Enable tcp mss clamp for Tethering
* commit '
6b6f22fac4c33fcd349aaf6970bbdc191db752a3':
Enable tcp mss clamp for Tethering
Gordon Gao [Thu, 18 Sep 2014 18:50:09 +0000 (11:50 -0700)]
Enable tcp mss clamp for Tethering
With this change, IPv4 tethering clients (such as PC) with default
MTU size 1500 will be configured again in the phone to use MTU
matching the carrier network, then no IP fragemention in the phone
and have higher data throughput for tethering.
bug:
17552732
Change-Id: Ia306b1b8454da1b0e2d9c320e770aeff172d5fc4
Lorenzo Colitti [Tue, 23 Sep 2014 16:18:57 +0000 (16:18 +0000)]
am
4e5514f5: am
4c95a125: Support manipulating throw routes.
* commit '
4e5514f5d5c3574b2256358b5758347f209e6a16':
Support manipulating throw routes.
Lorenzo Colitti [Mon, 22 Sep 2014 20:02:01 +0000 (20:02 +0000)]
am
4c95a125: Support manipulating throw routes.
* commit '
4c95a125e0930c112555437589f7620575482095':
Support manipulating throw routes.
Lorenzo Colitti [Mon, 22 Sep 2014 17:25:28 +0000 (17:25 +0000)]
am
4c95a125: Support manipulating throw routes.
* commit '
4c95a125e0930c112555437589f7620575482095':
Support manipulating throw routes.
Lorenzo Colitti [Thu, 18 Sep 2014 07:01:50 +0000 (16:01 +0900)]
Support manipulating throw routes.
We already supported unreachable routes. Throw routes are
necessary so we can exempt the VPN endpoint from being routed
through the VPN in legacy VPN modes that do not pass traffic
through a tun or ppp interface but just directly appply IPsec
transformations to outgoing packets.
Bug:
17462989
Change-Id: I8635472ca3e96ec2866af2de48e6260ab2da13fb
Dan Albert [Sat, 13 Sep 2014 02:21:55 +0000 (02:21 +0000)]
am
356a7a07: am
100457df: (-s ours) Merge "Remove makefile cruft."
* commit '
356a7a071493bc86f7a9bd4808ddd4ebafbe5acb':
Remove makefile cruft.
Dan Albert [Fri, 12 Sep 2014 20:01:53 +0000 (20:01 +0000)]
am
100457df: (-s ours) Merge "Remove makefile cruft."
* commit '
100457df47b8a453eb94df3cf2e87f6248e783d1':
Remove makefile cruft.
Dan Albert [Fri, 12 Sep 2014 18:07:44 +0000 (18:07 +0000)]
Merge "Remove makefile cruft."
Dan Albert [Fri, 12 Sep 2014 17:47:14 +0000 (10:47 -0700)]
Remove makefile cruft.
Don't manually include stlport, and don't use private bionic headers.
Change-Id: Ibe91ed010b8558fba4ce08fdcf789cbed006f6ef
Sreeram Ramachandran [Wed, 10 Sep 2014 01:10:47 +0000 (01:10 +0000)]
am
e25a378f: am
6a834abb: Merge "Reset connections whenever an address goes away." into lmp-dev
* commit '
e25a378fbb6fb6264577dc6aa60ee8eb8deae61f':
Reset connections whenever an address goes away.
Sreeram Ramachandran [Wed, 10 Sep 2014 00:51:21 +0000 (00:51 +0000)]
am
6a834abb: Merge "Reset connections whenever an address goes away." into lmp-dev
* commit '
6a834abb5acca22e47b70ee88e55f394f909559b':
Reset connections whenever an address goes away.
Sreeram Ramachandran [Tue, 9 Sep 2014 23:24:52 +0000 (23:24 +0000)]
Merge "Reset connections whenever an address goes away." into lmp-dev
Sreeram Ramachandran [Mon, 8 Sep 2014 23:03:18 +0000 (16:03 -0700)]
Reset connections whenever an address goes away.
Bug:
15414453
Change-Id: Ibf1f052e12b88838a328148e25817a96f10d50f5
Sreeram Ramachandran [Tue, 9 Sep 2014 00:00:02 +0000 (00:00 +0000)]
am
a10e1efe: am
bbdde990: Reserve NetIds 1..50 for OEM use.
* commit '
a10e1efe86a9844ce5cf3dd38d036f5cb5f53acd':
Reserve NetIds 1..50 for OEM use.
Sreeram Ramachandran [Mon, 8 Sep 2014 23:50:49 +0000 (23:50 +0000)]
am
bbdde990: Reserve NetIds 1..50 for OEM use.
* commit '
bbdde9909b7b4fd31c5857156ceb00049bf4992d':
Reserve NetIds 1..50 for OEM use.
Sreeram Ramachandran [Fri, 5 Sep 2014 23:05:03 +0000 (16:05 -0700)]
Reserve NetIds 1..50 for OEM use.
Also reserve 51..100 for our use.
Bug:
17303534
Change-Id: Id082368b493dc3c5b5c479e51d273458d80ec6aa
Dmitry Shmidt [Thu, 4 Sep 2014 17:59:13 +0000 (17:59 +0000)]
am
52152dd6: am
928294e4: Merge "softap: Add wowlan_triggers=any parameter" into lmp-dev
* commit '
52152dd66c161bf04af1809c62754ae406facc8d':
softap: Add wowlan_triggers=any parameter
Dmitry Shmidt [Thu, 4 Sep 2014 17:49:28 +0000 (17:49 +0000)]
am
928294e4: Merge "softap: Add wowlan_triggers=any parameter" into lmp-dev
* commit '
928294e4e778338c2a120c96373a779de8027ec6':
softap: Add wowlan_triggers=any parameter
Dmitry Shmidt [Thu, 4 Sep 2014 17:23:26 +0000 (17:23 +0000)]
Merge "softap: Add wowlan_triggers=any parameter" into lmp-dev
Dmitry Shmidt [Wed, 3 Sep 2014 22:19:36 +0000 (15:19 -0700)]
softap: Add wowlan_triggers=any parameter
New kernels in wiphy_suspend() will call cfg80211_leave_all()
that will eventually end up in cfg80211_stop_ap() unless
wowlan_triggers were set.
Bug:
17269024
Change-Id: I609d78f5bb573b4c6a9dae25a3b2a345499f6853
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Lorenzo Colitti [Wed, 3 Sep 2014 09:14:15 +0000 (09:14 +0000)]
am
a47ea0b4: am
667c4771: Add a socket mark parameter to tethering DNS commands.
* commit '
a47ea0b4e4e40c8ee184fe1b53faf255bee29b44':
Add a socket mark parameter to tethering DNS commands.
Lorenzo Colitti [Wed, 3 Sep 2014 05:49:15 +0000 (05:49 +0000)]
am
667c4771: Add a socket mark parameter to tethering DNS commands.
* commit '
667c477133318e4779819d34364194c8e5eaf19c':
Add a socket mark parameter to tethering DNS commands.
Lorenzo Colitti [Tue, 26 Aug 2014 21:13:07 +0000 (14:13 -0700)]
Add a socket mark parameter to tethering DNS commands.
This allows the framework to pass down to dnsmasq the socket mark
to use for DNS queries.
Bug:
16357676
Change-Id: I8933b6de198a92c2aaf0291931ace8966ddba275
OSDN Git Service
