Commit Graph

6829 Commits

Author SHA1 Message Date
Todd Poynor fd1dd864a8 am 479efb54: init.rc: mount pstore fs, set console-ramoops permissions
* commit '479efb540a198a9b7cd278387b0d45009a05bb2b':
  init.rc: mount pstore fs, set console-ramoops permissions
2013-11-22 10:42:17 -08:00
Elliott Hughes bbdfc0c412 am dd2ac3de: am d966eebf: Merge "Fix build."
* commit 'dd2ac3de625e6c0328a0f70530d8ade0d2151bfc':
  Fix build.
2013-11-21 22:18:38 -08:00
Elliott Hughes dd2ac3de62 am d966eebf: Merge "Fix build."
* commit 'd966eebfcba313477a598ad7b3e573a123a7a9af':
  Fix build.
2013-11-21 22:14:41 -08:00
Elliott Hughes d966eebfcb Merge "Fix build." 2013-11-22 06:12:19 +00:00
Elliott Hughes f98e4bf7fb Fix build.
Change-Id: I6552bf9f83faa97bd5a844381aceb3ef85f86c76
2013-11-21 22:09:46 -08:00
Todd Poynor 479efb540a init.rc: mount pstore fs, set console-ramoops permissions
Change-Id: I44cb00f9123c6044a03de926b6a616da753bb549
2013-11-21 20:23:54 -08:00
Elliott Hughes 330b1afc13 am 486ebac5: am a6fbc0f9: Merge "Replace __reboot call with syscall"
* commit '486ebac551d64bb8698bbc805f71f5644d2c4917':
  Replace __reboot call with syscall
2013-11-21 18:43:50 -08:00
Elliott Hughes b6ee39bca4 am 4a4616f6: am 048bb92f: Merge "split setptop ethernet tcp buffer from wifi"
* commit '4a4616f6450f191faf168a10b6e2ffaba14803bd':
  split setptop ethernet tcp buffer from wifi
2013-11-21 17:15:09 -08:00
Elliott Hughes 127eab2529 am 8ab9ece2: am 162c9a24: Merge "Switch MIPS over to <sys/user.h>."
* commit '8ab9ece2e9c6e246f66357c800d6d1ba61becc00':
  Switch MIPS over to <sys/user.h>.
2013-11-21 17:07:45 -08:00
Lorenzo Colitti 4fe95effe5 am 85fddd86: am cbc32e9f: Merge "Support parsing RDNSS ND options from netlink."
* commit '85fddd867b06cf10ba8f79d0d37c4b65fa47cf8a':
  Support parsing RDNSS ND options from netlink.
2013-11-21 17:01:44 -08:00
Lorenzo Colitti 09e5ef65cd am 6231f7f0: am 71dd5ba4: Merge "Switch back to subsystem "net" for netlink events."
* commit '6231f7f07b1d2476e57410d5b8f7cbed72b893b7':
  Switch back to subsystem "net" for netlink events.
2013-11-21 17:01:43 -08:00
Lorenzo Colitti 1df045d952 am ee676317: am a0b3fef0: Merge "Get rid of an infinite loop in NetlinkEvent.cpp."
* commit 'ee676317b0d5b98968b8dc99d34b2ec0e60180ab':
  Get rid of an infinite loop in NetlinkEvent.cpp.
2013-11-21 17:01:42 -08:00
Lorenzo Colitti 2cfa317c01 am 740bf8da: (-s ours) am 8c099bc2: Merge "Parse IP address changes in NetlinkEvent."
* commit '740bf8da310308bb5419468e2bf6d3920b8d6385':
  Parse IP address changes in NetlinkEvent.
2013-11-21 17:01:41 -08:00
Elliott Hughes 486ebac551 am a6fbc0f9: Merge "Replace __reboot call with syscall"
* commit 'a6fbc0f9f49b797f4a67ea49f37681c08ab41111':
  Replace __reboot call with syscall
2013-11-21 12:38:39 -08:00
Elliott Hughes a6fbc0f9f4 Merge "Replace __reboot call with syscall" 2013-11-21 20:35:50 +00:00
Pavel Chupin dccdb94284 Replace __reboot call with syscall
__reboot is hidden for 64-bits and should be hidden on others

Change-Id: Ib6435269aac7fa726e49cc02f8f76d2be2875bc6
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2013-11-21 12:35:12 -08:00
Elliott Hughes 4a4616f645 am 048bb92f: Merge "split setptop ethernet tcp buffer from wifi"
* commit '048bb92f3f33196d96a51b446c73805e208a5333':
  split setptop ethernet tcp buffer from wifi
2013-11-20 18:10:49 -08:00
Elliott Hughes 048bb92f3f Merge "split setptop ethernet tcp buffer from wifi" 2013-11-21 02:07:38 +00:00
Elliott Hughes 8ab9ece2e9 am 162c9a24: Merge "Switch MIPS over to <sys/user.h>."
* commit '162c9a247b2f62065c997c1085637f28e0fcde94':
  Switch MIPS over to <sys/user.h>.
