)]}' { "log": [ { "commit": "4c64d2d0be3c839cd94f53209b6e48c50ab44c8d", "tree": "3a1e8d4ac767890452490a2060aa873b539ba63e", "parents": [ "4e28773483fa22115f8a0e84729f1260e28fe30c" ], "author": { "name": "Tianyi Gou", "email": "tgou@codeaurora.org", "time": "Mon Aug 06 17:23:26 2012 -0700" }, "committer": { "name": "Sudhir Sharma", "email": "sudsha@codeaurora.org", "time": "Mon Nov 12 02:25:01 2012 -0800" }, "message": "net: sched: export an api to enable/disable flow on sch\n\nExport a function from sch_api.c that will look up\ndesired qdisc and call it\u0027s registered change function\nto enable/disable flow.\n\nChange-Id: I5b6dc7a6fd2b09b796c92b3770ba83423d19c864\nCRs-Fixed: 355156\nAcked-by: Jimi Shah \u003cjimis@qualcomm.com\u003e\nSigned-off-by: Tianyi Gou \u003ctgou@codeaurora.org\u003e\n(cherry picked from commit b8419fe690053b76658d49565c57ac654faf2eaa)\n(cherry picked from commit 3a30e7aa4487f56a74f12c12f11cece6ce1f2100)\n" }, { "commit": "320598f5aa231b6b26e69724ebd6a98179104f6d", "tree": "d00301537a8d322604d082fb3c0311a714a217cf", "parents": [ "1e8c073eb44476d16557bd30e902592f77f17400" ], "author": { "name": "Sunny Kapdi", "email": "sunnyk@codeaurora.org", "time": "Mon Jul 30 14:52:56 2012 -0700" }, "committer": { "name": "Sudhir Sharma", "email": "sudsha@codeaurora.org", "time": "Mon Nov 12 00:09:56 2012 -0800" }, "message": "bluetooth: LE conn whitelist implementation\n\nAdd support to create connection to LE devices using\nwhitelist. With this, the Controller can try to connect\nto multiple devices at the same time. The following\ninterfaces are added.\n1. Add/Remove device from whitelist\n2. Clear all the devices from whitelist\n3. Create Connection to devices from whitelist\n4. Cancel create connection to whitelist devices\n\nCRs-fixed: 388980\nChange-Id: I3900c71255e754f80bb2873ae19a41b94cca76c3\nSigned-off-by: Sunny Kapdi \u003csunnyk@codeaurora.org\u003e\n(cherry picked from commit 93bef895b01b79f49af60ba1394c9c3f6e563212)\n(cherry picked from commit 377ee2bf1fc37bcbeae872661646bdd6a5f8da31)\n" }, { "commit": "e7faef7e356681424574679ca560cf4c6e4d0fcc", "tree": "69a613c250696176d16557dd04c96ab875728e2a", "parents": [ "853ecb2d7db55d28b3d2d89fbdf2d704fe82f5c1" ], "author": { "name": "Srinivas Krovvidi", "email": "skrovvid@codeaurora.org", "time": "Thu Aug 23 23:23:44 2012 +0530" }, "committer": { "name": "Gerrit - the friendly Code Review server", "email": "code-review@localhost", "time": "Tue Nov 06 15:23:09 2012 -0800" }, "message": "Bluetooth: Disabled the MULTICAST_ADDR_SET feature for BNEP.\n\nFound there are some IOT issues when this command is sent from\nDUT. This command is only a dummy implementation. As this doesn\u0027t\nhave any impact on functionality, disabled the feature.\n\nChange-Id: Ib435ac17df9d0377bd0b41fdc33b68c738eeaccc\nCRs-Fixed: 390090\nSigned-off-by: Srinivas Krovvidi \u003cskrovvid@codeaurora.org\u003e\n(cherry picked from commit ed37c51ddc9b1514f5e5bfec1ae4763a85e2faad)\n" }, { "commit": "473188b7bef1b1f20e8c61a3e6e18cd3d9c49503", "tree": "28603f70a3620f4d65c1ba6fb780b8df509336c8", "parents": [ "17a947e3bbf09a3244b03819e3f754ebf56112a5" ], "author": { "name": "Archana Ramachandran", "email": "archanar@codeaurora.org", "time": "Wed Aug 22 11:46:03 2012 -0700" }, "committer": { "name": "Gerrit - the friendly Code Review server", "email": "code-review@localhost", "time": "Tue Nov 06 14:54:44 2012 -0800" }, "message": "Bluetooth: Fix for supervision timeout must be 6X connection interval\n\nAdded a new function to verify whether the LE Connection Update\nparameters are valid instaed of verifying all the LE Connection\nparameters since only update parameters are set in the Connection\nUpdate Request.\n\nCRs-Fixed: 387146\nChange-Id: I9fe6b51e44e2793f3945613fdfde3a039804746f\nSigned-off-by: Archana Ramachandran \u003carchanar@codeaurora.org\u003e\n(cherry picked from commit 95319af0612d58788279748f586cc57221c3443e)\n" }, { "commit": "b2f194ddc27489c5f704c959e08c9a4ff4bf6aa0", "tree": "036d29edee2395e5ce5353234f47816463c932d8", "parents": [ "ce73c377e414fca2812e53374ee363120ba2b0fa" ], "author": { "name": "Archana Ramachandran", "email": "archanar@codeaurora.org", "time": "Tue Aug 14 12:03:01 2012 -0700" }, "committer": { "name": "Gerrit - the friendly Code Review server", "email": "code-review@localhost", "time": "Tue Nov 06 14:27:24 2012 -0800" }, "message": "Bluetooth: Send Disconnection reason to Bluez\n\nSend device disconnection reason to bluez on receiving the\ndiconnection complete event so that low energy profiles\nsuch as proximity can decide to reconnect if the reason\nis link loss.\n\nCRs-Fixed: 378240\nSigned-off-by: Archana Ramachandran \u003carchanar@codeaurora.org\u003e\n(cherry picked from commit da09d26a75ee1c7c1911dcfbe0128fd09f6631f4)\n\nChange-Id: Iab1fede47f44342d87be6c3c5aa7590754fd950c\nSigned-off-by: Sudhir Sharma \u003csudsha@codeaurora.org\u003e\n" }, { "commit": "231689b3f454b0e6747928f25b144fae5c62999b", "tree": "209d8f42af85c9c1da261285017f8bb099a2a7d9", "parents": [ "df2d84d692a80d43462f3c6d57e484f61860f8ab" ], "author": { "name": "Srinivas Krovvidi", "email": "skrovvid@codeaurora.org", "time": "Mon Sep 03 18:47:50 2012 +0530" }, "committer": { "name": "Sudhir Sharma", "email": "sudsha@codeaurora.org", "time": "Wed Oct 31 12:14:26 2012 -0700" }, "message": "Bluetooth: Validate hci conn validity before refering wakelock.\n\nFound in a rare case there is possibility that remote device\nsent disconnect on a connection and DUT is trying send data\non the same. In that case accessing some released wakelock\nis causing issue. The current changes are to use locking\nmechanism to validate the connection before acting on the\nwake lock.\n\nCRs-Fixed: 394651\nChange-Id: I6a4188a7d0d05a8cfbe66d3680473d549157917a\nSigned-off-by: Srinivas Krovvidi \u003cskrovvid@codeaurora.org\u003e\n(cherry picked from commit 6aadc41fcbd28dc3899a4b5d098e5f316588a029)\n\nSigned-off-by: Sudhir Sharma \u003csudsha@codeaurora.org\u003e\n" }, { "commit": "57fb9a36f9557b08cb15f1d4849d806bf8a4084e", "tree": "869bcaf2a0c6920a5e3548cdda8ea3ba19d33fd5", "parents": [ "92cba6411c70d320682bd2c611776eff158dd1cd" ], "author": { "name": "Srinivas Krovvidi", "email": "skrovvid@codeaurora.org", "time": "Thu Aug 02 13:23:53 2012 +0530" }, "committer": { "name": "Sudhir Sharma", "email": "sudsha@codeaurora.org", "time": "Wed Oct 31 12:13:01 2012 -0700" }, "message": "Bluetooth: Check for both SCO and ESCO types in hci_connect API.\n\nIn hci_connect API there is check for existing link, before\nconnect operation in order to avoid queuing connect if connection\nalready exist. This check for Synchronous connections is not\nvalidating for ESCO and SCO connection types which are possible\nsynchronous connections.The current change takes care of verifying\nboth before proceeding to add a new connection.\n\nChange-Id: I9018e0938bcd222bb6d80944e1b113e07227b066\nSigned-off-by: Srinivas Krovvidi \u003cskrovvid@codeaurora.org\u003e\n(cherry picked from commit 645f4d465ba131c87a99fdebcef5e597181b33c8)\n\nSigned-off-by: Sudhir Sharma \u003csudsha@codeaurora.org\u003e\n" }, { "commit": "bc187e305cb785d41156979ec342e9c707583557", "tree": "32fe9ceb8da5ebe6d2d9808eb8d2babffca205d6", "parents": [ "6010652aeaa0f03104ea317571e19f31f72e5c72" ], "author": { "name": "Devin Kim", "email": "dojip.kim@lge.com", "time": "Mon Sep 17 21:16:02 2012 -0700" }, "committer": { "name": "Android Partner Code Review", "email": "android-gerrit-partner@google.com", "time": "Mon Sep 17 21:58:07 2012 -0700" }, "message": "netlink: fix possible spoofing from non-root processes\n\nNon-root user-space processes can send Netlink messages to other\nprocesses that are well-known for being subscribed to Netlink\nasynchronous notifications. This allows ilegitimate non-root\nprocess to send forged messages to Netlink subscribers.\n\nThe userspace process usually verifies the legitimate origin in\ntwo ways:\n\na) Socket credentials. If UID !\u003d 0, then the message comes from\n some ilegitimate process and the message needs to be dropped.\n\nb) Netlink portID. In general, portID \u003d\u003d 0 means that the origin\n of the messages comes from the kernel. Thus, discarding any\n message not coming from the kernel.\n\nHowever, ctnetlink sets the portID in event messages that has\nbeen triggered by some user-space process, eg. conntrack utility.\nSo other processes subscribed to ctnetlink events, eg. conntrackd,\nknow that the event was triggered by some user-space action.\n\nNeither of the two ways to discard ilegitimate messages coming\nfrom non-root processes can help for ctnetlink.\n\nThis patch adds capability validation in case that dst_pid is set\nin netlink_sendmsg(). This approach is aggressive since existing\napplications using any Netlink bus to deliver messages between\ntwo user-space processes will break. Note that the exception is\nNETLINK_USERSOCK, since it is reserved for netlink-to-netlink\nuserspace communication.\n\nStill, if anyone wants that his Netlink bus allows netlink-to-netlink\nuserspace, then they can set NL_NONROOT_SEND. However, by default,\nI don\u0027t think it makes sense to allow to use NETLINK_ROUTE to\ncommunicate two processes that are sending no matter what information\nthat is not related to link/neighbouring/routing. They should be using\nNETLINK_USERSOCK instead for that.\n\nChange-Id: Ib1c38cb798391b51dedddf62a862346d36119ec7\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6010652aeaa0f03104ea317571e19f31f72e5c72", "tree": "3e464b33d8342024ebb9981871bc33110c7ed7fa", "parents": [ "4bdc71fbb55f944f659942916737c097304afb77" ], "author": { "name": "Devin Kim", "email": "dojip.kim@lge.com", "time": "Mon Sep 17 21:15:32 2012 -0700" }, "committer": { "name": "Android Partner Code Review", "email": "android-gerrit-partner@google.com", "time": "Mon Sep 17 21:57:27 2012 -0700" }, "message": "af_netlink: force credentials passing [CVE-2012-3520]\n\nPablo Neira Ayuso discovered that avahi and\npotentially NetworkManager accept spoofed Netlink messages because of a\nkernel bug. The kernel passes all-zero SCM_CREDENTIALS ancillary data\nto the receiver if the sender did not provide such data, instead of not\nincluding any such data at all or including the correct data from the\npeer (as it is the case with AF_UNIX).\n\nThis bug was introduced in commit 16e572626961\n(af_unix: dont send SCM_CREDENTIALS by default)\n\nThis patch forces passing credentials for netlink, as\nbefore the regression.\n\nAnother fix would be to not add SCM_CREDENTIALS in\nnetlink messages if not provided by the sender, but it\nmight break some programs.\n\nWith help from Florian Weimer \u0026 Petr Matousek\n\nThis issue is designated as CVE-2012-3520\n\nChange-Id: Id4f36301d407ef5c8218c5ef9f66d299766cdf57\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Petr Matousek \u003cpmatouse@redhat.com\u003e\nCc: Florian Weimer \u003cfweimer@redhat.com\u003e\nCc: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ae20a9797cf84886f89022bdfa6de179e718fb26", "tree": "ca82568068de53d1d0be4b8cf5a7c8209cabf1e4", "parents": [ "6f3449df335ac10f0728c6c52a193dd83d2f9ef9", "f799996e309cad545b3a7f84ef6f333a09c8b876" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Fri Aug 10 16:44:10 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Fri Aug 10 16:44:10 2012 -0700" }, "message": "Merge \"Bluetooth: Block SCO disconnect operation on BT_CLOSED state.\" into msm-3.4" }, { "commit": "f245aa91c9dfaac82bac4c2ce8edb152581c1ec5", "tree": "90d4926fe9479b323d207d0a51ee4c0f086d20f4", "parents": [ "85c17a6f01c69bac066b03ef0ad67fd41a05a300", "27e77d2bda65c96815cb5f785df9ffd7bd733e6a" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Fri Aug 10 16:44:03 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Fri Aug 10 16:44:03 2012 -0700" }, "message": "Merge \"Bluetooth: hidp: use dest address from session info\" into msm-3.4" }, { "commit": "958533c044cd46fb737c548776aa497c21cc8623", "tree": "45e51fdc1bff6e0a9a69e1edcb018e1ac8b19434", "parents": [ "ea9ca88b7d4d291b309764729aa1018edfd3683b", "2e02b861173406a1287a53ca7b836a4ad5fd4255" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Fri Aug 10 12:03:56 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Fri Aug 10 12:03:56 2012 -0700" }, "message": "Merge \"Bluetooth: fix shutdown on SCO sockets\" into msm-3.4" }, { "commit": "ea9ca88b7d4d291b309764729aa1018edfd3683b", "tree": "cd9fc2167f9b4523fe41f3f7fe417f5ba88e2ba8", "parents": [ "f8791efb40ea49cf4cb98e52804e2a5de08c01fe", "a7c3d7e6d905bab198003f16316971ae872eec9f" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Fri Aug 10 12:03:54 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Fri Aug 10 12:03:54 2012 -0700" }, "message": "Merge \"Bluetooth: Disable sniff when the subrate values doesnt match.\" into msm-3.4" }, { "commit": "f799996e309cad545b3a7f84ef6f333a09c8b876", "tree": "e3c3f6434be96ba817652239a811122d62427ee5", "parents": [ "2e02b861173406a1287a53ca7b836a4ad5fd4255" ], "author": { "name": "Srinivas Krovvidi", "email": "skrovvid@codeaurora.org", "time": "Wed Aug 01 18:21:37 2012 +0530" }, "committer": { "name": "Srinivas Krovvidi", "email": "skrovvid@codeaurora.org", "time": "Fri Aug 10 21:18:18 2012 +0530" }, "message": "Bluetooth: Block SCO disconnect operation on BT_CLOSED state.\n\nHave maximum blocking time for shutdown operation as DISCONNECT_TIMEOUT.\nDuring this period when SCO connection closes, the userspace will be\nupdated on the close operation. Existing approach of immidiate return\non shutdown call can cause synchronization issues on SCO state between\nkernel and userspace. This happens when disconnect operation takes\nmore time at kernel space.\n\nChange-Id: Id9e6a61c2c3d4ba2cf6da574fc49bc6894a8f96a\nSigned-off-by: Srinivas Krovvidi \u003cskrovvid@codeaurora.org\u003e\n" }, { "commit": "2e02b861173406a1287a53ca7b836a4ad5fd4255", "tree": "4057691e3104e3ba7886983c4086bb47fe892c8b", "parents": [ "57ae1495163cf9ed66285c654bc9b6801c9b3a6f" ], "author": { "name": "Luiz Augusto von Dentz", "email": "luiz.dentz-von@nokia.com", "time": "Thu May 12 11:13:15 2011 +0300" }, "committer": { "name": "Srinivas Krovvidi", "email": "skrovvid@codeaurora.org", "time": "Fri Aug 10 15:38:39 2012 +0530" }, "message": "Bluetooth: fix shutdown on SCO sockets\n\nshutdown should wait for SCO link to be properly disconnected before\ndetroying the socket, otherwise an application using the socket may\nassume link is properly disconnected before it really happens which\ncan be a problem when e.g synchronizing profile switch.\n\nChange-Id: Ifc59bfd90c264d9c742ce254161a21518108c3cb\nSigned-off-by: Luiz Augusto von Dentz \u003cluiz.dentz-von@nokia.com\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\nSigned-off-by: Srinivas Krovvidi \u003cskrovvid@codeaurora.org\u003e\n" }, { "commit": "27e77d2bda65c96815cb5f785df9ffd7bd733e6a", "tree": "9f45774fbff4fe23090cd398b0b7c38f7603c32b", "parents": [ "6e466fb23144cf38b57f81672bfd752d995c095b" ], "author": { "name": "Ram Mohan Korukonda", "email": "rkorukon@codeaurora.org", "time": "Thu Aug 09 22:27:01 2012 +0530" }, "committer": { "name": "Ram Mohan Korukonda", "email": "rkorukon@codeaurora.org", "time": "Fri Aug 10 14:32:52 2012 +0530" }, "message": "Bluetooth: hidp: use dest address from session info\n\nWhile hid device unpair process, we are trying to access released\nsocket as apart of getting hci device which results a kernel panic.\n\nCRs-fixed: 387164\nChange-Id: I1f3f3f92cfd1d3b39793bc5a142001d5e26d76c4\nSigned-off-by: Ram Mohan Korukonda \u003crkorukon@codeaurora.org\u003e\n" }, { "commit": "9dd35921db523c976e79d7909c2fd320c78a4a21", "tree": "850a6f1fef6f7b1632ff528e094ce9afc9634f8c", "parents": [ "57ae1495163cf9ed66285c654bc9b6801c9b3a6f" ], "author": { "name": "Srinivas Krovvidi", "email": "skrovvid@codeaurora.org", "time": "Thu Jul 26 15:10:28 2012 +0530" }, "committer": { "name": "Srinivas Krovvidi", "email": "skrovvid@codeaurora.org", "time": "Wed Aug 08 21:24:26 2012 +0530" }, "message": "Bluetooth: Adding HCI Dev lock for set_active and set_sniff routines.\n\nWhen data transfer is in progress on a ACL connection, all the time\nthe set_active_mode API will be called to update the timer for next\nsniff mode. If there is ACL disconnect triggered from remote side,\nthere is possibility of hci connection delete when set_active\nroutine in progress. Found a condition where delete API destroyed\nthe wake lock, which is used in set_active API. In codition leads\nto crash in set_wakelock API. The current change is to lock hdev,\nbefore set_active and set_sniff APIs are called. This avoids the\nrace condition in accessing hci connection, while delete in progress\nand vice versa.\n\nCRs-Fixed: 383490\nChange-Id: I625ebb8c8f09ddf2afcd300d20ab3bf8e164b485\nSigned-off-by: Srinivas Krovvidi \u003cskrovvid@codeaurora.org\u003e\n" }, { "commit": "a7c3d7e6d905bab198003f16316971ae872eec9f", "tree": "cd19d716e0a3925ac2b463a79d66a59effa4ed75", "parents": [ "1fc0ace387dc7428d4e491771468f00c3b2ac4e3" ], "author": { "name": "Srinivas Krovvidi", "email": "skrovvid@codeaurora.org", "time": "Mon Aug 06 15:31:55 2012 +0530" }, "committer": { "name": "Srinivas Krovvidi", "email": "skrovvid@codeaurora.org", "time": "Mon Aug 06 15:39:22 2012 +0530" }, "message": "Bluetooth: Disable sniff when the subrate values doesnt match.\n\nFound there is possibility of sniff subrate collision with some\nIOT devices. When this collision happned if the remote device\nsend subrate values that doesn\u0027t match with DUT supported\nvalues exit sniff mode. This will allow DUT to reconfigure\nsniff after idle time.\n\nCRs-Fixed: 380811\nChange-Id: Ie9502a48411635fbea73f935f99ea4f444556b41\nSigned-off-by: Srinivas Krovvidi \u003cskrovvid@codeaurora.org\u003e\n" }, { "commit": "77c84eb0b171670fe1b625510d3b92671f779236", "tree": "9aacfe4a7c521dbe73862d8dd4893c64dd5a6977", "parents": [ "0a822d7479511638c9be91b584c79b973aefdca6", "835e8e82a32e888f91b087928135c282546ccbd5" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Fri Aug 03 21:55:05 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Fri Aug 03 21:55:05 2012 -0700" }, "message": "Merge \"net: sched: Schedule PRIO qdisc when flow control released\" into msm-3.4" }, { "commit": "4d9199e25ce829f93ec51b0597375dd04d194936", "tree": "98f3dbde22e443194d6bb94a09e42db2bb2a5faf", "parents": [ "591cbb40f87f95f921d14fe3b50693aa7b6ef511", "059f5ba91071172970d8db0a1a954c57c23e53d8" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Wed Aug 01 06:30:42 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Wed Aug 01 06:30:42 2012 -0700" }, "message": "Merge \"bluetooth: Check for hcon during during sock_close\" into msm-3.4" }, { "commit": "591cbb40f87f95f921d14fe3b50693aa7b6ef511", "tree": "a0dffabcf5946ed02c69c9b8c708301221ef2f1f", "parents": [ "d43701be7a56aa4d012dbc942d6ab089d3ffd42a", "ff724cc3a2f52f1190b28c56b28bdb16e6613ad4" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Wed Aug 01 06:30:41 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Wed Aug 01 06:30:41 2012 -0700" }, "message": "Merge \"Bluetooth: Validate session before rfcomm_session_del\" into msm-3.4" }, { "commit": "059f5ba91071172970d8db0a1a954c57c23e53d8", "tree": "76d039a8ff022f3dff005f23db98c98aa81992a1", "parents": [ "3ae134c2e35ae687a574d51ced6525eb952c5369" ], "author": { "name": "Sunny Kapdi", "email": "sunnyk@codeaurora.org", "time": "Fri Jul 27 16:19:43 2012 -0700" }, "committer": { "name": "Sunny Kapdi", "email": "sunnyk@codeaurora.org", "time": "Tue Jul 31 15:03:09 2012 -0700" }, "message": "bluetooth: Check for hcon during during sock_close\n\nIt is possible that during BT OFF operation the hcon\ncould be released from a tasklet context while we are\ntrying to send the l2cap disconnect req. Make sure\nthat hcon is valid before dereferencing it during\nl2cap disconnect req.\n\nCRs-fixed: 383345\nChange-Id: Icb12c62560013b5ebb047c1c5d4bfe04b3a793ef\nSigned-off-by: Sunny Kapdi \u003csunnyk@codeaurora.org\u003e\n" }, { "commit": "672dff3200048220d3fada7050380db5f636420c", "tree": "4d68b3b6c18bfcc7d2e458a48c3e40b87cc53702", "parents": [ "54c62d1a55cd918cc15b7d35c6d6faa402c78430" ], "author": { "name": "Srinivas Krovvidi", "email": "skrovvid@codeaurora.org", "time": "Fri Jun 29 19:37:45 2012 +0530" }, "committer": { "name": "Srinivas Krovvidi", "email": "skrovvid@codeaurora.org", "time": "Mon Jul 30 12:48:56 2012 +0530" }, "message": "Bluetooth: Handle ACL buffers sharing between multiple connections.\n\nThe BT host has fixed set of buffers to send data to SoC, generic value\nis 5. When a connection, like A2DP playback is ready to send data it\nfills one of the buffer available and sends to SoC. Once SoC got\nacknowledged from remote side that the data received it updates the host\nand the buffer is freed. Till host is acknowledged the send Complete\ninfo, the data buffer is locked for that data transfer. The below is the\nexample for buffers availability.\n\nTotal free Buffers count : 5\n\nConnections : 1\n\nConn_1 need to send data, picks buf_1 and send to SoC\n\nfree Buffers count: 4\n\nBuffers used by Conn_1 : 1\n\nStill Conn_1 has more data to send ....\n\nfree Buffers count: 3\n\nBuffers used by Conn_1 : 2\n\nRemote device Ack for buf_1, so 1 buffer is freed, updated state is\n\nfree Buffers count : 4\n\nBuffers used by Conn_1 : 1\n\nWhen there are more ACL connections to transfer data, like one\nconnection for A2DP playback and one for OPP data transfer, all the data\nbuffers available with host can be used by any ACL which has ready data\nto send. This allows maximum throughputs possibility from host. But the\nexisting solution has a problem. If one connection has used all the\nbuffers at a instanace of time, and didnt release (this happens when remote\ndevice doesnt ACK to send) the other connections will not have buffers to\nsend. In current usecase A2dp data cannot be sent to headset as OPP\nconnection is lost. The current change is, when there are more\nconnections the quota for a connection that it can use maximum is\ntotal buffers-1. This allows other connections not to get blocked,\n at the same time through puts are not going to dropped.\n\nCRs-Fixed: 370497\nChange-Id: Iac34f0a223555de80d1daebde34c7fc87668c0d5\nSigned-off-by: Srinivas Krovvidi \u003cskrovvid@codeaurora.org\u003e\n" }, { "commit": "ff724cc3a2f52f1190b28c56b28bdb16e6613ad4", "tree": "c44bd731957ab77feaaf29fff97a8bd536e48aee", "parents": [ "38d153bb8f5dfcbbfb8b4b14ce92b2050f24d7c9" ], "author": { "name": "Srinivas Krovvidi", "email": "skrovvid@codeaurora.org", "time": "Fri Jul 27 11:04:05 2012 +0530" }, "committer": { "name": "Srinivas Krovvidi", "email": "skrovvid@codeaurora.org", "time": "Sat Jul 28 10:50:59 2012 +0530" }, "message": "Bluetooth: Validate session before rfcomm_session_del\n\nIn rfcomm_session_put API the session count is decremented\nand when it is equal to zero rfcomm_session_del is called\nwhere session is removed from sessions list and freed. The\ncurrent change is verify the existance of session in list\nbefore acting session. The avoids the possibility of action\non a deleted session, which causes crash.\n\nCRs-Fixed: 383000\nChange-Id: Ia55607b08ee388465494f08bbe1627102d281f8a\nSigned-off-by: Srinivas Krovvidi \u003cskrovvid@codeaurora.org\u003e\n" }, { "commit": "e392f2642f292d7a8935038ec95c8f914292fb10", "tree": "12f6c445055d3211d6620a0432d3333b0a9df4e2", "parents": [ "fc1eebdd04a54ca32d438becb2c8a60dc9ed1a82", "39eaba3542ab177a997762e81963392260f904ca" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Thu Jul 26 21:09:18 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Thu Jul 26 21:09:18 2012 -0700" }, "message": "Merge \"Bluetooth: Avoid putting LE Conn into sniff/active\" into msm-3.4" }, { "commit": "39eaba3542ab177a997762e81963392260f904ca", "tree": "d78d39879b2828b200265b99d1b13702f5c5ad5c", "parents": [ "0aa979798d897bd71d03a07f8c97daafa2937ae9" ], "author": { "name": "Sunny Kapdi", "email": "sunnyk@codeaurora.org", "time": "Sun Jul 22 21:29:38 2012 -0700" }, "committer": { "name": "Sunny Kapdi", "email": "sunnyk@codeaurora.org", "time": "Tue Jul 24 15:03:10 2012 -0700" }, "message": "Bluetooth: Avoid putting LE Conn into sniff/active\n\nLE connections don\u0027t have sniff/active connection\nmode, unlike BR/EDR. Make sure that the link which\nhas been requested to enter sniff/active mode is not\nan LE connection.\n\nCRs-fixed: 376972\nChange-Id: Iec4714d1c2ea7621267f9064b7046eb9d5ff9462\nSigned-off-by: Sunny Kapdi \u003csunnyk@codeaurora.org\u003e\n" }, { "commit": "a42b50244cdb71f93bf842a28b0fc1cecc622c55", "tree": "eccf8e699b563aab729f89a0deecb0a0d444a5c1", "parents": [ "e2e178fa0c3429b305820932493e365d65342b31" ], "author": { "name": "Sunny Kapdi", "email": "sunnyk@codeaurora.org", "time": "Thu Jul 05 22:48:31 2012 -0700" }, "committer": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Tue Jul 24 02:05:06 2012 -0600" }, "message": "bluetooth: Add support for LE conn param\n\nAdded support to let the userspace know about the updated\nLE connection parameters. On receiving successful connection\ncomplete and connection parameters update event from the BT\nController, send a mgmt event to the userspace bluetoothd.\n\nCRs-fixed: 380271\nChange-Id: If8c3d785188e0d4f38c7431d01c016f399137408\nSigned-off-by: Sunny Kapdi \u003csunnyk@codeaurora.org\u003e\n" }, { "commit": "835e8e82a32e888f91b087928135c282546ccbd5", "tree": "21c4c63815a4e145a1ce8f699a5c0487a06d9d22", "parents": [ "14a7ab7259980e15ead9940a3345f4b2abf45ca5" ], "author": { "name": "Tianyi Gou", "email": "tgou@codeaurora.org", "time": "Tue Jun 26 10:11:05 2012 -0600" }, "committer": { "name": "Tianyi Gou", "email": "tgou@codeaurora.org", "time": "Fri Jul 20 17:55:21 2012 -0700" }, "message": "net: sched: Schedule PRIO qdisc when flow control released\n\nThe PRIO qdisc supports flow control, such that packet\ndequeue can be disabled based on boolean flag \u0027enable_flow\u0027.\nWhen flow is re-enabled, the latency for new packets\narriving at network driver is high. To reduce the delay in\nscheduling packets, the qdisc will now invoke\n__netif_schedule() to expedite dequeue. This significantly\nreduces the latency of packets arriving at network driver.\n\nChange-Id: Ic5fe3faf86f177300d3018b9f60974ba3811641c\nCRs-Fixed: 355156\nAcked-by: Jimi Shah \u003cjimis@qualcomm.com\u003e\nSigned-off-by: Tianyi Gou \u003ctgou@codeaurora.org\u003e\n" }, { "commit": "923e3e66d32f7071fcf8eea87b073aa1966e4e9b", "tree": "719efcab5ef56a9243fcb2ba256523050fe24296", "parents": [ "08790720bd5cf0940dddda805eb5b2661e682f96" ], "author": { "name": "Subramanian Srinivasan", "email": "subrsrin@codeaurora.org", "time": "Fri Jul 06 18:50:37 2012 -0700" }, "committer": { "name": "Subramanian Srinivasan", "email": "subrsrin@codeaurora.org", "time": "Thu Jul 19 10:53:31 2012 -0700" }, "message": "Bluetooth: Prevents update of Low Energy connection parameters\n\nThe start encryption command fails when the LE update\nconnection parameters request is pending.\nHence, prevent the update of LE connection parameters during the\nbonding process. The update of connection parameters is\nnot necessary during bonding process.\n\nCRs-fixed: 380257\nChange-Id: I41cb3998fecc2297d61ec97d66ac35a0bd41ca80\nSigned-off-by: Subramanian Srinivasan \u003csubrsrin@codeaurora.org\u003e\n" }, { "commit": "b1eb45c8ab8cb63ae03d60191c7623ec2f63932c", "tree": "a2239bc88fce166f47eef93cdac903e5f733ad48", "parents": [ "3103f9d93b73085dbae31a70336e1d5817c7325c", "6f4ceb1f8588aec11b4d9380cd328d0008c8d167" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Sat Jul 14 08:59:56 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Sat Jul 14 08:59:56 2012 -0700" }, "message": "Merge \"Bluetooth : Ignore incomming events when the hci device is down\" into msm-3.4" }, { "commit": "6f4ceb1f8588aec11b4d9380cd328d0008c8d167", "tree": "a2eff65e72b309ef6e17018c2e6a635042c49289", "parents": [ "75c34ca1b4e69e96921e4153dfa9d399e5b9d2e8" ], "author": { "name": "Bhasker Neti", "email": "bneti@codeaurora.org", "time": "Tue Jun 26 16:48:18 2012 +0530" }, "committer": { "name": "Bhasker Neti", "email": "bneti@codeaurora.org", "time": "Mon Jul 09 22:25:59 2012 +0530" }, "message": "Bluetooth : Ignore incomming events when the hci device is down\n\nIn error conditions Adapter state machine via Bluez tries to reset\nthe hci device, during that in some rare scenario if some pending event\ncomes from riva, the command complete apis tries to access some already\nfreed memory in reset sequence.\n\nCRs-fixed: 369658\nChange-Id: I5e9ce0a4322d07a26602c7f74b1484720f6b4d75\nSigned-off-by: Bhasker Neti \u003cbneti@codeaurora.org\u003e\n" }, { "commit": "146f6bb531c3ab4354cd31dd42bf3570cd8c5a1c", "tree": "9103a0ba17c53281cd1003cdd7e888103361c908", "parents": [ "7e35862f20dd3d6865b5857ca3ee15febd46e47e", "f411769619b631aa0d9f7d460bcfec4ff3e6f54a" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Mon Jul 09 07:49:58 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Mon Jul 09 07:49:58 2012 -0700" }, "message": "Merge \"Bluetooth : hidp: Get the valid hci_conn while unlink\" into msm-3.4" }, { "commit": "f411769619b631aa0d9f7d460bcfec4ff3e6f54a", "tree": "d47a2879788dd267a9439b7c6629a0c6b03b2670", "parents": [ "a3014e6b78f5fb1d124ece7c3be54b880c71761e" ], "author": { "name": "Mallikarjuna GB", "email": "gbmalli@codeaurora.org", "time": "Tue Jun 19 18:22:44 2012 +0530" }, "committer": { "name": "Mallikarjuna GB", "email": "gbmalli@codeaurora.org", "time": "Fri Jul 06 13:48:55 2012 +0530" }, "message": "Bluetooth : hidp: Get the valid hci_conn while unlink\n\nSince the context where unlink will be called is unaware of\nvalidity of hci_conn pointer, fetch the valid hci_conn\nbefore unlink.\n\nCRs-fixed: 370274\nChange-Id: I30a35acdf75c9b4787af6629c7b32d2d31b8ad80\nSigned-off-by: Mallikarjuna GB \u003cgbmalli@codeaurora.org\u003e\n" }, { "commit": "0976074df4de122b042c82a6b9c4df1ea05f0eb6", "tree": "3c7350c429a0ca659e827cc216fe70643c8f8bda", "parents": [ "8ac67741a7be1d00797f3c3cfa448d6809493ee0" ], "author": { "name": "Bhasker Neti", "email": "bneti@codeaurora.org", "time": "Fri May 25 12:30:39 2012 +0530" }, "committer": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Fri Jul 06 00:36:12 2012 -0600" }, "message": "Bluetooth: Update the scan state with Inquiry commands in non-LE case\n\nUpdate the hdev scan state with Inquiry start/cancel commands in\nnon-LE case accordingly. And also there was no check to see the\nSCAN_BR mode before sending inquiry cancel.Added a check to see\nif the scan state is SCAN_BR,then send inquiry cancel\n\nChange-Id: I222f500fc20b991f4c3ec7eb1fc70bf20649f142\nSigned-off-by: Bhasker Neti \u003cbneti@codeaurora.org\u003e\nCRs-fixed: 359771\n" }, { "commit": "647b004ede4061d336536f68aece062d5c20b984", "tree": "90a2c33a724e10054f2ed7460083b6c7953ba449", "parents": [ "0c8c657bff4049b9f1d0729d6deeed625e9a70c7" ], "author": { "name": "Mallikarjuna GB", "email": "gbmalli@codeaurora.org", "time": "Fri Jun 22 11:57:29 2012 +0530" }, "committer": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Thu Jul 05 07:54:37 2012 -0600" }, "message": "Bluetooth: Store the MTU if configuration of other params fail\n\nStore the MTU to use the proper MTU requested by remote if the\nconfiguration fails for other options. If the remote does not\nsend the MTU in the next configuration request,\nwe need to use that value.\n\nCRs-fixed: 373233\nChange-Id: I35d9aa777f237bce5a4194036261128af1a7ada7\nSigned-off-by: Mallikarjuna GB \u003cgbmalli@codeaurora.org\u003e\n" }, { "commit": "3a2325989cadf80af74ad0f7b6067ab87468a9f3", "tree": "af1968e87063339a8befbb34c0ab75eccbe231ea", "parents": [ "748e710ed0fcb347e8c0b63607a20b8d951e5fa1", "58562d8177e97893c27d04a378867e714029e620" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Tue Jul 03 02:10:06 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Tue Jul 03 02:10:06 2012 -0700" }, "message": "Merge \"Bluetooth: Update Local COD to bluez userspace on write complete.\" into msm-3.4" }, { "commit": "bcdb7e7ed7c6bd659f172d3c19d340947aa84a4b", "tree": "26fc809cfc0a0e84df3407e5ed9df801be20dc32", "parents": [ "0679a81cb293699acf1f7cb30801ce11900b4420" ], "author": { "name": "Brian Gix", "email": "bgix@codeaurora.org", "time": "Tue Jun 05 13:35:39 2012 -0700" }, "committer": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Fri Jun 29 11:40:46 2012 -0600" }, "message": "Bluetooth: Fix ATT Indicate/Confirm handling\n\nIf due to timing issues out of our control, an outbound ATT Indicate\nis delayed to the point that user space code does not receive\nconfirmation within it time-out period, both Client and Server\nsockets must be torn down. We also must always respond to incoming\nATT Indicate pkt with a Confirmation, as the Error Response is an\nillegal response for Indicate.\n\nCRs-Fixed: 363355\nChange-Id: I4003a59e1a731a08818f18d5b79db537e2aa2619\nSigned-off-by: Brian Gix \u003cbgix@codeaurora.org\u003e\n" }, { "commit": "da31824a3b52bde102a0f3c4ac621c3487ea88e1", "tree": "57ffc985ebc14fbeeb4f44a66a959efb977f7121", "parents": [ "578a621707dac9772a1d7a4097d6bea229fe25dd" ], "author": { "name": "Mat Martineau", "email": "mathewm@codeaurora.org", "time": "Fri Jun 22 11:36:18 2012 -0700" }, "committer": { "name": "Mat Martineau", "email": "mathewm@codeaurora.org", "time": "Thu Jun 28 09:11:01 2012 -0700" }, "message": "Bluetooth: Use transmit window from config response for ack timing\n\nThis change addresses an L2CAP ERTM throughput problem when a remote\ndevice does not fully utilize the available transmit window.\n\nThe L2CAP ERTM transmit window size determines the maximum number of\nunacked frames that may be outstanding at any time. It is configured\nseparately for each direction of an ERTM connection. Each side sends a\nconfiguration request with a tx_win field indicating how many unacked\nframes it is capable of receiving before sending an ack. The\nconfiguration response\u0027s tx_win field shows how many frames the\ntransmitter will actually send before waiting for an ack.\n\nIt\u0027s important to trace both the actual transmit window (to check for\nvalidity of incoming frames) and the number of frames that the\ntransmitter will send before waiting (to send acks at the appropriate\ntime). Now there are separate tx_win and ack_win values. ack_win is\nupdated based on configuration responses, and is used to determine\nwhen acks are sent.\n\nCRs-fixed: 370909\nChange-Id: I6d9ef55a2ff2f5f3d0117ad376a09e4cc26fe742\nSigned-off-by: Mat Martineau \u003cmathewm@codeaurora.org\u003e\n" }, { "commit": "58562d8177e97893c27d04a378867e714029e620", "tree": "27c4c4d881915df3ccc3a007b9dd00aed1d4b6a6", "parents": [ "378288489d0b6cca782429154872a6dd070ae5e5" ], "author": { "name": "Srinivas Krovvidi", "email": "skrovvid@codeaurora.org", "time": "Mon Jun 25 16:46:56 2012 +0530" }, "committer": { "name": "Srinivas Krovvidi", "email": "skrovvid@codeaurora.org", "time": "Mon Jun 25 18:40:14 2012 +0530" }, "message": "Bluetooth: Update Local COD to bluez userspace on write complete.\n\nClass of device information is required to the bluez userspace\nto write to persistant storage and also update upper layers on\nrequest. So update the local CoD info to bluez once the hci write\nis successful.\n\nChange-Id: If45910d4b391616592b49d77d87ca0314be1f033\nSigned-off-by: Srinivas Krovvidi \u003cskrovvid@codeaurora.org\u003e\n" }, { "commit": "1505bfac7d136f7616caf083db4fb5ae27c89fee", "tree": "40516a6ff7c5ccc6d20ebe715c7eaa388e884cc1", "parents": [ "fa002621c590c56e13cd86e944919a5771a6e03e" ], "author": { "name": "Peter Krystad", "email": "pkrystad@codeaurora.org", "time": "Fri Jun 08 10:47:27 2012 -0700" }, "committer": { "name": "Peter Krystad", "email": "pkrystad@codeaurora.org", "time": "Fri Jun 08 10:47:27 2012 -0700" }, "message": "Bluetooth: AMP support enabled by module param, default disabled\n\nAMP feature is decommitted from Android PL\u0027s. Make advertising and\nsupport for the A2MP protocol depend on an L2CAP module parameter\nand make the default state disabled.\n\nChange-Id: Icb9827d2d4205818d6c3b49e7a53938666f769e8\nSigned-off-by: Peter Krystad \u003cpkrystad@codeaurora.org\u003e\n" }, { "commit": "f132c6cf77251e011e1dad0ec88c0b1fda16d5aa", "tree": "f04b469a3547a19b7bdbe110adc571eb71c93328", "parents": [ "23016defd7db701a01dc49f972ad6b1bae9651c2", "3f6240f3e4e2608caf1a70d614ada658cbcbe7be" ], "author": { "name": "Steve Muckle", "email": "smuckle@codeaurora.org", "time": "Wed Jun 06 18:30:57 2012 -0700" }, "committer": { "name": "Steve Muckle", "email": "smuckle@codeaurora.org", "time": "Wed Jun 06 18:45:28 2012 -0700" }, "message": "Merge commit \u0027AU_LINUX_ANDROID_ICS.04.00.04.00.126\u0027 into msm-3.4\n\nAU_LINUX_ANDROID_ICS.04.00.04.00.126 from msm-3.0.\nFirst parent is from google/android-3.4.\n\n* commit \u0027AU_LINUX_ANDROID_ICS.04.00.04.00.126\u0027: (8712 commits)\n PRNG: Device tree entry for qrng device.\n vidc:1080p: Set video core timeout value for Thumbnail mode\n msm: sps: improve the debugging support in SPS driver\n board-8064 msm: Overlap secure and non secure video firmware heaps.\n msm: clock: Add handoff ops for 7x30 and copper XO clocks\n msm_fb: display: Wait for external vsync before DTV IOMMU unmap\n msm: Fix ciruclar dependency in debug UART settings\n msm: gdsc: Add GDSC regulator driver for msm-copper\n defconfig: Enable Mobicore Driver.\n mobicore: Add mobicore driver.\n mobicore: rename variable to lower case.\n mobicore: rename folder.\n mobicore: add makefiles\n mobicore: initial import of kernel driver\n ASoC: msm: Add SLIMBUS_2_RX CPU DAI\n board-8064-gpio: Update FUNC for EPM SPI CS\n msm_fb: display: Remove chicken bit config during video playback\n mmc: msm_sdcc: enable the sanitize capability\n msm-fb: display: lm2 writeback support on mpq platfroms\n msm_fb: display: Disable LVDS phy \u0026 pll during panel off\n ...\n\nSigned-off-by: Steve Muckle \u003csmuckle@codeaurora.org\u003e\n" }, { "commit": "1924066da0be90a72a8060f2d39c5d9ed8a7590b", "tree": "292702af3ca80ecb42bfbb8bbc1f3bf31c604e89", "parents": [ "80fbef09164b4f7b3195a9ba91bdf80a1681ed4c", "45df0f99094aefc2564951495ab0005a18d62de3" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Tue Jun 05 07:05:46 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Tue Jun 05 07:05:46 2012 -0700" }, "message": "Merge \"Bluetooth: Initiate dedicated bonding if pin/key missing on remote device\" into msm-3.0" }, { "commit": "3096371e8e95db2a5e17aeba32295ba3559e1efd", "tree": "fd91828a314723552383c31e562b1ef0c29f1260", "parents": [ "700304c17a7687d48a65c2fef89d0c153e921708", "931bc4e2b45a3108cc8f57af06695bd5bfaacb53" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Fri Jun 01 05:13:43 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Fri Jun 01 05:13:43 2012 -0700" }, "message": "Merge \"Bluetooth: Fix mgmt response when adapter goes down or is removed\" into msm-3.0" }, { "commit": "931bc4e2b45a3108cc8f57af06695bd5bfaacb53", "tree": "cac3b22d86ae6112ee2ad26b76fb25ae2df4b451", "parents": [ "a3fe8df5d61bf52c971da8731ba536773c26c86d" ], "author": { "name": "Johan Hedberg", "email": "johan.hedberg@intel.com", "time": "Thu Nov 03 14:40:33 2011 +0200" }, "committer": { "name": "Bhasker Neti", "email": "bneti@codeaurora.org", "time": "Fri Jun 01 11:52:50 2012 +0530" }, "message": "Bluetooth: Fix mgmt response when adapter goes down or is removed\n\nWhen an adapter gets powered off or is removed any pending commands\nshould receive a ENETDOWN or ENODEV status response.\n\nChange-Id: I2fec5fa19b2349a48a6aafd5b33ef7946067f16b\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@intel.com\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\nSigned-off-by: Bhasker Neti \u003cbneti@codeaurora.org\u003e\nCRs-fixed: 364664\n[bneti@codeaurora.org: Resolved conflict]\n" }, { "commit": "d110434c0e8f1b32b276d98980fa0e9856e5fe04", "tree": "1f55e2089fb3b3af22ccc9366b84b06cec1f15d9", "parents": [ "19533230e8f3dcfb0e5b1addba5ea9901ac62dca", "6bba008fbead844722c5dc80b6c4dd59adc637c9" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Wed May 30 21:57:31 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Wed May 30 21:57:31 2012 -0700" }, "message": "Merge \"Bluetooth: Check for NULL pointer dereference\" into msm-3.0" }, { "commit": "45df0f99094aefc2564951495ab0005a18d62de3", "tree": "33b586e8c9e3f8b1d19d519a7b20b5da125e0ba1", "parents": [ "2cc13f08cde4f2bc54f671ef0d4f07a86112bbf2" ], "author": { "name": "Royston Rodrigues", "email": "roystonr@codeaurora.org", "time": "Wed May 30 10:26:42 2012 +0530" }, "committer": { "name": "Royston Rodrigues", "email": "roystonr@codeaurora.org", "time": "Thu May 31 09:09:02 2012 +0530" }, "message": "Bluetooth: Initiate dedicated bonding if pin/key missing on remote device\n\nIn case of 2.1 capable devices, when remote device had unpaired,\nsuccessive connect from the DUT was resulting in general bonding with\nautomatic accept allowed for numeric comparison\n(i.e. authentication_requirements \u003d 0x04). This lead to bad user\nexperience as user confirmation pop up wasn\u0027t notified on the DUT. Now\nits ensured that if remote device has unpaired then DUT would trigger\ndedicated bonding as part of the DUT intiated connect.\n\nCRs-fixed: 362572\nChange-Id: Id55f6cf3cc70621c29f583aa913fc08180e2d8f0\nSigned-off-by: Royston Rodrigues \u003croystonr@codeaurora.org\u003e\n" }, { "commit": "6bba008fbead844722c5dc80b6c4dd59adc637c9", "tree": "172984006a94c68e40f0ffc7ae9b46b30a4146fa", "parents": [ "ebdd79ed744d4ea5b32e555eb511ed3b7e6834db" ], "author": { "name": "Peter Krystad", "email": "pkrystad@codeaurora.org", "time": "Wed May 23 17:08:16 2012 -0700" }, "committer": { "name": "Peter Krystad", "email": "pkrystad@codeaurora.org", "time": "Tue May 29 09:01:55 2012 -0700" }, "message": "Bluetooth: Check for NULL pointer dereference\n\nThe fix in commit ff9718f8254b96dc313dd998c195c1c3769417ba was not\ncomplete. In l2cap_logical_link_complete the socket pointer was\ndereferenced in two places, the previous fix only handled one of\nthe locations.\n\nThis fixes an infrequent crash when performing OPP or FTP transfer\nover AMP (Bluetooth 3.0+HS).\n\nChange-Id: I730a503b143723ffff1765602151d66fe87103da\nCRs-fixed: 360758\nSigned-off-by: Peter Krystad \u003cpkrystad@codeaurora.org\u003e\n" }, { "commit": "5500e4fab219bf210f22d2334cc98f3ca8f8912d", "tree": "60f3edf480190ee60676348c1ca2730a699f8671", "parents": [ "903f6c716db3d4e26952aae9717f81dd5bc9e4ba", "76e10d158efb6d4516018846f60c2ab5501900bc" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri May 25 13:56:28 2012 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri May 25 13:56:28 2012 -0700" }, "message": "Merge commit \u0027v3.4\u0027 into android-3.4\n" }, { "commit": "b44f9e264c6c64eea22715bf3105fc01cb8ae687", "tree": "6544a77843f9b52598c0ec688dbe1c395f99e630", "parents": [ "fcef77c48a53b8b9cefa7346046c5b3816dffc79" ], "author": { "name": "Rahul Kashyap", "email": "rkashyap@codeaurora.org", "time": "Thu May 03 16:45:17 2012 +0530" }, "committer": { "name": "Rahul Kashyap", "email": "rkashyap@codeaurora.org", "time": "Thu May 24 11:38:05 2012 +0530" }, "message": "Bluetooth: Hold wakelock until BT idle timer kicks in.\n\nHolding a wakelock avoids suspend power collapse, which\nallow the BT idle timer to kick in, which eventually\ninitiates BT low power modes.\n\nCRs-Fixed: 361067\nChange-Id: I93e3950b6f854e70dbce092a5529120ec008c2b8\nSigned-off-by: Rahul Kashyap \u003crkashyap@codeaurora.org\u003e\n" }, { "commit": "d4b1133558e0d417342d5d2c49e4c35b428ff20d", "tree": "8d50b39901dbcd06d181ad505f7aff76ca9388d7", "parents": [ "42ea7d7f2a7356962022cdd124d9043c488ca5e2" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Thu May 17 23:52:26 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 18 13:54:33 2012 -0400" }, "message": "pktgen: fix module unload for good\n\ncommit c57b5468406 (pktgen: fix crash at module unload) did a very poor\njob with list primitives.\n\n1) list_splice() arguments were in the wrong order\n\n2) list_splice(list, head) has undefined behavior if head is not\ninitialized.\n\n3) We should use the list_splice_init() variant to clear pktgen_threads\nlist.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bad115cfe5b509043b684d3a007ab54b80090aa1", "tree": "f2da25538f8fcf48ae7a74b3b040d58628b52094", "parents": [ "1be5f0b7575e090fd100a98b303860879b5800de" ], "author": { "name": "Willy Tarreau", "email": "w@1wt.eu", "time": "Thu May 17 11:14:14 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 17 18:31:43 2012 -0400" }, "message": "tcp: do_tcp_sendpages() must try to push data out on oom conditions\n\nSince recent changes on TCP splicing (starting with commits 2f533844\n\"tcp: allow splice() to build full TSO packets\" and 35f9c09f \"tcp:\ntcp_sendpages() should call tcp_push() once\"), I started seeing\nmassive stalls when forwarding traffic between two sockets using\nsplice() when pipe buffers were larger than socket buffers.\n\nLatest changes (net: netdev_alloc_skb() use build_skb()) made the\nproblem even more apparent.\n\nThe reason seems to be that if do_tcp_sendpages() fails on out of memory\ncondition without being able to send at least one byte, tcp_push() is not\ncalled and the buffers cannot be flushed.\n\nAfter applying the attached patch, I cannot reproduce the stalls at all\nand the data rate it perfectly stable and steady under any condition\nwhich previously caused the problem to be permanent.\n\nThe issue seems to have been there since before the kernel migrated to\ngit, which makes me think that the stalls I occasionally experienced\nwith tux during stress-tests years ago were probably related to the\nsame issue.\n\nThis issue was first encountered on 3.0.31 and 3.2.17, so please backport\nto -stable.\n\nSigned-off-by: Willy Tarreau \u003cw@1wt.eu\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\n" }, { "commit": "26a5d3cc0b3d1ff23b5a94edb58226afe7f12a0c", "tree": "046834414e20d334fc5172275a53c55d9722a714", "parents": [ "769b0daf6e18a05a6d4da94baab7edd12867350c" ], "author": { "name": "Jozsef Kadlecsik", "email": "kadlec@blackhole.kfki.hu", "time": "Mon May 14 01:47:01 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 16 15:38:49 2012 -0400" }, "message": "netfilter: ipset: fix hash size checking in kernel\n\nThe hash size must fit both into u32 (jhash) and the max value of\nsize_t. The missing checking could lead to kernel crash, bug reported\nby Seblu.\n\nSigned-off-by: Jozsef Kadlecsik \u003ckadlec@blackhole.kfki.hu\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "60374631487a6dbf6b888729022f0e8d76eec8fb", "tree": "4adda0d1a8616ce586ea26a25717477c9e18667a", "parents": [ "8aa51d64c1f526e43b1e7f89fb8b98c2fd583f4b", "671267bf3aac3dae0555730b07ef29c042e325b2" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 15 16:38:00 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 15 16:38:00 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem\n" }, { "commit": "ec0b571c19ac62ab0bb80d373a3d4922a48b4b75", "tree": "10c597f5227c969c3f2b909fbeb29725a0c5c6e8", "parents": [ "7bb8b65407a519d3a90dd8cecdd1ccd10ee0c6cc", "36be50515fe2aef61533b516fa2576a2c7fe7664" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon May 14 16:41:02 2012 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon May 14 16:41:02 2012 -0700" }, "message": "Merge commit \u0027v3.4-rc7\u0027 into android-3.4\n" }, { "commit": "671267bf3aac3dae0555730b07ef29c042e325b2", "tree": "89ee980737493ce6247b3a454636e48bd488e1c7", "parents": [ "a7d7723ae7c0178d715c06c5621e8fd8014ba92f" ], "author": { "name": "Johan Hedberg", "email": "johan.hedberg@intel.com", "time": "Sat May 12 16:11:50 2012 -0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon May 14 13:56:15 2012 -0400" }, "message": "Bluetooth: mgmt: Fix device_connected sending order\n\nThe mgmt_ev_device_connected signal must be sent before any event\nindications happen for sockets associated with the connection. Otherwise\ne.g. device authorization for the sockets will fail with ENOTCONN as\nuser space things that there is no baseband link.\n\nThis patch fixes the issue by ensuring that the device_connected event\nif sent (if it hasn\u0027t been so already) as soon as the first ACL data\npacket arrives from the remote device.\n\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@intel.com\u003e\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "a7d7723ae7c0178d715c06c5621e8fd8014ba92f", "tree": "8e09cd37ed267e792481c2ad699bcaff9596e5e7", "parents": [ "574e02abaf816b582685805f0c1150ca9f1f18ee" ], "author": { "name": "Gustavo Padovan", "email": "gustavo@padovan.org", "time": "Sun May 13 03:20:07 2012 -0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon May 14 13:51:25 2012 -0400" }, "message": "Bluetooth: notify userspace of security level change\n\nIt fixes L2CAP socket based security level elevation during a\nconnection. The HID profile needs this (for keyboards) and it is the only\nway to achieve the security level elevation when using the management\ninterface to talk to the kernel (hence the management enabling patch\nbeing the one that exposes this issue).\n\nIt enables the userspace a security level change when the socket is\nalready connected and create a way to notify the socket the result of the\nrequest. At the moment of the request the socket is made non writable, if\nthe request fails the connections closes, otherwise the socket is made\nwritable again, POLL_OUT is emmited.\n\nSigned-off-by: Gustavo Padovan \u003cgustavo@padovan.org\u003e\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "8aa51d64c1f526e43b1e7f89fb8b98c2fd583f4b", "tree": "8444efa46bbd8dbe4e01655aaa719d8d5257928e", "parents": [ "b99215cdc6e191f5649687536d4fb0faa3d7f56e" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Sun May 13 08:44:18 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 13 15:47:34 2012 -0400" }, "message": "openvswitch: checking wrong variable in queue_userspace_packet()\n\n\"skb\" is non-NULL here, for example we dereference it in skb_clone().\nThe intent was to test \"nskb\" which was just set.\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nAcked-by: Jesse Gross \u003cjesse@nicira.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6329bf0a03811f4644a4c8d50bf241f6db6f19b5", "tree": "3b92221c0536e4cfc414a3ff36483de00a739e96", "parents": [ "2c653ad630abce4b447292fbfb20d48c2136a13d" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Feb 23 10:55:02 2012 +0000" }, "committer": { "name": "Jin Hong", "email": "jinh@codeaurora.org", "time": "Sat May 12 21:53:36 2012 -0700" }, "message": "ipsec: be careful of non existing mac headers\n\nNiccolo Belli reported ipsec crashes in case we handle a frame without\nmac header (atm in his case)\n\nBefore copying mac header, better make sure it is present.\n\nBugzilla reference: https://bugzilla.kernel.org/show_bug.cgi?id\u003d42809\n\nReported-by: Niccolò Belli \u003cdarkbasic@linuxsystems.it\u003e\nTested-by: Niccolò Belli \u003cdarkbasic@linuxsystems.it\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n\nCRs-Fixed: 344300\nChange-Id: Ic2d8f3f6b90233d6e87741373c33ef510b35aaa5\nSigned-off-by: Jin Hong \u003cjinh@codeaurora.org\u003e\n" }, { "commit": "4a873f53995cd551587ee4aad1e6f189a330ff36", "tree": "a1caacf532d6a32861399720ae2883396f443954", "parents": [ "2eb429671a4b83ea34a1a722a4656bb14ce7c971", "062e55e3960062fc2fb62a7274b4c253003eba73" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 12 12:57:01 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 12 12:57:01 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David S. Miller:\n\n 1) Since we do RCU lookups on ipv4 FIB entries, we have to test if the\n entry is dead before returning it to our caller.\n\n 2) openvswitch locking and packet validation fixes from Ansis Atteka,\n Jesse Gross, and Pravin B Shelar.\n\n 3) Fix PM resume locking in IGB driver, from Benjamin Poirier.\n\n 4) Fix VLAN header handling in vhost-net and macvtap, from Basil Gor.\n\n 5) Revert a bogus network namespace isolation change that was causing\n regressions on S390 networking devices.\n\n 6) If bonding decides to process and handle a LACPDU frame, we\n shouldn\u0027t bump the rx_dropped counter. From Jiri Bohac.\n\n 7) Fix mis-calculation of available TX space in r8169 driver when doing\n TSO, which can lead to crashes and/or hung device. From Julien\n Ducourthial.\n\n 8) SCTP does not validate cached routes properly in all cases, from\n Nicolas Dichtel.\n\n 9) Link status interrupt needs to be handled in ks8851 driver, from\n Stephen Boyd.\n\n10) Use capable(), not cap_raised(), in connector/userns netlink code.\n From Eric W. Biederman via Andrew Morton.\n\n11) Fix pktgen OOPS on module unload, from Eric Dumazet.\n\n12) iwlwifi under-estimates SKB truesizes, also from Eric Dumazet.\n\n13) Cure division by zero in SFC driver, from Ben Hutchings.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (26 commits)\n ks8851: Update link status during link change interrupt\n macvtap: restore vlan header on user read\n vhost-net: fix handle_rx buffer size\n bonding: don\u0027t increase rx_dropped after processing LACPDUs\n connector/userns: replace netlink uses of cap_raised() with capable()\n sctp: check cached dst before using it\n pktgen: fix crash at module unload\n Revert \"net: maintain namespace isolation between vlan and real device\"\n ehea: fix losing of NEQ events when one event occurred early\n igb: fix rtnl race in PM resume path\n ipv4: Do not use dead fib_info entries.\n r8169: fix unsigned int wraparound with TSO\n sfc: Fix division by zero when using one RX channel and no SR-IOV\n openvswitch: Validation of IPv6 set port action uses IPv4 header\n net: compare_ether_addr[_64bits]() has no ordering\n cdc_ether: Ignore bogus union descriptor for RNDIS devices\n bnx2x: bug fix when loading after SAN boot\n e1000: Silence sparse warnings by correcting type\n igb, ixgbe: netdev_tx_reset_queue incorrectly called from tx init path\n openvswitch: Release rtnl_lock if ovs_vport_cmd_build_info() failed.\n ...\n" }, { "commit": "e0268868ba064980488fc8c194db3d8e9fb2959c", "tree": "7b8bfb4cceb0a5d184a2fe651aab5aec59a216d3", "parents": [ "c57b54684060c8aced64a5b78ff69ff289af97b9" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Fri May 04 05:24:54 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 10 23:15:47 2012 -0400" }, "message": "sctp: check cached dst before using it\n\ndst_check() will take care of SA (and obsolete field), hence\nIPsec rekeying scenario is taken into account.\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nAcked-by: Vlad Yaseivch \u003cvyasevich@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c57b54684060c8aced64a5b78ff69ff289af97b9", "tree": "910e52b177da527183ddf4c29ccd90392b3039e3", "parents": [ "59b9997baba5242997ddc7bd96b1391f5275a5a4" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed May 09 13:29:51 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 10 23:10:24 2012 -0400" }, "message": "pktgen: fix crash at module unload\n\ncommit 7d3d43dab4e9 (net: In unregister_netdevice_notifier unregister\nthe netdevices.) makes pktgen crashing at module unload.\n\n[ 296.820578] BUG: spinlock bad magic on CPU#6, rmmod/3267\n[ 296.820719] lock: ffff880310c38000, .magic: ffff8803, .owner: \u003cnone\u003e/-1, .owner_cpu: -1\n[ 296.820943] Pid: 3267, comm: rmmod Not tainted 3.4.0-rc5+ #254\n[ 296.821079] Call Trace:\n[ 296.821211] [\u003cffffffff8168a715\u003e] spin_dump+0x8a/0x8f\n[ 296.821345] [\u003cffffffff8168a73b\u003e] spin_bug+0x21/0x26\n[ 296.821507] [\u003cffffffff812b4741\u003e] do_raw_spin_lock+0x131/0x140\n[ 296.821648] [\u003cffffffff8169188e\u003e] _raw_spin_lock+0x1e/0x20\n[ 296.821786] [\u003cffffffffa00cc0fd\u003e] __pktgen_NN_threads+0x4d/0x140 [pktgen]\n[ 296.821928] [\u003cffffffffa00ccf8d\u003e] pktgen_device_event+0x10d/0x1e0 [pktgen]\n[ 296.822073] [\u003cffffffff8154ed4f\u003e] unregister_netdevice_notifier+0x7f/0x100\n[ 296.822216] [\u003cffffffffa00d2a0b\u003e] pg_cleanup+0x48/0x73 [pktgen]\n[ 296.822357] [\u003cffffffff8109528e\u003e] sys_delete_module+0x17e/0x2a0\n[ 296.822502] [\u003cffffffff81699652\u003e] system_call_fastpath+0x16/0x1b\n\nHold the pktgen_thread_lock while splicing pktgen_threads, and test\npktgen_exiting in pktgen_device_event() to make unload faster.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "59b9997baba5242997ddc7bd96b1391f5275a5a4", "tree": "eaef6c0eff50403fcf871cdd4b7c4afa605f0541", "parents": [ "380ec964bc19f865af70c0339dff1cb75dc4f8f2" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 10 23:03:34 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 10 23:03:34 2012 -0400" }, "message": "Revert \"net: maintain namespace isolation between vlan and real device\"\n\nThis reverts commit 8a83a00b0735190384a348156837918271034144.\n\nIt causes regressions for S390 devices, because it does an\nunconditional DST drop on SKBs for vlans and the QETH device\nneeds the neighbour entry hung off the DST for certain things\non transmit.\n\nArnd can\u0027t remember exactly why he even needed this change.\n\nConflicts:\n\n\tdrivers/net/macvlan.c\n\tnet/8021q/vlan_dev.c\n\tnet/core/dev.c\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "dccd9ecc374462e5d6a5b8f8110415a86c2213d8", "tree": "92985101d752308885e7b29678dc9845eabea0d6", "parents": [ "0e0c55165b638e96c8d7097ea638aa368daa268a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 10 22:16:32 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 10 22:16:32 2012 -0400" }, "message": "ipv4: Do not use dead fib_info entries.\n\nDue to RCU lookups and RCU based release, fib_info objects can\nbe found during lookup which have fi-\u003efib_dead set.\n\nWe must ignore these entries, otherwise we risk dereferencing\nthe parts of the entry which are being torn down.\n\nReported-by: Yevgen Pronenko \u003cyevgen.pronenko@sonymobile.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bc46f9375a286d05f84a9464efc2b7f1f5614ff4", "tree": "8d7959826a254bbc51a5ad6d292d5d67d82dbacb", "parents": [ "ed3ac021e5038696fd38670e83219cea487f66be", "7bdf7415a6b8ec31f86b3ad3eaa241257ecb7c4c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 10 10:05:19 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 10 10:05:19 2012 -0700" }, "message": "Merge tag \u0027nfs-for-3.4-5\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs\n\nPull a NFS client bugfix from Trond Myklebust:\n \"Fix for the NFSv4 security negotiation: ensure that the security\n negotiation tries all registered security flavours\"\n\n* tag \u0027nfs-for-3.4-5\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs:\n auth_gss: the list of pseudoflavors not being parsed correctly\n" }, { "commit": "c5baa80ac879a3b38314f434c0a7255a2c2e4c86", "tree": "47b7f9e7ecedeacdcdcdbf89ac63b1d0093eebb6", "parents": [ "1c430a727fa512500a422ffe4712166c550ea06a", "072ae6314a191e3a9fc309b1e4e539ac7abc48ad" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 08 19:31:32 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 08 19:31:32 2012 -0400" }, "message": "Merge branch \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch\n" }, { "commit": "420a95f37b73ecfdd89cd63f83d3369dbc4cb2ab", "tree": "02e82e7f7fc9bbbcf497700ffa899fbdc67ac87c", "parents": [ "896976df01f561dbbebf47e781d7688a1d617cca" ], "author": { "name": "JP Abgrall", "email": "jpa@google.com", "time": "Fri Apr 27 12:57:39 2012 -0700" }, "committer": { "name": "Android Partner Code Review", "email": "android-gerrit-partner@google.com", "time": "Tue May 08 12:51:06 2012 -0700" }, "message": "netfilter: xt_qtaguid: start tracking iface rx/tx at low level\n\nqtaguid tracks the device stats by monitoring when it goes up and down,\nthen it gets the dev_stats().\nBut devs don\u0027t correctly report stats (either they don\u0027t count headers\nsymmetrically between rx/tx, or they count internal control messages).\n\nNow qtaguid counts the rx/tx bytes/packets during raw:prerouting and\nmangle:postrouting (nat is not available in ipv6).\n\nThe results are in\n /proc/net/xt_qtaguid/iface_stat_fmt\nwhich outputs a format line (bash expansion):\n ifname total_skb_{rx,tx}_{bytes,packets}\n\nAdded event counters for pre/post handling.\nAdded extra ctrl_*() pid/uid debugging.\n\nChange-Id: Id84345d544ad1dd5f63e3842cab229e71d339297\nSigned-off-by: JP Abgrall \u003cjpa@google.com\u003e\n" }, { "commit": "896976df01f561dbbebf47e781d7688a1d617cca", "tree": "9c70a2921d11ae0ae4760cf27775a6eca749dbe8", "parents": [ "f02fac63308349b1dbde468adfd084fdb560eeae" ], "author": { "name": "JP Abgrall", "email": "jpa@google.com", "time": "Thu Apr 26 23:28:35 2012 -0700" }, "committer": { "name": "Android Partner Code Review", "email": "android-gerrit-partner@google.com", "time": "Tue May 08 12:47:56 2012 -0700" }, "message": "netfilter: xt_IDLETIMER: Add new netlink msg type\n\nSend notifications when the label becomes active after an idle period.\nSend netlink message notifications in addition to sysfs notifications.\nUsing a uevent with\n subsystem\u003dxt_idletimer\n INTERFACE\u003d...\n STATE\u003d{active,inactive}\n\nThis is backport from common android-3.0\ncommit: beb914e987cbbd368988d2b94a6661cb907c4d5a\nwith uevent support instead of a new netlink message type.\n\nChange-Id: I31677ef00c94b5f82c8457e5bf9e5e584c23c523\nSigned-off-by: Ashish Sharma \u003cashishsharma@google.com\u003e\nSigned-off-by: JP Abgrall \u003cjpa@google.com\u003e\n" }, { "commit": "a40eb7eceb5f5dda093ba17bc0e14575f71f42d2", "tree": "495d13c1f4ca5d772b319af03a370a0654bc96a5", "parents": [ "abe3c9c88f9cd1cbc5d3a3eec4bdbba6e3ce2107" ], "author": { "name": "Peter Krystad", "email": "pkrystad@codeaurora.org", "time": "Fri May 04 11:24:59 2012 -0700" }, "committer": { "name": "Peter Krystad", "email": "pkrystad@codeaurora.org", "time": "Tue May 08 11:36:28 2012 -0700" }, "message": "Bluetooth: Remove holding lock when sending A2MP message\n\nRemove holding the AMP manger list lock when sending the\nA2MP Change Notify message, as this uses L2CAP and will\nlock the socket and possibly sleep.\n\nThis removes a potential deadlock and a \"BUG: sleeping\nfunction called from invalid context\" message from the\nkernel log.\n\nChange-Id: Icf8c5afc1a5cde36517bb979820c83a20ee207fd\nCRs-fixed: 358736\nSigned-off-by: Peter Krystad \u003cpkrystad@codeaurora.org\u003e\n" }, { "commit": "f02fac63308349b1dbde468adfd084fdb560eeae", "tree": "35c39e5c3c70e40c52bc18c07a88dd7a1becb649", "parents": [ "6ff6845be02be8d53da28d2333a015d54b1234db", "d48b97b403d23f6df0b990cee652bdf9a52337a3" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon May 07 18:20:34 2012 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon May 07 18:20:34 2012 -0700" }, "message": "Merge commit \u0027v3.4-rc6\u0027 into android-3.4\n\nConflicts:\n\tarch/arm/mm/cache-l2x0.c\n\tarch/arm/mm/mmu.c\n\nChange-Id: If4f371a21c052fa597d107c44b128a093e4a8b91\n" }, { "commit": "6ff6845be02be8d53da28d2333a015d54b1234db", "tree": "131773e3e59a0c51bea05c18dc14f5fcd90b300b", "parents": [ "53013da67892f1a0e303a938816be47e3a10b1b1" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Apr 17 13:00:43 2012 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon May 07 18:17:15 2012 -0700" }, "message": "Revert Bluetooth: Use the stored LTK for restabilishing security\n\nThis patch reverts commit b7d6cd72ce713a256406d47e798ea4797404d81e.\nThis patch was already applied upstream and then modified, then was\naccidentally applied again to the android-3.4 tree.\n\nChange-Id: I0c5a822f3f2a5b75564eeeb2598f13b7a149c58d\nReported-by: Andrey Konovalov \u003candrey.konovalov@linaro.org\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "072ae6314a191e3a9fc309b1e4e539ac7abc48ad", "tree": "d4bdf8e5c538cb1351f1cc462e65654646af7e8d", "parents": [ "4cb6e116bb97c8b87a1f4f95e99d0c8dda2a6e9b" ], "author": { "name": "Pravin B Shelar", "email": "pshelar@nicira.com", "time": "Mon May 07 17:21:53 2012 -0700" }, "committer": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Mon May 07 17:23:10 2012 -0700" }, "message": "openvswitch: Validation of IPv6 set port action uses IPv4 header\n\nWhen the kernel validates set TCP/UDP port actions, it looks at\nthe ports in the existing flow to make sure that the L4 header exists.\nHowever, these actions always use the IPv4 version of the struct.\nFollowing patch fixes this by checking for flow ip protocol first.\n\nSigned-off-by: Pravin B Shelar \u003cpshelar@nicira.com\u003e\nSigned-off-by: Jesse Gross \u003cjesse@nicira.com\u003e\n" }, { "commit": "332472cb6cc8d889547a25a80a0cffdbe047d7f4", "tree": "d2758e0a44d9c378c9e106215b2d95611efdf014", "parents": [ "dafd5a663dd1f23bb5c4aff2243b1d7e3934b412" ], "author": { "name": "Mat Martineau", "email": "mathewm@codeaurora.org", "time": "Mon May 07 09:52:04 2012 -0700" }, "committer": { "name": "Mat Martineau", "email": "mathewm@codeaurora.org", "time": "Mon May 07 10:05:28 2012 -0700" }, "message": "Bluetooth: Correctly configure L2CAP streaming mode header type\n\nIn order to support extended window sizes with L2CAP streaming mode,\nan extended window size option must be included in the outgoing\nconfiguration request when an application has requested a transmit\nwindow larger than the default transmit window.\n\nStreaming mode does not have a transmit window, so initialization of\nthe transmit window data structures was not taking place. However, the\ntransmit window socket option does trigger use of extended headers,\nwhich are required for full streaming mode support and\nqualification. Utilizing the existing transmit window initialization\ncode enables extended header use.\n\nCRs-fixed: 355437\nChange-Id: I7bf25b7a70bb2b68c0f5bfd42b2b46b99d68e990\nSigned-off-by: Mat Martineau \u003cmathewm@codeaurora.org\u003e\n" }, { "commit": "4cb6e116bb97c8b87a1f4f95e99d0c8dda2a6e9b", "tree": "071d9dfaa2cb307e0af570ae2455ce8deee9dbce", "parents": [ "bf32fecdc1851ad9ca960f56771b798d17c26cf1" ], "author": { "name": "Ansis Atteka", "email": "aatteka@nicira.com", "time": "Thu May 03 18:40:38 2012 -0700" }, "committer": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Thu May 03 18:40:38 2012 -0700" }, "message": "openvswitch: Release rtnl_lock if ovs_vport_cmd_build_info() failed.\n\nThis patch fixes a possible lock-up bug where rtnl_lock might not\nget released.\n\nSigned-off-by: Ansis Atteka \u003caatteka@nicira.com\u003e\nSigned-off-by: Jesse Gross \u003cjesse@nicira.com\u003e\n" }, { "commit": "c42f1d4b523950c4af060f8fc0c7016755d8a3bc", "tree": "8322c9c14b0c7055ce924d12c1150d2acb0ea95e", "parents": [ "913a90416918a591e6d5ece036b795c58a08131d", "5a8887d39e1ba5ee2d4ccb94b14d6f2dce5ddfca" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 03 17:10:39 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 03 17:10:39 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n\n 1) Transfer padding was wrong for full-speed USB in ASIX driver, fix\n from Ingo van Lil.\n\n 2) Propagate the negative packet offset fix into the PowerPC BPF JIT.\n From Jan Seiffert.\n\n 3) dl2k driver\u0027s private ioctls were letting unprivileged tasks make\n MII writes and other ugly bits like that. Fix from Jeff Mahoney.\n\n 4) Fix TX VLAN and RX packet drops in ucc_geth, from Joakim Tjernlund.\n\n 5) OOPS and network namespace fixes in IPVS from Hans Schillstrom and\n Julian Anastasov.\n\n 6) Fix races and sleeping in locked context bugs in drop_monitor, from\n Neil Horman.\n\n 7) Fix link status indication in smsc95xx driver, from Paolo Pisati.\n\n 8) Fix bridge netfilter OOPS, from Peter Huang.\n\n 9) L2TP sendmsg can return on error conditions with the socket lock\n held, oops. Fix from Sasha Levin.\n\n10) udp_diag should return meaningful values for socket memory usage,\n from Shan Wei.\n\n11) Eric Dumazet is so awesome he gets his own section:\n\n Socket memory cgroup code (I never should have applied those\n patches, grumble...) made erroneous changes to\n sk_sockets_allocated_read_positive(). It was changed to\n use percpu_counter_sum_positive (which requires BH disabling)\n instead of percpu_counter_read_positive (which does not).\n Revert back to avoid crashes and lockdep warnings.\n\n Adjust the default tcp_adv_win_scale and tcp_rmem[2] values\n to fix throughput regressions. This is necessary as a result\n of our more precise skb-\u003etruesize tracking.\n\n Fix SKB leak in netem packet scheduler.\n\n12) New device IDs for various bluetooth devices, from Manoj Iyer,\n AceLan Kao, and Steven Harms.\n\n13) Fix command completion race in ipw2200, from Stanislav Yakovlev.\n\n14) Fix rtlwifi oops on unload, from Larry Finger.\n\n15) Fix hard_mtu when adjusting hard_header_len in smsc95xx driver.\n From Stephane Fillod.\n\n16) ehea driver registers it\u0027s IRQ before all the necessary state is\n setup, resulting in crashes. Fix from Thadeu Lima de Souza\n Cascardo.\n\n17) Fix PHY connection failures in davinci_emac driver, from Anatolij\n Gustschin.\n\n18) Missing break; in switch statement in bluetooth\u0027s\n hci_cmd_complete_evt(). Fix from Szymon Janc.\n\n19) Fix queue programming in iwlwifi, from Johannes Berg.\n\n20) Interrupt throttling defaults not being actually programmed into the\n hardware, fix from Jeff Kirsher and Ying Cai.\n\n21) TLAN driver SKB encoding in descriptor busted on 64-bit, fix from\n Benjamin Poirier.\n\n22) Fix blind status block RX producer pointer deref in TG3 driver, from\n Matt Carlson.\n\n23) Promisc and multicast are busted on ehea, fixes from Thadeu Lima de\n Souza Cascardo.\n\n24) Fix crashes in 6lowpan, from Alexander Smirnov.\n\n25) tcp_complete_cwr() needs to be careful to not rewind the CWND to\n ssthresh if ssthresh has the \"infinite\" value. Fix from Yuchung\n Cheng.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (81 commits)\n sungem: Fix WakeOnLan\n tcp: change tcp_adv_win_scale and tcp_rmem[2]\n net: l2tp: unlock socket lock before returning from l2tp_ip_sendmsg\n drop_monitor: prevent init path from scheduling on the wrong cpu\n usbnet: fix failure handling in usbnet_probe\n usbnet: fix leak of transfer buffer of dev-\u003einterrupt\n ucc_geth: Add 16 bytes to max TX frame for VLANs\n net: ucc_geth, increase no. of HW RX descriptors\n netem: fix possible skb leak\n sky2: fix receive length error in mixed non-VLAN/VLAN traffic\n sky2: propogate rx hash when packet is copied\n net: fix two typos in skbuff.h\n cxgb3: Don\u0027t call cxgb_vlan_mode until q locks are initialized\n ixgbe: fix calling skb_put on nonlinear skb assertion bug\n ixgbe: Fix a memory leak in IEEE DCB\n igbvf: fix the bug when initializing the igbvf\n smsc75xx: enable mac to detect speed/duplex from phy\n smsc75xx: declare smsc75xx\u0027s MII as GMII capable\n smsc75xx: fix phy interrupt acknowledge\n smsc75xx: fix phy init reset loop\n ...\n" }, { "commit": "7bdf7415a6b8ec31f86b3ad3eaa241257ecb7c4c", "tree": "36cabe5902b163a66f94d7971ddba72d9aeaf0ff", "parents": [ "3617e5031b3acec04efaa36566a8111ac8f07325" ], "author": { "name": "Steve Dickson", "email": "steved@redhat.com", "time": "Thu May 03 11:47:08 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu May 03 12:35:33 2012 -0400" }, "message": "auth_gss: the list of pseudoflavors not being parsed correctly\n\ngss_mech_list_pseudoflavors() parses a list of registered mechanisms.\nOn that list contains a list of pseudo flavors which was not being\nparsed correctly, causing only the first pseudo flavor to be found.\n\nSigned-off-by: Steve Dickson \u003csteved@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "b49960a05e32121d29316cfdf653894b88ac9190", "tree": "101bb83073486809d5cc84505fecf772f4a77599", "parents": [ "84768edbb2721637620b2d84501bb0d5aed603f1" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Wed May 02 02:28:41 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 02 21:08:58 2012 -0400" }, "message": "tcp: change tcp_adv_win_scale and tcp_rmem[2]\n\ntcp_adv_win_scale default value is 2, meaning we expect a good citizen\nskb to have skb-\u003elen / skb-\u003etruesize ratio of 75% (3/4)\n\nIn 2.6 kernels we (mis)accounted for typical MSS\u003d1460 frame :\n1536 + 64 + 256 \u003d 1856 \u0027estimated truesize\u0027, and 1856 * 3/4 \u003d 1392.\nSo these skbs were considered as not bloated.\n\nWith recent truesize fixes, a typical MSS\u003d1460 frame truesize is now the\nmore precise :\n2048 + 256 \u003d 2304. But 2304 * 3/4 \u003d 1728.\nSo these skb are not good citizen anymore, because 1460 \u003c 1728\n\n(GRO can escape this problem because it build skbs with a too low\ntruesize.)\n\nThis also means tcp advertises a too optimistic window for a given\nallocated rcvspace : When receiving frames, sk_rmem_alloc can hit\nsk_rcvbuf limit and we call tcp_prune_queue()/tcp_collapse() too often,\nespecially when application is slow to drain its receive queue or in\ncase of losses (netperf is fast, scp is slow). This is a major latency\nsource.\n\nWe should adjust the len/truesize ratio to 50% instead of 75%\n\nThis patch :\n\n1) changes tcp_adv_win_scale default to 1 instead of 2\n\n2) increase tcp_rmem[2] limit from 4MB to 6MB to take into account\nbetter truesize tracking and to allow autotuning tcp receive window to\nreach same value than before. Note that same amount of kernel memory is\nconsumed compared to 2.6 kernels.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Neal Cardwell \u003cncardwell@google.com\u003e\nCc: Tom Herbert \u003ctherbert@google.com\u003e\nCc: Yuchung Cheng \u003cycheng@google.com\u003e\nAcked-by: Neal Cardwell \u003cncardwell@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "84768edbb2721637620b2d84501bb0d5aed603f1", "tree": "6b62fcfca8398296c12e8ebbd37985295ce698e0", "parents": [ "4fdcfa12843bca38d0c9deff70c8720e4e8f515f" ], "author": { "name": "Sasha Levin", "email": "levinsasha928@gmail.com", "time": "Wed May 02 03:58:43 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 02 21:04:33 2012 -0400" }, "message": "net: l2tp: unlock socket lock before returning from l2tp_ip_sendmsg\n\nl2tp_ip_sendmsg could return without releasing socket lock, making it all the\nway to userspace, and generating the following warning:\n\n[ 130.891594] \u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n[ 130.894569] [ BUG: lock held when returning to user space! ]\n[ 130.897257] 3.4.0-rc5-next-20120501-sasha #104 Tainted: G W\n[ 130.900336] ------------------------------------------------\n[ 130.902996] trinity/8384 is leaving the kernel with locks still held!\n[ 130.906106] 1 lock held by trinity/8384:\n[ 130.907924] #0: (sk_lock-AF_INET){+.+.+.}, at: [\u003cffffffff82b9503f\u003e] l2tp_ip_sendmsg+0x2f/0x550\n\nIntroduced by commit 2f16270 (\"l2tp: Fix locking in l2tp_ip.c\").\n\nSigned-off-by: Sasha Levin \u003clevinsasha928@gmail.com\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4fdcfa12843bca38d0c9deff70c8720e4e8f515f", "tree": "3ef2a92b1d6d322f9b72185e58b9d35a15564692", "parents": [ "a4723848d05dd31d298c551fb77ad28481309999" ], "author": { "name": "Neil Horman", "email": "nhorman@tuxdriver.com", "time": "Tue May 01 08:18:02 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 02 21:02:48 2012 -0400" }, "message": "drop_monitor: prevent init path from scheduling on the wrong cpu\n\nI just noticed after some recent updates, that the init path for the drop\nmonitor protocol has a minor error. drop monitor maintains a per cpu structure,\nthat gets initalized from a single cpu. Normally this is fine, as the protocol\nisn\u0027t in use yet, but I recently made a change that causes a failed skb\nallocation to reschedule itself . Given the current code, the implication is\nthat this workqueue reschedule will take place on the wrong cpu. If drop\nmonitor is used early during the boot process, its possible that two cpus will\naccess a single per-cpu structure in parallel, possibly leading to data\ncorruption.\n\nThis patch fixes the situation, by storing the cpu number that a given instance\nof this per-cpu data should be accessed from. In the case of a need for a\nreschedule, the cpu stored in the struct is assigned the rescheule, rather than\nthe currently executing cpu\n\nTested successfully by myself.\n\nSigned-off-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nCC: David Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a94b6122f4f7a44dc1d6e6a5dfd2533cad7a3abf", "tree": "0f530e9175ad92040b1c1b3c445fa395a6031da9", "parents": [ "77664f29f52e153914812a1a82717e2e7f84bb98" ], "author": { "name": "Brian Gix", "email": "bgix@codeaurora.org", "time": "Thu Feb 23 16:07:10 2012 -0800" }, "committer": { "name": "Brian Gix", "email": "bgix@codeaurora.org", "time": "Wed May 02 11:01:05 2012 -0700" }, "message": "Bluetooth: Add sockopts for LE Connection Params\n\nVarious LE profiles require very specific LE parameters for\nboth establishing and maintaining LE connections to remote\nperipherals. These LE only parameters are encapsulated into\na single sockopts structure, and may be passed from user space.\n\nCRs-Fixed: 335971\nChange-Id: I408edb97ab0fa9717c7d3fe5fc8ad6ac179a2fff\nSigned-off-by: Brian Gix \u003cbgix@codeaurora.org\u003e\n" }, { "commit": "aadf030d84352a91cdadf50f947da739c5611450", "tree": "5f22ec57ee257776b4c157f0c91f3612f05ed6c5", "parents": [ "aad2732ba0dddcf3446a4e3c4843496759c1c305", "69964ea4c7b68c9399f7977aa5b9aa6539a6a98a" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue May 01 15:47:09 2012 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue May 01 15:47:09 2012 -0700" }, "message": "Merge commit \u0027v3.4-rc5\u0027 into android-3.4\n" }, { "commit": "076e7779c07c56c7fa593a28c71ea7432d0c7c95", "tree": "70a4227b5d898c1abf37ed5779b0cd6f29b471bc", "parents": [ "116a0fc31c6c9b8fc821be5a96e5bf0b43260131", "66f2c99af3d6f2d0aa1120884cf1c60613ef61c0" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 01 14:14:05 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 01 14:14:05 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem\n" }, { "commit": "116a0fc31c6c9b8fc821be5a96e5bf0b43260131", "tree": "f4b8561387b34fd4eec9b8a2d599937b2375d741", "parents": [ "e072b3fad5f3915102c94628b4971f52ff99dd05" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Sun Apr 29 09:08:22 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 01 13:40:48 2012 -0400" }, "message": "netem: fix possible skb leak\n\nskb_checksum_help(skb) can return an error, we must free skb in this\ncase. qdisc_drop(skb, sch) can also be feeded with a NULL skb (if\nskb_unshare() failed), so lets use this generic helper.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Stephen Hemminger \u003cshemminger@osdl.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "66f2c99af3d6f2d0aa1120884cf1c60613ef61c0", "tree": "97742b014e6e85aabc03d84e7604ebf557d6a438", "parents": [ "4c1bcdb5a3354b250b82a67549f57ac27a3bb85f" ], "author": { "name": "Felix Fietkau", "email": "nbd@openwrt.org", "time": "Sun Apr 29 15:44:16 2012 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Apr 30 14:40:05 2012 -0400" }, "message": "mac80211: fix AP mode EAP tx for VLAN stations\n\nEAP frames for stations in an AP VLAN are sent on the main AP interface\nto avoid race conditions wrt. moving stations.\nFor that to work properly, sta_info_get_bss must be used instead of\nsta_info_get when sending EAP packets.\nPreviously this was only done for cooked monitor injected packets, so\nthis patch adds a check for tx-\u003eskb-\u003eprotocol to the same place.\n\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "1cebce36d660c83bd1353e41f3e66abd4686f215", "tree": "cd82ebc7c67f3d67e4de202dd3dafbb347f2324c", "parents": [ "05be18241e83d2ac6b656c8f924e74b3998c173f" ], "author": { "name": "Yuchung Cheng", "email": "ycheng@google.com", "time": "Mon Apr 30 06:00:18 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 30 13:44:39 2012 -0400" }, "message": "tcp: fix infinite cwnd in tcp_complete_cwr()\n\nWhen the cwnd reduction is done, ssthresh may be infinite\nif TCP enters CWR via ECN or F-RTO. If cwnd is not undone, i.e.,\nundo_marker is set, tcp_complete_cwr() falsely set cwnd to the\ninfinite ssthresh value. The correct operation is to keep cwnd\nintact because it has been updated in ECN or F-RTO.\n\nSigned-off-by: Yuchung Cheng \u003cycheng@google.com\u003e\nAcked-by: Neal Cardwell \u003cncardwell@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5414fc12e32a0e0833ec61ba8be864c46cd19966", "tree": "ee196c526a87c126655624218969a191b60e365f", "parents": [ "3885ca785a3618593226687ced84f3f336dc3860", "6cf51852486af3d79f57bf46d00209a14244dbaa" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 30 13:23:22 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 30 13:23:22 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://1984.lsi.us.es/net\n" }, { "commit": "cbbb34498f8b2b26cbdc79532c8a2ee5cd1e756a", "tree": "faa27244aed8ab803846f85944775b0976a1975d", "parents": [ "71dfc5fa5160bb73752f0731539404569a77faca" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Mon Apr 30 11:52:40 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Mon Apr 30 11:58:51 2012 -0400" }, "message": "SUNRPC: RPC client must use the current utsname hostname string\n\nNow that the rpc client is namespace aware, it needs to use the\nutsname of the process that created it instead of using the\ninit_utsname. Both rpc_new_client and rpc_clone_client need to\nbe fixed.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nCc: Stanislav Kinsbursky \u003cskinsbursky@parallels.com\u003e\n" }, { "commit": "6cf51852486af3d79f57bf46d00209a14244dbaa", "tree": "4d7d7e19422e412bf4cb22100306fece93b8d498", "parents": [ "8537de8a7ab6681cc72fb0411ab1ba7fdba62dd0" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Fri Apr 27 02:00:50 2012 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Mon Apr 30 10:40:36 2012 +0200" }, "message": "netfilter: xt_CT: fix wrong checking in the timeout assignment path\n\nThe current checking always succeeded. We have to check the first\ncharacter of the string to check that it\u0027s empty, thus, skipping\nthe timeout path.\n\nThis fixes the use of the CT target without the timeout option.\n\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "8537de8a7ab6681cc72fb0411ab1ba7fdba62dd0", "tree": "7a57ad6ef5aa0147dd13bba8be9bd77ab60f3f50", "parents": [ "582b8e3eadaec77788c1aa188081a8d5059c42a6" ], "author": { "name": "Hans Schillstrom", "email": "hans.schillstrom@ericsson.com", "time": "Thu Apr 26 07:47:44 2012 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Mon Apr 30 10:40:35 2012 +0200" }, "message": "ipvs: kernel oops - do_ip_vs_get_ctl\n\nChange order of init so netns init is ready\nwhen register ioctl and netlink.\n\nVer2\n\tWhitespace fixes and __init added.\n\nReported-by: \"Ryan O\u0027Hara\" \u003crohara@redhat.com\u003e\nSigned-off-by: Hans Schillstrom \u003chans.schillstrom@ericsson.com\u003e\nAcked-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Jesper Dangaard Brouer \u003cbrouer@redhat.com\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "582b8e3eadaec77788c1aa188081a8d5059c42a6", "tree": "57f869aac66f51e56499c06027c7d1055285600b", "parents": [ "4b984cd50bc1b6d492175cd77bfabb78e76ffa67" ], "author": { "name": "Hans Schillstrom", "email": "hans.schillstrom@ericsson.com", "time": "Thu Apr 26 09:45:35 2012 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Mon Apr 30 10:40:35 2012 +0200" }, "message": "ipvs: take care of return value from protocol init_netns\n\nip_vs_create_timeout_table() can return NULL\nAll functions protocol init_netns is affected of this patch.\n\nSigned-off-by: Hans Schillstrom \u003chans.schillstrom@ericsson.com\u003e\nAcked-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "4b984cd50bc1b6d492175cd77bfabb78e76ffa67", "tree": "f338dce013046c295f177ad190cd5c88040ee8cf", "parents": [ "39f618b4fd95ae243d940ec64c961009c74e3333" ], "author": { "name": "Hans Schillstrom", "email": "hans.schillstrom@ericsson.com", "time": "Thu Apr 26 09:45:34 2012 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Mon Apr 30 10:40:14 2012 +0200" }, "message": "ipvs: null check of net-\u003eipvs in lblc(r) shedulers\n\nAvoid crash when registering shedulers after\nthe IPVS core initialization for netns fails. Do this by\nchecking for present core (net-\u003eipvs).\n\nSigned-off-by: Hans Schillstrom \u003chans.schillstrom@ericsson.com\u003e\nAcked-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "a235e33c865813fa8ea7e72ef0f37e9c11ca0f1c", "tree": "533b0a6e4eca3d7c4941e64f869d1b41f4e5b5b3", "parents": [ "ca6fff81d8c5227515c70e1e60f7daa2e3e3da9c", "ff9718f8254b96dc313dd998c195c1c3769417ba" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Sat Apr 28 03:54:54 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Sat Apr 28 03:54:54 2012 -0700" }, "message": "Merge \"Bluetooth: Check for NULL pointer dereference\" into msm-3.0" }, { "commit": "3885ca785a3618593226687ced84f3f336dc3860", "tree": "a6b5af980c1295aaeee69749d4d79d47e072321a", "parents": [ "cde2e9a651b76d8db36ae94cd0febc82b637e5dd" ], "author": { "name": "Neil Horman", "email": "nhorman@tuxdriver.com", "time": "Fri Apr 27 10:11:49 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Apr 28 02:18:48 2012 -0400" }, "message": "drop_monitor: Make updating data-\u003eskb smp safe\n\nEric Dumazet pointed out to me that the drop_monitor protocol has some holes in\nits smp protections. Specifically, its possible to replace data-\u003eskb while its\nbeing written. This patch corrects that by making data-\u003eskb an rcu protected\nvariable. That will prevent it from being overwritten while a tracepoint is\nmodifying it.\n\nSigned-off-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nReported-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: David Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cde2e9a651b76d8db36ae94cd0febc82b637e5dd", "tree": "f38ea38cdde763a3a1d86412478dbcc9df892412", "parents": [ "651913ce9de2bbcedef608c5d6cf39c244248509" ], "author": { "name": "Neil Horman", "email": "nhorman@tuxdriver.com", "time": "Fri Apr 27 10:11:48 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Apr 28 02:18:48 2012 -0400" }, "message": "drop_monitor: fix sleeping in invalid context warning\n\nEric Dumazet pointed out this warning in the drop_monitor protocol to me:\n\n[ 38.352571] BUG: sleeping function called from invalid context at kernel/mutex.c:85\n[ 38.352576] in_atomic(): 1, irqs_disabled(): 0, pid: 4415, name: dropwatch\n[ 38.352580] Pid: 4415, comm: dropwatch Not tainted 3.4.0-rc2+ #71\n[ 38.352582] Call Trace:\n[ 38.352592] [\u003cffffffff8153aaf0\u003e] ? trace_napi_poll_hit+0xd0/0xd0\n[ 38.352599] [\u003cffffffff81063f2a\u003e] __might_sleep+0xca/0xf0\n[ 38.352606] [\u003cffffffff81655b16\u003e] mutex_lock+0x26/0x50\n[ 38.352610] [\u003cffffffff8153aaf0\u003e] ? trace_napi_poll_hit+0xd0/0xd0\n[ 38.352616] [\u003cffffffff810b72d9\u003e] tracepoint_probe_register+0x29/0x90\n[ 38.352621] [\u003cffffffff8153a585\u003e] set_all_monitor_traces+0x105/0x170\n[ 38.352625] [\u003cffffffff8153a8ca\u003e] net_dm_cmd_trace+0x2a/0x40\n[ 38.352630] [\u003cffffffff8154a81a\u003e] genl_rcv_msg+0x21a/0x2b0\n[ 38.352636] [\u003cffffffff810f8029\u003e] ? zone_statistics+0x99/0xc0\n[ 38.352640] [\u003cffffffff8154a600\u003e] ? genl_rcv+0x30/0x30\n[ 38.352645] [\u003cffffffff8154a059\u003e] netlink_rcv_skb+0xa9/0xd0\n[ 38.352649] [\u003cffffffff8154a5f0\u003e] genl_rcv+0x20/0x30\n[ 38.352653] [\u003cffffffff81549a7e\u003e] netlink_unicast+0x1ae/0x1f0\n[ 38.352658] [\u003cffffffff81549d76\u003e] netlink_sendmsg+0x2b6/0x310\n[ 38.352663] [\u003cffffffff8150824f\u003e] sock_sendmsg+0x10f/0x130\n[ 38.352668] [\u003cffffffff8150abe0\u003e] ? move_addr_to_kernel+0x60/0xb0\n[ 38.352673] [\u003cffffffff81515f04\u003e] ? verify_iovec+0x64/0xe0\n[ 38.352677] [\u003cffffffff81509c46\u003e] __sys_sendmsg+0x386/0x390\n[ 38.352682] [\u003cffffffff810ffaf9\u003e] ? handle_mm_fault+0x139/0x210\n[ 38.352687] [\u003cffffffff8165b5bc\u003e] ? do_page_fault+0x1ec/0x4f0\n[ 38.352693] [\u003cffffffff8106ba4d\u003e] ? set_next_entity+0x9d/0xb0\n[ 38.352699] [\u003cffffffff81310b49\u003e] ? tty_ldisc_deref+0x9/0x10\n[ 38.352703] [\u003cffffffff8106d363\u003e] ? pick_next_task_fair+0x63/0x140\n[ 38.352708] [\u003cffffffff8150b8d4\u003e] sys_sendmsg+0x44/0x80\n[ 38.352713] [\u003cffffffff8165f8e2\u003e] system_call_fastpath+0x16/0x1b\n\nIt stems from holding a spinlock (trace_state_lock) while attempting to register\nor unregister tracepoint hooks, making in_atomic() true in this context, leading\nto the warning when the tracepoint calls might_sleep() while its taking a mutex.\nSince we only use the trace_state_lock to prevent trace protocol state races, as\nwell as hardware stat list updates on an rcu write side, we can just convert the\nspinlock to a mutex to avoid this problem.\n\nSigned-off-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nReported-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: David Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4dcc0637fc3c36c1f58ffdcaf2dc0dc7de72449f", "tree": "587ffa9493e4b6af014f9acb2c09177c2c54af3b", "parents": [ "afa762f6871a8cb05fbef5d0f83fac14304aa816", "985140369be1e886754d8ac0375dd64e4f727311" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Apr 27 15:16:43 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Apr 27 15:16:43 2012 -0400" }, "message": "Merge branch \u0027for-upstream\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth\n" }, { "commit": "ea8cfa06795bb30d2ea61f503ef129284492c06a", "tree": "48fb210bfaedbf1c488bc0b096f1591ce2c98495", "parents": [ "37629b572cc4e80fc24b4139a24df1a89415d534" ], "author": { "name": "Stanislav Kinsbursky", "email": "skinsbursky@parallels.com", "time": "Fri Apr 27 13:00:17 2012 +0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Apr 27 14:10:00 2012 -0400" }, "message": "SUNRPC: traverse clients tree on PipeFS event\n\nv2: recursion was replaced by loop\n\nIf client is a clone, then it\u0027s parent can not be in the list.\nBut parent\u0027s Pipefs dentries have to be created and destroyed.\n\nNote: event skip helper for clients introduced\n\nSigned-off-by: Stanislav Kinsbursky \u003cskinsbursky@parallels.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "37629b572cc4e80fc24b4139a24df1a89415d534", "tree": "49d77495315e93ad187467837779f88073c37f15", "parents": [ "7aab449e5a2ebfa9c5116e87e16536bc4195e4de" ], "author": { "name": "Stanislav Kinsbursky", "email": "skinsbursky@parallels.com", "time": "Fri Apr 20 18:19:56 2012 +0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Apr 27 14:10:00 2012 -0400" }, "message": "SUNRPC: set per-net PipeFS superblock before notification\n\nThere can be a case, when on MOUNT event RPC client (after it\u0027s dentries were\ncreated) is not longer hold by anyone except notification callback.\nI.e. on release this client will be destoroyed. And it\u0027s dentries have to be\ndestroyed as well. Which in turn requires per-net PipeFS superblock to be set.\n\nSigned-off-by: Stanislav Kinsbursky \u003cskinsbursky@parallels.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "7aab449e5a2ebfa9c5116e87e16536bc4195e4de", "tree": "c948a96ddd87c2ed708875c961c9e3577737ae08", "parents": [ "a4dff1bc492ee4a2184d384ae8b5bcab5859e150" ], "author": { "name": "Stanislav Kinsbursky", "email": "skinsbursky@parallels.com", "time": "Fri Apr 20 18:19:18 2012 +0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Apr 27 14:09:59 2012 -0400" }, "message": "SUNRPC: skip clients with program without PipeFS entries\n\n1) This is sane.\n2) Otherwise there will be soft lockup:\n\ndo {\n\trpc_get_client_for_event (clnt-\u003ecl_dentry \u003d\u003d NULL \u003d\u003d\u003e choose)\n\t__rpc_pipefs_event (clnt-\u003ecl_program-\u003epipe_dir_name \u003d\u003d NULL \u003d\u003d\u003e return)\n} while (1)\n\nSigned-off-by: Stanislav Kinsbursky \u003cskinsbursky@parallels.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "a4dff1bc492ee4a2184d384ae8b5bcab5859e150", "tree": "b6bdb438cfa7c041d6e0a7b42f8c10c213961215", "parents": [ "5794d21ef4639f0e33440927bb903f9598c21e92" ], "author": { "name": "Stanislav Kinsbursky", "email": "skinsbursky@parallels.com", "time": "Fri Apr 20 18:11:02 2012 +0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Apr 27 14:09:59 2012 -0400" }, "message": "SUNRPC: skip dead but not buried clients on PipeFS events\n\nThese clients can\u0027t be safely dereferenced if their counter in 0.\n\nSigned-off-by: Stanislav Kinsbursky \u003cskinsbursky@parallels.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "651913ce9de2bbcedef608c5d6cf39c244248509", "tree": "c2c25a9e8f5c1e8e29c81f857fcbdcb5c4945f64", "parents": [ "8b6efb75e9467f7c2df279cbd657f741ec3493cf" ], "author": { "name": "Neal Cardwell", "email": "ncardwell@google.com", "time": "Fri Apr 27 11:29:37 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 27 12:34:39 2012 -0400" }, "message": "tcp: clean up use of jiffies in tcp_rcv_rtt_measure()\n\nClean up a reference to jiffies in tcp_rcv_rtt_measure() that should\ninstead reference tcp_time_stamp. Since the result of the subtraction\nis passed into a function taking u32, this should not change any\nbehavior (and indeed the generated assembly does not change on\nx86_64). However, it seems worth cleaning this up for consistency and\nclarity (and perhaps to avoid bugs if this is copied and pasted\nsomewhere else).\n\nSigned-off-by: Neal Cardwell \u003cncardwell@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bd0861c34d3ec2fd752791b0bc4268aa0070db2b", "tree": "8bd00106b9a4f362e04ff853b9a6b8ebb266caec", "parents": [ "e1dce2ee8e267b0c58557c830cd71d2ac28ea02f", "27a795c692e36a4c14c34531d105f270f3340418" ], "author": { "name": "Linux Build Service Account", "email": "lnxbuild@localhost", "time": "Fri Apr 27 03:46:04 2012 -0700" }, "committer": { "name": "QuIC Gerrit Code Review", "email": "code-review@localhost", "time": "Fri Apr 27 03:46:04 2012 -0700" }, "message": "Merge \"Bluetooth: Specify underlying ACL security for connected sockets\" into msm-3.0" } ], "next": "ff9718f8254b96dc313dd998c195c1c3769417ba" }