2013-11-20 12:33:55 -08:00
Elliott Hughes 162c9a247b Merge "Switch MIPS over to <sys/user.h>." 2013-11-20 20:31:21 +00:00
Elliott Hughes 76e7f5e508 Switch MIPS over to <sys/user.h>.
Bug: 11559337
Change-Id: I47ce51ec2d45d9cfdfbb6cccce93a66b0f02d967
2013-11-20 11:31:29 -08:00
Lorenzo Colitti 85fddd867b am cbc32e9f: Merge "Support parsing RDNSS ND options from netlink."
* commit 'cbc32e9f7e95d9c35ec5d855a13fd9346e9f55bf':
  Support parsing RDNSS ND options from netlink.
2013-11-19 18:38:17 -08:00
Lorenzo Colitti 6231f7f07b am 71dd5ba4: Merge "Switch back to subsystem "net" for netlink events."
* commit '71dd5ba4647fdecde0a44793f246fb0274159cbe':
  Switch back to subsystem "net" for netlink events.
2013-11-19 18:38:16 -08:00
Lorenzo Colitti ee676317b0 am a0b3fef0: Merge "Get rid of an infinite loop in NetlinkEvent.cpp."
* commit 'a0b3fef0b78e8c6ef38eac6bcd6da7db6a841522':
  Get rid of an infinite loop in NetlinkEvent.cpp.
2013-11-19 18:38:16 -08:00
Lorenzo Colitti 740bf8da31 am 8c099bc2: Merge "Parse IP address changes in NetlinkEvent."
* commit '8c099bc206094dd229f4468b85c23b8639fb05ea':
  Parse IP address changes in NetlinkEvent.
2013-11-19 18:38:15 -08:00
Lorenzo Colitti cbc32e9f7e Merge "Support parsing RDNSS ND options from netlink." 2013-11-20 02:22:19 +00:00
Lorenzo Colitti 71dd5ba464 Merge "Switch back to subsystem "net" for netlink events." 2013-11-20 02:22:01 +00:00
Lorenzo Colitti a0b3fef0b7 Merge "Get rid of an infinite loop in NetlinkEvent.cpp." 2013-11-20 02:21:44 +00:00
Lorenzo Colitti 8c099bc206 Merge "Parse IP address changes in NetlinkEvent." 2013-11-20 02:21:30 +00:00
Lorenzo Colitti c7eec83f08 Support parsing RDNSS ND options from netlink.
The RDNSS options (RFC 6106) used to configure DNS servers via
router advertisements are passed from the kernel to userspace via
RTM_NEWNDUSEROPT netlink messages. Add code to NetlinkEvent to
parse them.

Also fix a compiler warning and a couple of style issues.

[Cherry-pick of b185e90dcc]

Bug: 9180552
Change-Id: I6c532c8f0ceef3afdc977a431a036df398013e1a
2013-11-20 10:31:19 +09:00
Lorenzo Colitti 526b838c9d Switch back to subsystem "net" for netlink events.
The change to enable address tracking via netlink incorrectly
changed the subsystem of rtnetlink events from "net" to
"interface". This broke interface add/delete notifications,
which come from the kernel with subsystem "net".

Switch back to "net" and deal with address tracking via new
action codes instead of a new subsystem.

[Cherry-pick of f34861346d]

Bug: 10433320
Change-Id: Ibf30efb426949dfd02304cc1d9adb1c005a539a6
2013-11-20 10:29:42 +09:00
Lorenzo Colitti 9683456934 Get rid of an infinite loop in NetlinkEvent.cpp.
[Cherry-pick of 3984276ce4]

Bug: 10358527
Bug: 10263310
Bug: 10232006
Change-Id: I750e4bdf2000040adf214d6a772591d7bd25b350
2013-11-20 10:29:19 +09:00
Lorenzo Colitti 381f70f52a Parse IP address changes in NetlinkEvent.
This adds support for parsing RTM_NEWADDR and RTM_DELADDR
netlink messages received on netd's netlink socket and
formatting them them so NetlinkHandler can process them.

Address changes are notified in subsystem "address". Interface
changes, which used to be notified in subsystem "net", are now
notified in subsystem "interface" to avoid confusion.

[Cherry-pick of a4b4e9ad8e]

Bug: 10232006
Change-Id: I93a50e8de17014e118a42f5cc0eb90a0cbfa73cc
2013-11-20 10:29:05 +09:00
Amir Goldstein 1d4e86c445 ueventd: fix a busy loop while reading uevents
Under certain conditions, poll() may raise the POLLERR
flag along with POLLIN, in which case the check for
(ufd.revents == POLLIN) results in an endless busy loop.

The following fix was applied to
hardware/libhardware_legacy/uevent/uevent.c
to fix a similar bug:

  commit 3aabb260ceef10377c31c9e45fb239247f5cfeba
  Author: Mathias Agopian <mathias@google.com>
  Date:   Mon Oct 1 14:53:18 2012 -0700

    fix a typo in uevent_next_eventi

    Bug: 7114973
    Change-Id: I15a4c714b59aeb1d02db00517d70b5f0e5ab22c2

Applying the same fix for two more poll loops in init
and ueventd.

Change-Id: I50693f6d3c904992ac4b8a9a14a83c7106e6b9e0
2013-11-17 14:50:00 +02:00
Elliott Hughes 252d9030cd am bf8e9342: am 3fa14a53: Merge "Remove x86 debuggerd dependencies on non-uapi headers and corkscrew."
* commit 'bf8e9342daa8b148e6d94d98122c9bc2a429b04f':
  Remove x86 debuggerd dependencies on non-uapi headers and corkscrew.
2013-11-14 21:53:47 -08:00
Elliott Hughes bf8e9342da am 3fa14a53: Merge "Remove x86 debuggerd dependencies on non-uapi headers and corkscrew."
* commit '3fa14a53e70cd55df031646fe3735a6fde37deb8':
  Remove x86 debuggerd dependencies on non-uapi headers and corkscrew.
2013-11-14 21:50:56 -08:00
Elliott Hughes 3fa14a53e7 Merge "Remove x86 debuggerd dependencies on non-uapi headers and corkscrew." 2013-11-15 05:48:27 +00:00
Jianzheng Zhou 52ea510f8f split setptop ethernet tcp buffer from wifi
Change-Id: I0582ec75fddb904ca14b9cbddf593ddbd4195c41
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
2013-11-15 13:44:00 +08:00
Elliott Hughes 18ddd42092 Remove x86 debuggerd dependencies on non-uapi headers and corkscrew.
Also remove a hack that claims to be "just like ARM", but which was
different from the ARM and MIPS behavior.

Change-Id: I9b16da9a56430998ded27d304ce52c7cc8bfedfc
2013-11-14 17:06:46 -08:00
Elliott Hughes fc6a1da9a2 am d97a34af: am 60e7d495: Merge "Fix libnetutils to build with clean uapi headers."
* commit 'd97a34af49f6beafc21d5f459ea62b499544f9f3':
  Fix libnetutils to build with clean uapi headers.
2013-11-12 14:58:50 -08:00
Elliott Hughes d97a34af49 am 60e7d495: Merge "Fix libnetutils to build with clean uapi headers."
* commit '60e7d49557a4a330285f9bcd76f0dfae9c1855ae':
  Fix libnetutils to build with clean uapi headers.
2013-11-12 14:55:33 -08:00
Elliott Hughes 60e7d49557 Merge "Fix libnetutils to build with clean uapi headers." 2013-11-12 21:56:01 +00:00
Elliott Hughes 2d640c2640 Fix libnetutils to build with clean uapi headers.
(And old ones too.)

Bug: 11559337
Change-Id: Ie61218055bbe07655a9d53c539aa47b85098e42c
2013-11-12 13:05:01 -08:00
Elliott Hughes 36ff3bd273 am e8c6d15b: am 59644a6c: Merge "Fix nandread to build with old or uapi headers."
* commit 'e8c6d15b1892ffd09dae8ac7922854140a11130d':
  Fix nandread to build with old or uapi headers.
2013-11-11 16:33:30 -08:00
Elliott Hughes e8c6d15b18 am 59644a6c: Merge "Fix nandread to build with old or uapi headers."
* commit '59644a6c7182db6caf53dc61f448f2c68ff569be':
  Fix nandread to build with old or uapi headers.
2013-11-11 16:31:57 -08:00
Elliott Hughes 59644a6c71 Merge "Fix nandread to build with old or uapi headers." 2013-11-12 00:29:10 +00:00
Elliott Hughes b05a2e5130 Fix nandread to build with old or uapi headers.
Bug: 11559337
Change-Id: I9795a16649dafdfe3df150170265157170cd5a79
2013-11-11 16:17:49 -08:00
Christopher Ferris 90e67bcdc3 am d36bfc30: am e6279294: Merge "Revert "Revert enabling libunwind.""
* commit 'd36bfc30ae5fa86b4c3fd8248e5ee16f479250b6':
  Revert "Revert enabling libunwind."
2013-11-07 19:16:25 -08:00
Christopher Ferris d36bfc30ae am e6279294: Merge "Revert "Revert enabling libunwind.""
* commit 'e627929490dfb92ab51ec6feb259d793a4a9f394':
  Revert "Revert enabling libunwind."
2013-11-07 19:14:31 -08:00
Christopher Ferris e627929490 Merge "Revert "Revert enabling libunwind."" 2013-11-08 03:12:04 +00:00