)]}' { "log": [ { "commit": "2d0a03460a8a0c611843500735096ff799aa8510", "tree": "7de71ec848af910d0075a1175381015ded556fe6", "parents": [ "04fafe4ed76f5547856f4c464bec5bf948afb498" ], "author": { "name": "Ron Shaffer", "email": "rshaffer@codeaurora.org", "time": "Fri May 28 11:53:46 2010 -0400" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Wed Jul 21 10:39:06 2010 -0700" }, "message": "Bluetooth: Reassigned copyright to Code Aurora Forum\n\nQualcomm, Inc. has reassigned rights to Code Aurora Forum. Accordingly,\nas files are modified by Code Aurora Forum members, the copyright\nstatement will be updated.\n\nSigned-off-by: Ron Shaffer \u003crshaffer@codeaurora.org\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "04fafe4ed76f5547856f4c464bec5bf948afb498", "tree": "6e16cc046b1686048efb36cb278b33ad7842f4dd", "parents": [ "7452d24cfb91e84f9be61beda5ad68d2a56d0938" ], "author": { "name": "Ron Shaffer", "email": "rshaffer@codeaurora.org", "time": "Fri May 28 11:53:45 2010 -0400" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Wed Jul 21 10:39:05 2010 -0700" }, "message": "Bluetooth: Remove extraneous white space\n\nDeleted extraneous white space from the end of several lines\n\nSigned-off-by: Ron Shaffer \u003crshaffer@codeaurora.org\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "f03585689fdff4ae256edd45a35bc2dd83d3684a", "tree": "be1516aa354aa742f2d5b69a91de0561febaffc4", "parents": [ "95ffa97827371ede501615d9bd048eb5b49e8fe1" ], "author": { "name": "Johan Hedberg", "email": "johan.hedberg@nokia.com", "time": "Tue May 18 13:20:32 2010 +0200" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Wed Jul 21 10:39:05 2010 -0700" }, "message": "Bluetooth: Add blacklist support for incoming connections\n\nIn some circumstances it could be desirable to reject incoming\nconnections on the baseband level. This patch adds this feature through\ntwo new ioctl\u0027s: HCIBLOCKADDR and HCIUNBLOCKADDR. Both take a simple\nBluetooth address as a parameter. BDADDR_ANY can be used with\nHCIUNBLOCKADDR to remove all devices from the blacklist.\n\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@nokia.com\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "11fe883936980fe242869d671092a466cf1db3e3", "tree": "14ff24e81eb4326e94eb5aa6432a1dd55cef5ece", "parents": [ "70d4bf6d467a330ccc947df9b2608e329d9e7708", "573201f36fd9c7c6d5218cdcd9948cee700b277d" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jul 20 18:25:24 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jul 20 18:25:24 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/vhost/net.c\n\tnet/bridge/br_device.c\n\nFix merge conflict in drivers/vhost/net.c with guidance from\nStephen Rothwell.\n\nRevert the effects of net-2.6 commit 573201f36fd9c7c6d5218cdcd9948cee700b277d\nsince net-next-2.6 has fixes that make bridge netpoll work properly thus\nwe don\u0027t need it disabled.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f86586fa48a94c7a9c7f36650a2e0e4a947881c9", "tree": "d977100a3c72dcaeaeb90c0b776b36c2e8a57b90", "parents": [ "6ce28c6f55fe636c322ea909794cf19b20ef4b6b" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Jul 15 21:41:00 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 15 21:41:00 2010 -0700" }, "message": "tcp: sizeof struct tcp_skb_cb is 44\n\nCorrect comment stating sizeof(struct tcp_skb_cb) is 36 or 40, since its\n44 bytes, since commit 951dbc8ac714b04 ([IPV6]: Move nextheader offset\nto the IP6CB).\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b0f77d0eae0c58a5a9691a067ada112ceeae2d00", "tree": "2bab159a95f51e32dbb4eb2d554328de3190c678", "parents": [ "91a72a70594e5212c97705ca6a694bd307f7a26b" ], "author": { "name": "Tom Herbert", "email": "therbert@google.com", "time": "Wed Jul 14 20:50:29 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 14 20:50:29 2010 -0700" }, "message": "net: fix problem in reading sock TX queue\n\nFix problem in reading the tx_queue recorded in a socket. In\ndev_pick_tx, the TX queue is read by doing a check with\nsk_tx_queue_recorded on the socket, followed by a sk_tx_queue_get.\nThe problem is that there is not mutual exclusion across these\ncalls in the socket so it it is possible that the queue in the\nsock can be invalidated after sk_tx_queue_recorded is called so\nthat sk_tx_queue get returns -1, which sets 65535 in queue_index\nand thus dev_pick_tx returns 65536 which is a bogus queue and\ncan cause crash in dev_queue_xmit.\n\nWe fix this by only calling sk_tx_queue_get which does the proper\nchecks. The interface is that sk_tx_queue_get returns the TX queue\nif the sock argument is non-NULL and TX queue is recorded, else it\nreturns -1. sk_tx_queue_recorded is no longer used so it can be\ncompletely removed.\n\nSigned-off-by: Tom Herbert \u003ctherbert@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7ba42910073f8432934d61a6c08b1023c408fb62", "tree": "4f74648133eaf6cbea26d59c43d34e7153648f5d", "parents": [ "53d3176b282cc105493babb0fef36c8b873f6201" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Sat Jul 10 20:41:55 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 12 20:21:46 2010 -0700" }, "message": "inet, inet6: make tcp_sendmsg() and tcp_sendpage() through inet_sendmsg() and inet_sendpage()\n\na new boolean flag no_autobind is added to structure proto to avoid the autobind\ncalls when the protocol is TCP. Then sock_rps_record_flow() is called int the\nTCP\u0027s sendmsg() and sendpage() pathes.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\n----\n include/net/inet_common.h | 4 ++++\n include/net/sock.h | 1 +\n include/net/tcp.h | 8 ++++----\n net/ipv4/af_inet.c | 15 +++++++++------\n net/ipv4/tcp.c | 11 +++++------\n net/ipv4/tcp_ipv4.c | 3 +++\n net/ipv6/af_inet6.c | 8 ++++----\n net/ipv6/tcp_ipv6.c | 3 +++\n 8 files changed, 33 insertions(+), 20 deletions(-)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "53d3176b282cc105493babb0fef36c8b873f6201", "tree": "2571bb37b0e292b7b2fbbd6b056661584260c9bf", "parents": [ "dbe000ed3f3033e8e6321d79023c827faf649c4d" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Sat Jul 10 20:41:06 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 12 20:21:45 2010 -0700" }, "message": "net: cleanups\n\nremove useless blanks.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\n----\n include/net/inet_common.h | 55 ++++-------\n include/net/tcp.h | 222 +++++++++++++++++-----------------------------\n include/net/udp.h | 38 +++----\n 3 files changed, 123 insertions(+), 192 deletions(-)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "597e608a8492d662736c9bc6aa507dbf1cadc17d", "tree": "6c330cdd0a4809f67dd191b37e34f5b4318cef78", "parents": [ "acbc0f039ff4b93da737c91937b7c70018ded39f", "33b665eeeb85956ccbdf31c4c31a4e2a31133c44" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 07 15:59:38 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 07 15:59:38 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "e490c1defec4236a6a131fe2d13bf7ba787c02f8", "tree": "132325ca88cc86a74345a93b2774c5ca284b038a", "parents": [ "0a17d8c744e44617a3c22e7af68b4c5c9c1c5dba", "4df53d8bab65cf2c18daebd51a5a4847e03f1943" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 22:42:06 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 22:42:06 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6\n" }, { "commit": "f0796d5c73e59786d09a1e617689d1d415f2db44", "tree": "ecb17c65c5b6a162824a1e11fee24364852837f8", "parents": [ "4ef6acff83222f4496ceef7d1f0ee9e50a5bb403" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Thu Jul 01 13:21:57 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 21:59:07 2010 -0700" }, "message": "net: decreasing real_num_tx_queues needs to flush qdisc\n\nReducing real_num_queues needs to flush the qdisc otherwise\nskbs with queue_mappings greater then real_num_tx_queues can\nbe sent to the underlying driver.\n\nThe flow for this is,\n\ndev_queue_xmit()\n\tdev_pick_tx()\n\t\tskb_tx_hash() \u003d\u003e hash using real_num_tx_queues\n\t\tskb_set_queue_mapping()\n\t...\n\tqdisc_enqueue_root() \u003d\u003e enqueue skb on txq from hash\n...\ndev-\u003ereal_num_tx_queues -\u003d n\n...\nsch_direct_xmit()\n\tdev_hard_start_xmit()\n\t\tndo_start_xmit(skb,dev) \u003d\u003e skb queue set with old hash\n\nskbs are enqueued on the qdisc with skb-\u003equeue_mapping set\n0 \u003c queue_mappings \u003c real_num_tx_queues. When the driver\ndecreases real_num_tx_queues skb\u0027s may be dequeued from the\nqdisc with a queue_mapping greater then real_num_tx_queues.\n\nThis fixes a case in ixgbe where this was occurring with DCB\nand FCoE. Because the driver is using queue_mapping to map\nskbs to tx descriptor rings we can potentially map skbs to\nrings that no longer exist.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4ef6acff83222f4496ceef7d1f0ee9e50a5bb403", "tree": "0982d46258047f208c26068252457179f5f13bdf", "parents": [ "7ae80abdba0644e12ac17da567a2db1efc1bf8a8" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Thu Jul 01 13:21:35 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 21:59:07 2010 -0700" }, "message": "sched: qdisc_reset_all_tx is calling qdisc_reset without qdisc_lock\n\nWhen calling qdisc_reset() the qdisc lock needs to be held. In\nthis case there is at least one driver i4l which is using this\nwithout holding the lock. Add the locking here.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "05318bc905467237d4aa68a701f6e92a2b332218", "tree": "3b7577383bca50aeb442568aa16cf8f2167b8694", "parents": [ "ea812ca1b06113597adcd8e70c0f84a413d97544", "88c1f4f6dffe66e2fed8e7e3276e091ee850bed0" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 01 17:34:14 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 01 17:34:14 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6\n\nConflicts:\n\tdrivers/net/wireless/libertas/host.h\n" }, { "commit": "d6bebca92c663fb216c072193945946f3807ca7f", "tree": "fd797f062fa19d2ee470cf33c9b475bff08e2545", "parents": [ "4ce3c183fcade7f4b30a33dae90cd774c3d9e094" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Tue Jun 29 04:39:37 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 30 13:44:29 2010 -0700" }, "message": "fragment: add fast path for in-order fragments\n\nadd fast path for in-order fragments\n\nAs the fragments are sent in order in most of OSes, such as Windows, Darwin and\nFreeBSD, it is likely the new fragments are at the end of the inet_frag_queue.\nIn the fast path, we check if the skb at the end of the inet_frag_queue is the\nprev we expect.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\n----\n include/net/inet_frag.h | 1 +\n net/ipv4/ip_fragment.c | 12 ++++++++++++\n net/ipv6/reassembly.c | 11 +++++++++++\n 3 files changed, 24 insertions(+)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4ce3c183fcade7f4b30a33dae90cd774c3d9e094", "tree": "84d5a130da50096fdbeb7fffea596dffe2cebd80", "parents": [ "f3eb62d2cc7da7bea4b394dd06f6bc738aa284e7" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jun 30 13:31:19 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 30 13:31:19 2010 -0700" }, "message": "snmp: 64bit ipstats_mib for all arches\n\n/proc/net/snmp and /proc/net/netstat expose SNMP counters.\n\nWidth of these counters is either 32 or 64 bits, depending on the size\nof \"unsigned long\" in kernel.\n\nThis means user program parsing these files must already be prepared to\ndeal with 64bit values, regardless of user program being 32 or 64 bit.\n\nThis patch introduces 64bit snmp values for IPSTAT mib, where some\ncounters can wrap pretty fast if they are 32bit wide.\n\n# netstat -s|egrep \"InOctets|OutOctets\"\n InOctets: 244068329096\n OutOctets: 244069348848\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "787a34456dc34bdd75b29cebb53cb09c727674d6", "tree": "370e65e5ea2536072c4067d600cdb6c4f3b7106a", "parents": [ "511d934f4496076898e45aaa09e0c85376eb16ee" ], "author": { "name": "Kulikov Vasiliy", "email": "segooon@gmail.com", "time": "Wed Jun 30 06:08:15 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 30 12:06:52 2010 -0700" }, "message": "net/neighbour.h: fix typo\n\n\u0027Shoul\u0027 must be \u0027should\u0027.\n\nSigned-off-by: Kulikov Vasiliy \u003csegooon@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4efd7e833591721bec21cc4730a7f6261417840f", "tree": "9982ea86ad73f1142842070f4d9d1bf83ba318a0", "parents": [ "d3ead2413cb99d3e6265577b12537434e229d8c2" ], "author": { "name": "Andreas Steffen", "email": "andreas.steffen@strongswan.org", "time": "Wed Jun 30 10:41:15 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 30 10:43:31 2010 -0700" }, "message": "xfrm: fix XFRMA_MARK extraction in xfrm_mark_get\n\nDetermine the size of the xfrm_mark struct, not of its pointer.\n\nSigned-off-by: Andreas Steffen \u003candreas.steffen@strongswan.org\u003e\nAcked-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "529d6dad5bc69de14cdd24831e2a14264e93daa4", "tree": "a89d7b8cdd3692e96a64c5d7196bcefc9f1e7f24", "parents": [ "01eebb53a65996dfbfb892bf5eb21ae831fbe3a6" ], "author": { "name": "Sjur Braendeland", "email": "sjur.brandeland@stericsson.com", "time": "Tue Jun 29 00:08:21 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 29 00:08:21 2010 -0700" }, "message": "caif-driver: Add CAIF-SPI Protocol driver.\n\nThis patch introduces the CAIF SPI Protocol Driver for\nCAIF Link Layer.\n\nThis driver implements a platform driver to accommodate for a\nplatform specific SPI device. A general platform driver is not\npossible as there are no SPI Slave side Kernel API defined.\nA sample CAIF SPI Platform device can be found in\n.../Documentation/networking/caif/spi_porting.txt\n\nSigned-off-by: Sjur Braendeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "210d6de78c5d7c785fc532556cea340e517955e1", "tree": "e4bbac89a8bc16154f51ad61e140be1b7bd2b92d", "parents": [ "c4ead4c595cd54cf7b1a184d4f888ce0d7cce7d4" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Thu Jun 24 16:25:12 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 28 23:24:32 2010 -0700" }, "message": "act_mirred: don\u0027t clone skb when skb isn\u0027t shared\n\ndon\u0027t clone skb when skb isn\u0027t shared\n\nWhen the tcf_action is TC_ACT_STOLEN, and the skb isn\u0027t shared, we don\u0027t need\nto clone a new skb. As the skb will be freed after this function returns, we\ncan use it freely once we get a reference to it.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\n----\n include/net/sch_generic.h | 11 +++++++++--\n net/sched/act_mirred.c | 6 +++---\n 2 files changed, 12 insertions(+), 5 deletions(-)\nSigned-off-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "172d69e63c7f1e8300d0e1c1bbd8eb0f630faa15", "tree": "c71118ddc86186e235a920b9529c457db5e9aae5", "parents": [ "734f614bc1e7c6bf075d201f6bd9a555b8b4a984" ], "author": { "name": "Florian Westphal", "email": "fw@strlen.de", "time": "Mon Jun 21 11:48:45 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 26 22:00:03 2010 -0700" }, "message": "syncookies: add support for ECN\n\nAllows use of ECN when syncookies are in effect by encoding ecn_ok\ninto the syn-ack tcp timestamp.\n\nWhile at it, remove a uneeded #ifdef CONFIG_SYN_COOKIES.\nWith CONFIG_SYN_COOKIES\u003dnm want_cookie is ifdef\u0027d to 0 and gcc\nremoves the \"if (0)\".\n\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1823e4c80eeae2a774c75569ce3035070e5ee009", "tree": "bdc1bdf4a67027193312ad584924ca8a986a064c", "parents": [ "5eaa0bd81f93225b6d1972b373ed00ca763052b2" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Jun 22 20:58:41 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 25 21:33:17 2010 -0700" }, "message": "snmp: add align parameter to snmp_mib_init()\n\nIn preparation for 64bit snmp counters for some mibs,\nadd an \u0027align\u0027 parameter to snmp_mib_init(), instead\nof assuming mibs only contain \u0027unsigned long\u0027 fields.\n\nCallers can use __alignof__(type) to provide correct\nalignment.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nCC: Arnaldo Carvalho de Melo \u003cacme@ghostprotocols.net\u003e\nCC: Hideaki YOSHIFUJI \u003cyoshfuji@linux-ipv6.org\u003e\nCC: Vlad Yasevich \u003cvladislav.yasevich@hp.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a8756201ba4189bca3ee1a6ec4e290f467ee09ab", "tree": "309d40a10f68ffc971de4f16d26d16a0dccc0693", "parents": [ "fe6fb552858f686f39e33d7b0a33fe56dacea0bf" ], "author": { "name": "Tim Gardner", "email": "tim.gardner@canonical.com", "time": "Fri Jun 25 14:44:07 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jun 25 14:44:07 2010 +0200" }, "message": "netfilter: xt_connbytes: Force CT accounting to be enabled\n\nCheck at rule install time that CT accounting is enabled. Force it\nto be enabled if not while also emitting a warning since this is not\nthe default state.\n\nThis is in preparation for deprecating CONFIG_NF_CT_ACCT upon which\nCONFIG_NETFILTER_XT_MATCH_CONNBYTES depended being set.\n\nAdded 2 CT accounting support functions:\n\nnf_ct_acct_enabled() - Get CT accounting state.\nnf_ct_set_acct() - Enable/disable CT accountuing.\n\nSigned-off-by: Tim Gardner \u003ctim.gardner@canonical.com\u003e\nAcked-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "fa61cf70a6ae1089e459e4b59b2e8d8e90d8535e", "tree": "1bd81709faaa15fb207de7db4df1ceed96374208", "parents": [ "a185045c8da1ec6627236b4ade0d949b15da43b3" ], "author": { "name": "Juuso Oikarinen", "email": "juuso.oikarinen@nokia.com", "time": "Wed Jun 23 12:12:37 2010 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Jun 24 15:42:33 2010 -0400" }, "message": "cfg80211/mac80211: Update set_tx_power to use mBm instead of dBm units\n\nIn preparation for a TX power setting interface in the nl80211, change the\n.set_tx_power function to use mBm units instead of dBm for greater accuracy and\nsmaller power levels.\n\nAlso, already in advance move the tx_power_setting enumeration to nl80211.\n\nThis change affects the .tx_set_power function prototype. As a result, the\ncorresponding changes are needed to modules using it. These are mac80211,\niwmc3200wifi and rndis_wlan.\n\nCc: Samuel Ortiz \u003csamuel.ortiz@intel.com\u003e\nCc: Jussi Kivilinna \u003cjussi.kivilinna@mbnet.fi\u003e\nSigned-off-by: Juuso Oikarinen \u003cjuuso.oikarinen@nokia.com\u003e\nAcked-by: Samuel Ortiz \u003csamuel.ortiz@intel.com\u003e\nAcked-by: Jussi Kivilinna \u003cjussi.kivilinna@mbnet.fi\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "8244132ea89cdd128003f5b9980fab50d8d36d72", "tree": "c6cf9327cf9b6bab5bb830bbf389a514f4d7bb95", "parents": [ "7b2ff18ee7b0ec4bc3162f821e221781aaca48bd", "38000a94a902e94ca8b5498f7871c6316de8957a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 23 18:26:27 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 23 18:26:27 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tnet/ipv4/ip_output.c\n" }, { "commit": "7b2ff18ee7b0ec4bc3162f821e221781aaca48bd", "tree": "eed7535663f6333a1dc68861d8cd7b98d8050d4d", "parents": [ "01fc3e86c6379cc4c78c529a1bad1b8179b726aa" ], "author": { "name": "Jiri Olsa", "email": "jolsa@redhat.com", "time": "Tue Jun 15 01:07:31 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 23 13:16:38 2010 -0700" }, "message": "net - IP_NODEFRAG option for IPv4 socket\n\nthis patch is implementing IP_NODEFRAG option for IPv4 socket.\nThe reason is, there\u0027s no other way to send out the packet with user\ncustomized header of the reassembly part.\n\nSigned-off-by: Jiri Olsa \u003cjolsa@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1dc8d8c06d4002be4d1373fc06f25cd589be47e1", "tree": "c9e3a60ae07df56604f5e81a89900f6df975f102", "parents": [ "17f085df92ba74a4dc88744cbc7a699c231f8728" ], "author": { "name": "Justin P. Mattock", "email": "justinmattock@gmail.com", "time": "Mon Jun 21 13:45:42 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 23 12:58:40 2010 -0700" }, "message": "net: Fix a typo in netlink.h\n\nFix a typo in include/net/netlink.h\nshould be finalize instead of finanlize\n\nSigned-off-by: Justin P. Mattock \u003cjustinmattock@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8f1c14b2e3b1805d3e9e6a306d07f5371ea703a7", "tree": "ad5d96e60d1ff4e91f5b23d7ae13884581ae2441", "parents": [ "8ceedea7c2600a1018d20f67e766c0773b59391a" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jun 23 00:32:03 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 23 11:48:19 2010 -0700" }, "message": "snmp: fix SNMP_ADD_STATS()\n\ncommit aa2ea0586d9d (tcp: fix outsegs stat for TSO segments) incorrectly\nassumed SNMP_ADD_STATS() was used from BH context.\n\nFix this using mib[!in_softirq()] instead of mib[0]\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Tom Herbert \u003ctherbert@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f90754c15f47063671aea55268a9dd6a37b51492", "tree": "197c239a813e426d8a675449927e381352ad4875", "parents": [ "fb63bc41772259701a827e9a6117219a7393554f" ], "author": { "name": "Juuso Oikarinen", "email": "juuso.oikarinen@nokia.com", "time": "Mon Jun 21 08:59:39 2010 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 21 15:39:59 2010 -0400" }, "message": "mac80211: Add interface for driver to temporarily disable dynamic ps\n\nThis mechanism introduced in this patch applies (at least) for hardware\ndesigns using a single shared antenna for both WLAN and BT. In these designs,\nthe antenna must be toggled between WLAN and BT.\n\nIn those hardware, managing WLAN co-existence with Bluetooth requires WLAN\nfull power save whenever there is Bluetooth activity in order for WLAN to be\nable to periodically relinquish the antenna to be used for BT. This is because\nBT can only access the shared antenna when WLAN is idle or asleep.\n\nSome hardware, for instance the wl1271, are able to indicate to the host\nwhenever there is BT traffic. In essence, the hardware will send an indication\nto the host whenever there is, for example, SCO traffic or A2DP traffic, and\nwill send another indication when the traffic is over.\n\nThe hardware gets information of Bluetooth traffic via hardware co-existence\ncontrol lines - these lines are used to negotiate the shared antenna\nownership. The hardware will give the antenna to BT whenever WLAN is sleeping.\n\nThis patch adds the interface to mac80211 to facilitate temporarily disabling\nof dynamic power save as per request of the WLAN driver. This interface will\nimmediately force WLAN to full powersave, hence allowing BT coexistence as\ndescribed above.\n\nIn these kind of shared antenna desings, when WLAN powersave is fully disabled,\nBluetooth will not work simultaneously with WLAN at all. This patch does not\naddress that problem. This interface will not change PSM state, so if PSM is\ndisabled it will remain so. Solving this problem requires knowledge about BT\nstate, and is best done in user-space.\n\nSigned-off-by: Juuso Oikarinen \u003cjuuso.oikarinen@nokia.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "2aa40aef9debc77d55cc87a50d335b6fe97fbeb0", "tree": "0dccf47cf6cb861c7efa72601fab9511760c7e74", "parents": [ "a7da1f55a826c621251874e7684c234972fc3216" ], "author": { "name": "Sjur Braendeland", "email": "sjur.brandeland@stericsson.com", "time": "Thu Jun 17 06:55:40 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jun 20 19:46:06 2010 -0700" }, "message": "caif: Use link layer MTU instead of fixed MTU\n\nPreviously CAIF supported maximum transfer size of ~4050.\nThe transfer size is now calculated dynamically based on the\nlink layers mtu size.\n\nSigned-off-by: Sjur Braendeland@stericsson.com\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a7da1f55a826c621251874e7684c234972fc3216", "tree": "e5c66620b9cfe00ed62233665002a0acf5fc1004", "parents": [ "b1c74247b9e29ae3bfdf133862328c309bc9cf14" ], "author": { "name": "Sjur Braendeland", "email": "sjur.brandeland@stericsson.com", "time": "Thu Jun 17 06:55:39 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jun 20 19:46:05 2010 -0700" }, "message": "caif: Bugfix - RFM must support segmentation.\n\nCAIF Remote File Manager may send or receive more than 4050 bytes.\nDue to this The CAIF RFM service have to support segmentation.\n\nSigned-off-by: Sjur Braendeland@stericsson.com\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b1c74247b9e29ae3bfdf133862328c309bc9cf14", "tree": "a20cd55d47036a22e3857d382ed505436a366efe", "parents": [ "c14c643b3d91cc741425c058968672228c310927" ], "author": { "name": "Sjur Braendeland", "email": "sjur.brandeland@stericsson.com", "time": "Thu Jun 17 06:55:38 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jun 20 19:46:05 2010 -0700" }, "message": "caif: Bugfix not all services uses flow-ctrl.\n\nFlow control is not used by all CAIF services.\nThe usage of flow control is now part of the gerneal\ninitialization function for CAIF Services.\n\nSigned-off-by: Sjur Braendeland@stericsson.com\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bb9c03d8a6893517737b16fdbeb54be3c73b3023", "tree": "35fa0d1defaaf94641963a49126d7bb475ffa4c6", "parents": [ "4de57826810fd2cfeb2ab5c7d003ff9116b8f7ee", "abf52f86aa0a49a7377350cafa8f218c4cd227e7" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 17 14:19:06 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 17 14:19:06 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6\n" }, { "commit": "c68cd6cc21eb329c47ff020ff7412bf58176984e", "tree": "2e49be79c66d550b37fc494e22b5e31b39a8bc38", "parents": [ "f9181f4ffc71d7b7dd1906c9a11d51d6659220ae" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Jun 17 06:12:26 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Jun 17 06:12:26 2010 +0200" }, "message": "netfilter: nf_nat: support user-specified SNAT rules in LOCAL_IN\n\n2.6.34 introduced \u0027conntrack zones\u0027 to deal with cases where packets\nfrom multiple identical networks are handled by conntrack/NAT. Packets\nare looped through veth devices, during which they are NATed to private\naddresses, after which they can continue normally through the stack\nand possibly have NAT rules applied a second time.\n\nThis works well, but is needlessly complicated for cases where only\na single SNAT/DNAT mapping needs to be applied to these packets. In that\ncase, all that needs to be done is to assign each network to a seperate\nzone and perform NAT as usual. However this doesn\u0027t work for packets\ndestined for the machine performing NAT itself since its corrently not\npossible to configure SNAT mappings for the LOCAL_IN chain.\n\nThis patch adds a new INPUT chain to the NAT table and changes the\ntargets performing SNAT to be usable in that chain.\n\nExample usage with two identical networks (192.168.0.0/24) on eth0/eth1:\n\niptables -t raw -A PREROUTING -i eth0 -j CT --zone 1\niptables -t raw -A PREROUTING -i eth0 -j MARK --set-mark 1\niptables -t raw -A PREROUTING -i eth1 -j CT --zone 2\niptabels -t raw -A PREROUTING -i eth1 -j MARK --set-mark 2\n\niptables -t nat -A INPUT -m mark --mark 1 -j NETMAP --to 10.0.0.0/24\niptables -t nat -A POSTROUTING -m mark --mark 1 -j NETMAP --to 10.0.0.0/24\niptables -t nat -A INPUT -m mark --mark 2 -j NETMAP --to 10.0.1.0/24\niptables -t nat -A POSTROUTING -m mark --mark 2 -j NETMAP --to 10.0.1.0/24\n\niptables -t raw -A PREROUTING -d 10.0.0.0/24 -j CT --zone 1\niptables -t raw -A OUTPUT -d 10.0.0.0/24 -j CT --zone 1\niptables -t raw -A PREROUTING -d 10.0.1.0/24 -j CT --zone 2\niptables -t raw -A OUTPUT -d 10.0.1.0/24 -j CT --zone 2\n\niptables -t nat -A PREROUTING -d 10.0.0.0/24 -j NETMAP --to 192.168.0.0/24\niptables -t nat -A OUTPUT -d 10.0.0.0/24 -j NETMAP --to 192.168.0.0/24\niptables -t nat -A PREROUTING -d 10.0.1.0/24 -j NETMAP --to 192.168.0.0/24\niptables -t nat -A OUTPUT -d 10.0.1.0/24 -j NETMAP --to 192.168.0.0/24\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "7361c36c5224519b258219fe3d0e8abc865d8134", "tree": "7987367633b4729dff0afa2180862a2ce919f3cb", "parents": [ "257b5358b32f17e0603b6ff57b13610b0e02348f" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Sun Jun 13 03:34:33 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 16 14:58:16 2010 -0700" }, "message": "af_unix: Allow credentials to work across user and pid namespaces.\n\nIn unix_skb_parms store pointers to struct pid and struct cred instead\nof raw uid, gid, and pid values, then translate the credentials on\nreception into values that are meaningful in the receiving processes\nnamespaces.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nAcked-by: Pavel Emelyanov \u003cxemul@openvz.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "257b5358b32f17e0603b6ff57b13610b0e02348f", "tree": "15c4887d45eb6ccfe32f5e67b5c0009e1e8dae6c", "parents": [ "b47030c71dfd6c8cd5cb6e551b6f7f7cfc96f6a6" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Sun Jun 13 03:32:34 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 16 14:55:56 2010 -0700" }, "message": "scm: Capture the full credentials of the scm sender.\n\nStart capturing not only the userspace pid, uid and gid values of the\nsending process but also the struct pid and struct cred of the sending\nprocess as well.\n\nThis is in preparation for properly supporting SCM_CREDENTIALS for\nsockets that have different uid and/or pid namespaces at the different\nends.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nAcked-by: Serge E. Hallyn \u003cserge@hallyn.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "109f6e39fa07c48f580125f531f46cb7c245b528", "tree": "9ec97679c227394a44ebede5768f92d970cea6eb", "parents": [ "3f551f9436c05a3b5eccdd6e94733df5bb98d2a5" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Sun Jun 13 03:30:14 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 16 14:55:55 2010 -0700" }, "message": "af_unix: Allow SO_PEERCRED to work across namespaces.\n\nUse struct pid and struct cred to store the peer credentials on struct\nsock. This gives enough information to convert the peer credential\ninformation to a value relative to whatever namespace the socket is in\nat the time.\n\nThis removes nasty surprises when using SO_PEERCRED on socket\nconnetions where the processes on either side are in different pid and\nuser namespaces.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nAcked-by: Daniel Lezcano \u003cdaniel.lezcano@free.fr\u003e\nAcked-by: Pavel Emelyanov \u003cxemul@openvz.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "812e876e842488221aa54cb4587a8a33445cfa9e", "tree": "cb8475918fc3c9a9cf624e643bb679af34e0c24e", "parents": [ "434d7b380f2bfc2161b9aaee2cada177a4a4261f" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Sun Jun 13 03:27:04 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 16 14:55:34 2010 -0700" }, "message": "scm: Reorder scm_cookie.\n\nReorder the fields in scm_cookie so they pack better on 64bit.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nAcked-by: Pavel Emelyanov \u003cxemul@openvz.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8c76368174ed2359739f1b7b8a9c042b1ef839c4", "tree": "143aa28c9438b24154bc3d1e36b432a534eca50c", "parents": [ "317fe0e6c5dc9448bcef41a2e31fecfd3dba7f55" ], "author": { "name": "Florian Westphal", "email": "fw@strlen.de", "time": "Wed Jun 16 14:42:15 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 16 14:42:15 2010 -0700" }, "message": "syncookies: check decoded options against sysctl settings\n\nDiscard the ACK if we find options that do not match current sysctl\nsettings.\n\nPreviously it was possible to create a connection with sack, wscale,\netc. enabled even if the feature was disabled via sysctl.\n\nAlso remove an unneeded call to tcp_sack_reset() in\ncookie_check_timestamp: Both call sites (cookie_v4_check,\ncookie_v6_check) zero \"struct tcp_options_received\", hand it to\ntcp_parse_options() (which does not change tcp_opt-\u003enum_sacks/dsack)\nand then call cookie_check_timestamp().\n\nEven if num_sacks/dsacks were changed, the structure is allocated on\nthe stack and after cookie_check_timestamp returns only a few selected\nmembers are copied to the inet_request_sock.\n\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "317fe0e6c5dc9448bcef41a2e31fecfd3dba7f55", "tree": "c2a042e1c8bb96b7fdeadf658309ead1b6e8dabc", "parents": [ "fdb93f8ac39aa5902f3d264edd50dffcabfdd13b" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jun 16 04:52:13 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 16 11:55:39 2010 -0700" }, "message": "inetpeer: restore small inet_peer structures\n\nAddition of rcu_head to struct inet_peer added 16bytes on 64bit arches.\n\nThats a bit unfortunate, since old size was exactly 64 bytes.\n\nThis can be solved, using an union between this rcu_head an four fields,\nthat are normally used only when a refcount is taken on inet_peer.\nrcu_head is used only when refcnt\u003d-1, right before structure freeing.\n\nAdd a inet_peer_refcheck() function to check this assertion for a while.\n\nWe can bring back SLAB_HWCACHE_ALIGN qualifier in kmem cache creation.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "aa1039e73cc2cf834e99c09d2033d5d2675357b9", "tree": "0db06e4adddaf0f77b4e8de170710b74a17375e4", "parents": [ "7b34a4644b4342896e0c1967b8f953213ea4a990" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Jun 15 08:23:14 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 14:23:38 2010 -0700" }, "message": "inetpeer: RCU conversion\n\ninetpeer currently uses an AVL tree protected by an rwlock.\n\nIt\u0027s possible to make most lookups use RCU\n\n1) Add a struct rcu_head to struct inet_peer\n\n2) add a lookup_rcu_bh() helper to perform lockless and opportunistic\nlookup. This is a normal function, not a macro like lookup().\n\n3) Add a limit to number of links followed by lookup_rcu_bh(). This is\nneeded in case we fall in a loop.\n\n4) add an smp_wmb() in link_to_pool() right before node insert.\n\n5) make unlink_from_pool() use atomic_cmpxchg() to make sure it can take\nlast reference to an inet_peer, since lockless readers could increase\nrefcount, even while we hold peers.lock.\n\n6) Delay struct inet_peer freeing after rcu grace period so that\nlookup_rcu_bh() cannot crash.\n\n7) inet_getpeer() first attempts lockless lookup.\n Note this lookup can fail even if target is in AVL tree, but a\nconcurrent writer can let tree in a non correct form.\n If this attemps fails, lock is taken a regular lookup is performed\nagain.\n\n8) convert peers.lock from rwlock to a spinlock\n\n9) Remove SLAB_HWCACHE_ALIGN when peer_cachep is created, because\nrcu_head adds 16 bytes on 64bit arches, doubling effective size (64 -\u003e\n128 bytes)\nIn a future patch, this is probably possible to revert this part, if rcu\nfield is put in an union to share space with rid, ip_id_count, tcp_ts \u0026\ntcp_ts_stamp. These fields being manipulated only with refcnt \u003e 0.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "16fb62b6b4d57339a0ec931b3fb8c8d0ca6414e8", "tree": "a1041342f31a626baf3a08d09d5c81a65dd8ef28", "parents": [ "a3433f35a55f7604742cae620c6dc6edfc70db6a", "f9181f4ffc71d7b7dd1906c9a11d51d6659220ae" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 13:49:24 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 13:49:24 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6\n" }, { "commit": "ff61638105db6f5832ef8700436ba6aa6d3a2fda", "tree": "ff55ef6186cd46d87ca4e54efbbe82f5ecc68f1e", "parents": [ "685429623f88d84f98bd5daffc3c427c408740d4" ], "author": { "name": "Juuso Oikarinen", "email": "juuso.oikarinen@nokia.com", "time": "Wed Jun 09 09:51:52 2010 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jun 15 16:00:48 2010 -0400" }, "message": "mac80211: Fix ps-qos network latency handling\n\nThe ps-qos latency handling is broken. It uses predetermined latency values\nto select specific dynamic PS timeouts. With common AP configurations, these\nvalues overlap with beacon interval and are therefore essentially useless\n(for network latencies less than the beacon interval, PSM is disabled.)\n\nThis patch remedies the problem by replacing the predetermined network latency\nvalues with one high value (1900ms) which is used to go trigger full psm. For\nbackwards compatibility, the value 2000ms is still mapped to a dynamic ps\ntimeout of 100ms.\n\nCurrently also the mac80211 internal value for storing user space configured\ndynamic PSM values is incorrectly in the driver visible ieee80211_conf struct.\nMove it to the ieee80211_local struct.\n\nSigned-off-by: Juuso Oikarinen \u003cjuuso.oikarinen@nokia.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "a3433f35a55f7604742cae620c6dc6edfc70db6a", "tree": "4ce6d169e402c03a48319a9db4055cc31df00d42", "parents": [ "f350a0a87374418635689471606454abc7beaa3a" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Sat Jun 12 14:01:43 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 11:56:19 2010 -0700" }, "message": "tcp: unify tcp flag macros\n\nunify tcp flag macros: TCPHDR_FIN, TCPHDR_SYN, TCPHDR_RST, TCPHDR_PSH,\nTCPHDR_ACK, TCPHDR_URG, TCPHDR_ECE and TCPHDR_CWR. TCBCB_FLAG_* are replaced\nwith the corresponding TCPHDR_*.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\n----\n include/net/tcp.h | 24 ++++++-------\n net/ipv4/tcp.c | 8 ++--\n net/ipv4/tcp_input.c | 2 -\n net/ipv4/tcp_output.c | 59 ++++++++++++++++-----------------\n net/netfilter/nf_conntrack_proto_tcp.c | 32 ++++++-----------\n net/netfilter/xt_TCPMSS.c | 4 --\n 6 files changed, 58 insertions(+), 71 deletions(-)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f9181f4ffc71d7b7dd1906c9a11d51d6659220ae", "tree": "194f22e8216a1b9ee2c0dd019142202d73a7dc87", "parents": [ "0902b469bd25065aa0688c3cee6f11744c817e7c", "1ab6c163dee279559e3a62d774af7e4c4c9b4c67" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Jun 15 17:31:06 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Jun 15 17:31:06 2010 +0200" }, "message": "Merge branch \u0027master\u0027 of /repos/git/net-next-2.6\n\nConflicts:\n\tinclude/net/netfilter/xt_rateest.h\n\tnet/bridge/br_netfilter.c\n\tnet/netfilter/nf_conntrack_core.c\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "685429623f88d84f98bd5daffc3c427c408740d4", "tree": "d50f119094dd3fb7668f837dbe50857d11bb4fa3", "parents": [ "5ea096c0c85e80335889539899af9a4717976e0b" ], "author": { "name": "Juuso Oikarinen", "email": "juuso.oikarinen@nokia.com", "time": "Wed Jun 09 13:43:26 2010 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 14 15:42:31 2010 -0400" }, "message": "mac80211: Fix circular locking dependency in ARP filter handling\n\nThere is a circular locking dependency when configuring the\nhardware ARP filters on association, occurring when flushing the mac80211\nworkqueue. This is what happens:\n\n[ 92.026800] \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\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n[ 92.030507] [ INFO: possible circular locking dependency detected ]\n[ 92.030507] 2.6.34-04781-g2b2c009 #85\n[ 92.030507] -------------------------------------------------------\n[ 92.030507] modprobe/5225 is trying to acquire lock:\n[ 92.030507] ((wiphy_name(local-\u003ehw.wiphy))){+.+.+.}, at: [\u003cffffffff8105b5c0\u003e] flush_workq\nueue+0x0/0xb0\n[ 92.030507]\n[ 92.030507] but task is already holding lock:\n[ 92.030507] (rtnl_mutex){+.+.+.}, at: [\u003cffffffff812b9ce2\u003e] rtnl_lock+0x12/0x20\n[ 92.030507]\n[ 92.030507] which lock already depends on the new lock.\n[ 92.030507]\n[ 92.030507]\n[ 92.030507] the existing dependency chain (in reverse order) is:\n[ 92.030507]\n[ 92.030507] -\u003e #2 (rtnl_mutex){+.+.+.}:\n[ 92.030507] [\u003cffffffff810761fb\u003e] lock_acquire+0xdb/0x110\n[ 92.030507] [\u003cffffffff81341754\u003e] mutex_lock_nested+0x44/0x300\n[ 92.030507] [\u003cffffffff812b9ce2\u003e] rtnl_lock+0x12/0x20\n[ 92.030507] [\u003cffffffffa022d47c\u003e] ieee80211_assoc_done+0x6c/0xe0 [mac80211]\n[ 92.030507] [\u003cffffffffa022f2ad\u003e] ieee80211_work_work+0x31d/0x1280 [mac80211]\n\n[ 92.030507] -\u003e #1 ((\u0026local-\u003ework_work)){+.+.+.}:\n[ 92.030507] [\u003cffffffff810761fb\u003e] lock_acquire+0xdb/0x110\n[ 92.030507] [\u003cffffffff8105a51a\u003e] worker_thread+0x22a/0x370\n[ 92.030507] [\u003cffffffff8105ecc6\u003e] kthread+0x96/0xb0\n[ 92.030507] [\u003cffffffff81003a94\u003e] kernel_thread_helper+0x4/0x10\n[ 92.030507]\n[ 92.030507] -\u003e #0 ((wiphy_name(local-\u003ehw.wiphy))){+.+.+.}:\n[ 92.030507] [\u003cffffffff81075fdc\u003e] __lock_acquire+0x1c0c/0x1d50\n[ 92.030507] [\u003cffffffff810761fb\u003e] lock_acquire+0xdb/0x110\n[ 92.030507] [\u003cffffffff8105b60e\u003e] flush_workqueue+0x4e/0xb0\n[ 92.030507] [\u003cffffffffa023ff7b\u003e] ieee80211_stop_device+0x2b/0xb0 [mac80211]\n[ 92.030507] [\u003cffffffffa0231635\u003e] ieee80211_stop+0x3e5/0x680 [mac80211]\n\nThe locking in this case is quite complex. Fix the problem by rewriting the\nway the hardware ARP filter list is handled - i.e. make a copy of the address\nlist to the bss_conf struct, and provide that list to the hardware driver\nwhen needed.\n\nThe current patch will enable filtering also in promiscuous mode. This may need\nto be changed in the future.\n\nReported-by: Reinette Chatre \u003creinette.chatre@intel.com\u003e\nSigned-off-by: Juuso Oikarinen \u003cjuuso.oikarinen@nokia.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "fbd2c8dcbc69616d2e15b8a269a86b3a05d45aea", "tree": "4ae08bd02d5e0d317828300f3255824df732e4b3", "parents": [ "7b9a4b001971c89f35d55180867753a612d17458" ], "author": { "name": "Teemu Paasikivi", "email": "ext-teemu.3.paasikivi@nokia.com", "time": "Mon Jun 14 12:55:31 2010 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 14 15:39:34 2010 -0400" }, "message": "mac80211: Set basic rates while joining ibss network\n\nThis patch adds support to nl80211 and mac80211 to set basic rates when\njoining/creating ibss network.\n\nOriginal patch was posted by Johannes Berg on the linux-wireless posting list.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: Teemu Paasikivi \u003cext-teemu.3.paasikivi@nokia.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "85ad181ea78861f69b007599cec9e6ba33fcdf8a", "tree": "ea92b4f7aa6d09ee11ee865a11f6426e809468ba", "parents": [ "cfcdbde35e2b621cf56bedc38a3a81e8c28addb9" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu Jun 10 10:21:49 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 14 15:39:28 2010 -0400" }, "message": "mac80211: allow drivers to sleep in ampdu_action\n\nAllow drivers to sleep, and indicate this in\nthe documentation. ath9k has some locking I\ndon\u0027t understand, so keep it safe and disable\nBHs in it, all other drivers look fine with\nthe context change.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "5d22c89b9bea17a0e48e7534a9b237885e2c0809", "tree": "ed4f1de2efaa41368a2774adc0e07d903f65ed98", "parents": [ "a622ab72b4dcfdf53e24b16e9530cb876979a00c" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu Jun 10 10:21:40 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 14 15:39:27 2010 -0400" }, "message": "mac80211: remove non-irqsafe aggregation callbacks\n\nThe non-irqsafe aggregation start/stop done\ncallbacks are currently only used by ath9k_htc,\nand can cause callbacks into the driver again.\nThis might lead to locking issues, which will\nonly get worse as we modify locking. To avoid\ntrouble, remove the non-irqsafe versions and\nchange ath9k_htc to use those instead.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "c7de2cf053420d63bac85133469c965d4b1083e1", "tree": "b56f7c96d01e25f79fe1f9b7e5305265e92214d9", "parents": [ "cbd6890c5987cd7115147e1dd2c10d729afabb08" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jun 09 02:09:23 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 11 18:37:08 2010 -0700" }, "message": "pkt_sched: gen_kill_estimator() rcu fixes\n\ngen_kill_estimator() API is incomplete or not well documented, since\ncaller should make sure an RCU grace period is respected before\nfreeing stats_lock.\n\nThis was partially addressed in commit 5d944c640b4\n(gen_estimator: deadlock fix), but same problem exist for all\ngen_kill_estimator() users, if lock they use is not already RCU\nprotected.\n\nA code review shows xt_RATEEST.c, act_api.c, act_police.c have this\nproblem. Other are ok because they use qdisc lock, already RCU\nprotected.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "14599f1e341ee219abdd15f4eee5872d6f2d29f1", "tree": "3875181429010e58416ab34e6c06ef42de52e756", "parents": [ "d8d1f30b95a635dbd610dcc5eb641aca8f4768cf", "832c10fd733893f86c63bde1c65b005d5a2fe346" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 11 11:34:06 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 11 11:34:06 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6\n\nConflicts:\n\tdrivers/net/wireless/wl12xx/wl1271.h\n\tdrivers/net/wireless/wl12xx/wl1271_cmd.h\n" }, { "commit": "d8d1f30b95a635dbd610dcc5eb641aca8f4768cf", "tree": "71424d82a96facd5fcf05cc769ef2ba52b584aeb", "parents": [ "592fcb9dfafaa02dd0edc207bf5d3a0ee7a1f8df" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Thu Jun 10 23:31:35 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 10 23:31:35 2010 -0700" }, "message": "net-next: remove useless union keyword\n\nremove useless union keyword in rtable, rt6_info and dn_route.\n\nSince there is only one member in a union, the union keyword isn\u0027t useful.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "592fcb9dfafaa02dd0edc207bf5d3a0ee7a1f8df", "tree": "3b7bbd5313c7f564cf8087658c36d32a87ca79c4", "parents": [ "96b52e61be1ad4d4f8de39b9deaf253da804ea3b" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jun 09 16:21:07 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 10 22:47:08 2010 -0700" }, "message": "ip: ip_ra_control() rcu fix\n\ncommit 66018506e15b (ip: Router Alert RCU conversion) introduced RCU\nlookups to ip_call_ra_chain(). It missed proper deinit phase :\nWhen ip_ra_control() deletes an ip_ra_chain, it should make sure\nip_call_ra_chain() users can not start to use socket during the rcu\ngrace period. It should also delay the sock_put() after the grace\nperiod, or we risk a premature socket freeing and corruptions, as\nraw sockets are not rcu protected yet.\n\nThis delay avoids using expensive atomic_inc_not_zero() in\nip_call_ra_chain().\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "88e7594a9775e54dcd421cb246406dce62e48bee", "tree": "2a95adf9feb4c793d45d3ae86df05de4ca460d63", "parents": [ "bb69ae049fcc986fcd742eb90ca0d44a7a49c9f1" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Mon Jun 07 03:27:39 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 09 16:14:25 2010 -0700" }, "message": "phonet: use call_rcu for phonet device free\n\nUse call_rcu rather than synchronize_rcu.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b3c5163fe0193a74016dba1bb22491e0d1e9aaa4", "tree": "fc52d035b431969c034a1033e1c70803dd9ef219", "parents": [ "5bfddbd46a95c978f4d3c992339cbdf4f4b790a3" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jun 09 14:43:38 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Wed Jun 09 14:43:38 2010 +0200" }, "message": "netfilter: nf_conntrack: per_cpu untracking\n\nNOTRACK makes all cpus share a cache line on nf_conntrack_untracked\ntwice per packet, slowing down performance.\n\nThis patch converts it to a per_cpu variable.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "5bfddbd46a95c978f4d3c992339cbdf4f4b790a3", "tree": "9291ba4e1e3c7bf7ae8b5dfa8271e7127a6a6958", "parents": [ "339bb99e4a8ba1f8960eed21d50be808b35ad22a" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Jun 08 16:09:52 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Jun 08 16:09:52 2010 +0200" }, "message": "netfilter: nf_conntrack: IPS_UNTRACKED bit\n\nNOTRACK makes all cpus share a cache line on nf_conntrack_untracked\ntwice per packet. This is bad for performance.\n__read_mostly annotation is also a bad choice.\n\nThis patch introduces IPS_UNTRACKED bit so that we can use later a\nper_cpu untrack structure more easily.\n\nA new helper, nf_ct_untracked_get() returns a pointer to\nnf_conntrack_untracked.\n\nAnother one, nf_ct_untracked_status_or() is used by nf_nat_init() to add\nIPS_NAT_DONE_MASK bits to untracked status.\n\nnf_ct_is_untracked() prototype is changed to work on a nf_conn pointer.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "abe37c4b84502d6931e04e94c9c2c45b4da8c889", "tree": "2f89cecdd07faa27b8cc41944eb018e13c07d8b7", "parents": [ "90b726097ba0dcc1f9725182513e669a30e77db5" ], "author": { "name": "Johannes Berg", "email": "johannes@sipsolutions.net", "time": "Mon Jun 07 11:12:27 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jun 08 09:31:21 2010 -0400" }, "message": "wireless: fix kernel-doc\n\nFix a whole bunch of kernel-doc warnings\nand errors that crop up when running it on\nmac80211 and cfg80211; the latter isn\u0027t\nnormally done so lots of bit-rot happened.\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "339bb99e4a8ba1f8960eed21d50be808b35ad22a", "tree": "077f679c919b00331569622e035a822e94492377", "parents": [ "e12f8e29a8526172b7715881503bae636d60bdd8" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Jun 08 14:11:19 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Jun 08 14:11:19 2010 +0200" }, "message": "netfilter: xt_rateest: Better struct xt_rateest layout\n\nWe currently dirty two cache lines in struct xt_rateest, this hurts SMP\nperformance.\n\nThis patch moves lock/bstats/rstats at beginning of structure so that\nthey share a single cache line.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "66018506e15bea62de4eefc3298f170b4bfcf5ef", "tree": "d2dbf5c06e317b85f75b946a1b63ed0917d0382a", "parents": [ "8b37ef0a1f6c2401fea3536facfa21191936bd6c" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Jun 07 03:12:08 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 07 21:25:21 2010 -0700" }, "message": "ip: Router Alert RCU conversion\n\nStraightforward conversion to RCU.\n\nOne rwlock becomes a spinlock, and is static.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a8b690f98baf9fb1902b8eeab801351ea603fa3a", "tree": "b48940354a3236d33e33ca4f1b9169c9545cd551", "parents": [ "83038a2a7062f6cbbdcfaff47284566f060a5af1" ], "author": { "name": "Tom Herbert", "email": "therbert@google.com", "time": "Mon Jun 07 00:43:42 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 07 00:43:42 2010 -0700" }, "message": "tcp: Fix slowness in read /proc/net/tcp\n\nThis patch address a serious performance issue in reading the\nTCP sockets table (/proc/net/tcp).\n\nReading the full table is done by a number of sequential read\noperations. At each read operation, a seek is done to find the\nlast socket that was previously read. This seek operation requires\nthat the sockets in the table need to be counted up to the current\nfile position, and to count each of these requires taking a lock for\neach non-empty bucket. The whole algorithm is O(n^2).\n\nThe fix is to cache the last bucket value, offset within the bucket,\nand the file position returned by the last read operation. On the\nnext sequential read, the bucket and offset are used to find the\nlast read socket immediately without needing ot scan the previous\nbuckets the table. This algorithm t read the whole table is O(n).\n\nThe improvement offered by this patch is easily show by performing\ncat\u0027ing /proc/net/tcp on a machine with a lot of connections. With\nabout 182K connections in the table, I see the following:\n\n- Without patch\ntime cat /proc/net/tcp \u003e /dev/null\n\nreal\t1m56.729s\nuser\t0m0.214s\nsys\t1m56.344s\n\n- With patch\ntime cat /proc/net/tcp \u003e /dev/null\n\nreal\t0m0.894s\nuser\t0m0.290s\nsys\t0m0.594s\n\nSigned-off-by: Tom Herbert \u003ctherbert@google.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eedc765ca4b19a41cf0b921a492ac08d640060d1", "tree": "95c566c6238cc953e1e336115d2daafe8bcb388f", "parents": [ "e59d44df46edaafb6b637e98d046775524b31104", "024a07bacf8287a6ddfa83e9d5b951c5e8b4070e" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jun 06 17:42:02 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jun 06 17:42:02 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/sfc/net_driver.h\n\tdrivers/net/sfc/siena.c\n" }, { "commit": "8764ab2ca7ab5055e1ca80f9cfa4970c34acb804", "tree": "ca0a6ea6c6fabbb98220f5b700981f7f23855f42", "parents": [ "4f4aeb7fd0f7e6ca008bb2147ba36cee13876595" ], "author": { "name": "Steffen Klassert", "email": "steffen.klassert@secunet.com", "time": "Fri Jun 04 01:57:38 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 04 15:56:00 2010 -0700" }, "message": "net: check for refcount if pop a stacked dst_entry\n\nxfrm triggers a warning if dst_pop() drops a refcount\non a noref dst. This patch changes dst_pop() to\nskb_dst_pop(). skb_dst_pop() drops the refcnt only\non a refcounted dst. Also we don\u0027t clone the child\ndst_entry, so it is not refcounted and we can use\nskb_dst_set_noref() in xfrm_output_one().\n\nSigned-off-by: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "38a6cc7538d3c44b76f9dcea607a171adcc0208e", "tree": "6e32157add4ba09c4a35c5ec6a2f4b3bce765268", "parents": [ "abd984e6117e72e17073fd0a81a477e43b4580f5" ], "author": { "name": "Sujith", "email": "Sujith.Manoharan@atheros.com", "time": "Wed May 19 11:32:30 2010 +0530" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jun 04 15:32:25 2010 -0400" }, "message": "mac80211: Remove deprecated sta_notify commands\n\nSTA_NOTIFY_ADD and STA_NOTIFY_REMOVE have no users anymore,\nand station addition/removal are indicated to drivers\nusing sta_add() and sta_remove(), which can sleep.\n\nSigned-off-by: Sujith \u003cSujith.Manoharan@atheros.com\u003e\nAcked-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "6a8579d0e62c0eac428184ce45e86bc46677724a", "tree": "192d3adc84985598ad6006df43d246adce002f7e", "parents": [ "2b2c009ecf71f4c66ff8420b63dddbc9737e04e3" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu May 27 14:41:07 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Jun 03 14:10:45 2010 -0400" }, "message": "mac80211: clean up ieee80211_stop_tx_ba_session\n\nThere\u0027s no sense in letting anything but internal\nmac80211 functions set the initiator to anything\nbut WLAN_BACK_INITIATOR, since WLAN_BACK_RECIPIENT\nis only valid when we have received a frame from\nthe peer, which we react to directly in mac80211.\n\nThe debugfs code I recently added got this wrong\nas well.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "2b2c009ecf71f4c66ff8420b63dddbc9737e04e3", "tree": "62f93194843ecf92d871d34963450c03d165af08", "parents": [ "095dfdb0c479661f437b24b85e31f0d0b841eab6" ], "author": { "name": "Juuso Oikarinen", "email": "juuso.oikarinen@nokia.com", "time": "Thu May 27 15:32:13 2010 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Jun 03 14:10:45 2010 -0400" }, "message": "mac80211: Add support for hardware ARP query filtering\n\nSome hardware allow extended filtering of ARP frames not intended for\nthe host. To perform such filtering, the hardware needs to know the current\nIP address(es) of the host, bound to its interface.\n\nAdd support for ARP filtering to mac80211 by adding a new op to the driver\ninterface, allowing to configure the current IP addresses. This op is called\nupon association with the currently configured address(es), and when\nassociated whenever the IP address(es) change.\n\nThis patch adds configuration of IPv4 addresses only, as IPv6 addresses don\u0027t\nneed ARP filtering.\n\nSigned-off-by: Juuso Oikarinen \u003cjuuso.oikarinen@nokia.com\u003e\nReviewed-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "095dfdb0c479661f437b24b85e31f0d0b841eab6", "tree": "26a7e5f07c7545f179a501f55353560fe540e544", "parents": [ "3a4d4aa2d38e5305b5e93dffdc9dd2f975129328" ], "author": { "name": "Johannes Berg", "email": "johannes@sipsolutions.net", "time": "Wed May 26 17:19:25 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Jun 03 14:10:44 2010 -0400" }, "message": "mac80211: remove tx status ampdu_ack_map\n\nThere\u0027s a single use of this struct member, but\nas it is write-only it clearly not necessary.\nThus we can free up some space here, even if we\ndon\u0027t need it right now it seems pointless to\ncarry around the variable.\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "bc10502dba37d3b210efd9f3867212298f13b78e", "tree": "af4542eaab79cd509244578f839167f16f3ab02d", "parents": [ "ba2d3587912f82d1ab4367975b1df460db60fb1e" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Jun 03 03:21:52 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 03 03:21:52 2010 -0700" }, "message": "net: use __packed annotation\n\ncleanup patch.\n\nUse new __packed annotation in net/ and include/\n(except netfilter)\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "252aa631f88080920a7083ac5a5844ffc5463629", "tree": "e1482e9cf7c7230acb9ed33c8a24687e48dc7aa1", "parents": [ "4f424867dd4752d457458fec29ca57ce5d7dc4ac" ], "author": { "name": "Johannes Berg", "email": "johannes@sipsolutions.net", "time": "Wed May 19 12:17:12 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jun 02 16:13:27 2010 -0400" }, "message": "cfg80211: make action channel type optional\n\nWhen sending action frames, we want to verify\nthat we do that on the correct channel. However,\nchecking the channel type in addition can get in\nthe way, since the channel type could change on\nthe fly during an association, and it\u0027s not\nuseful to have the channel type anyway since it\nhas no effect on the transmission. Therefore,\nmake it optional to specify so that if wanted,\nit can still be checked, but is not required.\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "77c2061d10a408d0220c2b0e7faefe52d9c41008", "tree": "e2b0ad1abb38cca9e0b9890836fc4290c28656b0", "parents": [ "aed8e1f9910b216ab3e14cb286c431c870f9b78f" ], "author": { "name": "Walter Goldens", "email": "goldenstranger@yahoo.com", "time": "Tue May 18 04:44:54 2010 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jun 02 16:13:18 2010 -0400" }, "message": "wireless: fix several minor description typos\n\nSigned-off-by: Walter Goldens \u003cgoldenstranger@yahoo.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "20c59de2e6b6bc74bbf714dcd4e720afe8d516cf", "tree": "45e5c62e286368f8259b844cb7cf796d19066fb0", "parents": [ "d92222e27fdc98d73df25f3d49fb1ff3a3369bec" ], "author": { "name": "Arnaud Ebalard", "email": "arno@natisbad.org", "time": "Tue Jun 01 21:35:01 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 02 07:08:31 2010 -0700" }, "message": "ipv6: Refactor update of IPv6 flowi destination address for srcrt (RH) option\n\nThere are more than a dozen occurrences of following code in the\nIPv6 stack:\n\n if (opt \u0026\u0026 opt-\u003esrcrt) {\n struct rt0_hdr *rt0 \u003d (struct rt0_hdr *) opt-\u003esrcrt;\n ipv6_addr_copy(\u0026final, \u0026fl.fl6_dst);\n ipv6_addr_copy(\u0026fl.fl6_dst, rt0-\u003eaddr);\n final_p \u003d \u0026final;\n }\n\nReplace those with a helper. Note that the helper overrides final_p\nin all cases. This is ok as final_p was previously initialized to\nNULL when declared.\n\nSigned-off-by: Arnaud Ebalard \u003carno@natisbad.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c2d9ba9bce8d7323ca96f239e1f505c14d6244fb", "tree": "7a184eefa2e48e6aa15cdf3aefb6ccf2fb834320", "parents": [ "c6b20d941b08941bece53bc3d857beb1fb25fffc" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Jun 01 06:51:19 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 02 05:16:23 2010 -0700" }, "message": "net: CONFIG_NET_NS reduction\n\nUse read_pnet() and write_pnet() to reduce number of ifdef CONFIG_NET_NS\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "79640a4ca6955e3ebdb7038508fa7a0cd7fa5527", "tree": "128a3d1e9d173963070d49cc64ad38d8eb67dd7b", "parents": [ "097811bb48c7837db94d7fe5d94f0f4b5e19e78c" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jun 02 05:09:29 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 02 05:09:29 2010 -0700" }, "message": "net: add additional lock to qdisc to increase throughput\n\nWhen many cpus compete for sending frames on a given qdisc, the qdisc\nspinlock suffers from very high contention.\n\nThe cpu owning __QDISC_STATE_RUNNING bit has same priority to acquire\nthe lock, and cannot dequeue packets fast enough, since it must wait for\nthis lock for each dequeued packet.\n\nOne solution to this problem is to force all cpus spinning on a second\nlock before trying to get the main lock, when/if they see\n__QDISC_STATE_RUNNING already set.\n\nThe owning cpu then compete with at most one other cpu for the main\nlock, allowing for higher dequeueing rate.\n\nBased on a previous patch from Alexander Duyck. I added the heuristic to\navoid the atomic in fast path, and put the new lock far away from the\ncache line used by the dequeue worker. Also try to release the busylock\nlock as late as possible.\n\nTests with following script gave a boost from ~50.000 pps to ~600.000\npps on a dual quad core machine (E5450 @3.00GHz), tg3 driver.\n(A single netperf flow can reach ~800.000 pps on this platform)\n\nfor j in `seq 0 3`; do\n for i in `seq 0 7`; do\n netperf -H 192.168.0.1 -t UDP_STREAM -l 60 -N -T $i -- -m 6 \u0026\n done\ndone\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: Alexander Duyck \u003calexander.h.duyck@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "371121057607e3127e19b3fa094330181b5b031e", "tree": "d0803bdf06a50fdad88435588f66b2f0f4c95008", "parents": [ "bc135b23d01acf7ee926aaf75b0020c86d3869f9" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jun 02 03:24:13 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 02 03:24:13 2010 -0700" }, "message": "net: QDISC_STATE_RUNNING dont need atomic bit ops\n\n__QDISC_STATE_RUNNING is always changed while qdisc lock is held.\n\nWe can avoid two atomic operations in xmit path, if we move this bit in\na new __state container.\n\nLocation of this __state container is carefully chosen so that fast path\nonly dirties one qdisc cache line.\n\nTHROTTLED bit could later be moved into this __state location too, to\navoid dirtying first qdisc cache line.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bc135b23d01acf7ee926aaf75b0020c86d3869f9", "tree": "29b338a0c54c00880720d808f2fede7c605f516d", "parents": [ "9f26f547a587ce9015ffe495d2af604580b4b784" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jun 02 03:23:51 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 02 03:23:51 2010 -0700" }, "message": "net: Define accessors to manipulate QDISC_STATE_RUNNING\n\nDefine three helpers to manipulate QDISC_STATE_RUNNIG flag, that a\nsecond patch will move on another location.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b1faf5666438090a4dc4fceac8502edc7788b7e3", "tree": "f90808dea27cc38aff6feed1782e2a5666fa6ee9", "parents": [ "bc284f94f84c3d76e49c6f3df9028c503f9589d9" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon May 31 23:44:05 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 31 23:44:05 2010 -0700" }, "message": "net: sock_queue_err_skb() dont mess with sk_forward_alloc\n\nCorrect sk_forward_alloc handling for error_queue would need to use a\nbacklog of frames that softirq handler could not deliver because socket\nis owned by user thread. Or extend backlog processing to be able to\nprocess normal and error packets.\n\nAnother possibility is to not use mem charge for error queue, this is\nwhat I implemented in this patch.\n\nNote: this reverts commit 29030374\n(net: fix sk_forward_alloc corruptions), since we dont need to lock\nsocket anymore.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "72da3bc0cb3e82bd95f278a0c5c988e506e56d13", "tree": "db4bf9f9265be3216dfb3d65b49e53d8448e13e2", "parents": [ "8507bb0062bff1431bbcce921efe5cd1186fcff2", "045de01a174d9f0734f657eb4b3313d89b4fd5ad" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 28 10:18:40 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 28 10:18:40 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (22 commits)\n netlink: bug fix: wrong size was calculated for vfinfo list blob\n netlink: bug fix: don\u0027t overrun skbs on vf_port dump\n xt_tee: use skb_dst_drop()\n netdev/fec: fix ifconfig eth0 down hang issue\n cnic: Fix context memory init. on 5709.\n drivers/net: Eliminate a NULL pointer dereference\n drivers/net/hamradio: Eliminate a NULL pointer dereference\n be2net: Patch removes redundant while statement in loop.\n ipv6: Add GSO support on forwarding path\n net: fix __neigh_event_send()\n vhost: fix the memory leak which will happen when memory_access_ok fails\n vhost-net: fix to check the return value of copy_to/from_user() correctly\n vhost: fix to check the return value of copy_to/from_user() correctly\n vhost: Fix host panic if ioctl called with wrong index\n net: fix lock_sock_bh/unlock_sock_bh\n net/iucv: Add missing spin_unlock\n net: ll_temac: fix checksum offload logic\n net: ll_temac: fix interrupt bug when interrupt 0 is used\n sctp: dubious bitfields in sctp_transport\n ipmr: off by one in __ipmr_fill_mroute()\n ...\n" }, { "commit": "8a74ad60a546b13bd1096b2a61a7a5c6fd9ae17c", "tree": "3110e7e59883597b5d0f617e8507e15b8f965f3f", "parents": [ "a56635a56f2afb3d22d9ce07e8f8d69537416b2d" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed May 26 19:20:18 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 27 00:30:53 2010 -0700" }, "message": "net: fix lock_sock_bh/unlock_sock_bh\n\nThis new sock lock primitive was introduced to speedup some user context\nsocket manipulation. But it is unsafe to protect two threads, one using\nregular lock_sock/release_sock, one using lock_sock_bh/unlock_sock_bh\n\nThis patch changes lock_sock_bh to be careful against \u0027owned\u0027 state.\nIf owned is found to be set, we must take the slow path.\nlock_sock_bh() now returns a boolean to say if the slow path was taken,\nand this boolean is used at unlock_sock_bh time to call the appropriate\nunlock function.\n\nAfter this change, BH are either disabled or enabled during the\nlock_sock_bh/unlock_sock_bh protected section. This might be misleading,\nso we rename these functions to lock_sock_fast()/unlock_sock_fast().\n\nReported-by: Anton Blanchard \u003canton@samba.org\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nTested-by: Anton Blanchard \u003canton@samba.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ff937938e7781b2c1bffce0a5400af308e3946d5", "tree": "70a5ccf25d967d93f4a47ab30d25b0b81e538cd5", "parents": [ "ed0f160ad674407adb3aba499444f71c83289c63" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Wed May 26 00:40:11 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 26 00:40:11 2010 -0700" }, "message": "sctp: dubious bitfields in sctp_transport\n\nSparse complains because these one-bit bitfields are signed.\n include/net/sctp/structs.h:879:24: error: dubious one-bit signed bitfield\n include/net/sctp/structs.h:889:31: error: dubious one-bit signed bitfield\n include/net/sctp/structs.h:895:26: error: dubious one-bit signed bitfield\n include/net/sctp/structs.h:898:31: error: dubious one-bit signed bitfield\n include/net/sctp/structs.h:901:27: error: dubious one-bit signed bitfield\n\nIt doesn\u0027t cause a problem in the current code, but it would be better\nto clean it up. This was introduced by c0058a35aacc7: \"sctp: Save some\nroom in the sctp_transport by using bitfields\".\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ea16f912a6ad9fe43131a2e2a108f089c432d510", "tree": "ebd5a0663fb5c8fd030fe84a05fb3fb09382b822", "parents": [ "f925b1303e0672effc78547353bd2ddfe11f5b5f" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue May 25 18:53:57 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 25 18:53:57 2010 -0700" }, "message": "cls_cgroup: Initialise classid when module is absent\n\nWhen the cls_cgroup module is not loaded, task_cls_classid will\nreturn an uninitialised classid instead of zero.\n\nReported-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b1cdc4670b9508fcd47a15fbd12f70d269880b37", "tree": "fea9e2650170886d539488f8b1e064f6ca60ad36", "parents": [ "ce7d0226198aac42ed311dd2783232adc16b296d", "f925b1303e0672effc78547353bd2ddfe11f5b5f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 16:59:51 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 16:59:51 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (63 commits)\n drivers/net/usb/asix.c: Fix pointer cast.\n be2net: Bug fix to avoid disabling bottom half during firmware upgrade.\n proc_dointvec: write a single value\n hso: add support for new products\n Phonet: fix potential use-after-free in pep_sock_close()\n ath9k: remove VEOL support for ad-hoc\n ath9k: change beacon allocation to prefer the first beacon slot\n sock.h: fix kernel-doc warning\n cls_cgroup: Fix build error when built-in\n macvlan: do proper cleanup in macvlan_common_newlink() V2\n be2net: Bug fix in init code in probe\n net/dccp: expansion of error code size\n ath9k: Fix rx of mcast/bcast frames in PS mode with auto sleep\n wireless: fix sta_info.h kernel-doc warnings\n wireless: fix mac80211.h kernel-doc warnings\n iwlwifi: testing the wrong variable in iwl_add_bssid_station()\n ath9k_htc: rare leak in ath9k_hif_usb_alloc_tx_urbs()\n ath9k_htc: dereferencing before check in hif_usb_tx_cb()\n rt2x00: Fix rt2800usb TX descriptor writing.\n rt2x00: Fix failed SLEEP-\u003eAWAKE and AWAKE-\u003eSLEEP transitions.\n ...\n" }, { "commit": "a261af927df64523925c98369106de15af9d7b5e", "tree": "3c8fb8be59b8a4733eb5b63ecf567976185c9f58", "parents": [ "acfbe96a3035639619a6533e04d88ed4ef9ccb61", "a65e4cb402b5f3e120570ba1faca4354d47e8f2f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 25 13:15:11 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 25 13:15:11 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "4be929be34f9bdeffa40d815d32d7d60d2c7f03b", "tree": "4d2c6e2b8ef766e565e2e050ee151de2e02081d3", "parents": [ "940370fc86b920b51a34217a1facc3e9e97c2456" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Mon May 24 14:33:03 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:02 2010 -0700" }, "message": "kernel-wide: replace USHORT_MAX, SHORT_MAX and SHORT_MIN with USHRT_MAX, SHRT_MAX and SHRT_MIN\n\n- C99 knows about USHRT_MAX/SHRT_MAX/SHRT_MIN, not\n USHORT_MAX/SHORT_MAX/SHORT_MIN.\n\n- Make SHRT_MIN of type s16, not int, for consistency.\n\n[akpm@linux-foundation.org: fix drivers/dma/timb_dma.c]\n[akpm@linux-foundation.org: fix security/keys/keyring.c]\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nAcked-by: WANG Cong \u003cxiyou.wangcong@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "acfbe96a3035639619a6533e04d88ed4ef9ccb61", "tree": "9d0b93aef75b2a11acff9b4d240d5f3e9896f3e0", "parents": [ "937eada45fa7bd233dfa59bbd8c0b436b02b6491" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Mon May 24 23:54:18 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 24 23:54:18 2010 -0700" }, "message": "sock.h: fix kernel-doc warning\n\nFix sock.h kernel-doc warning:\nWarning(include/net/sock.h:1438): No description found for parameter \u0027wq\u0027\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "937eada45fa7bd233dfa59bbd8c0b436b02b6491", "tree": "9cba6c42ae469d6f157a737d706d5edec08b37d8", "parents": [ "f16d3d57486cd079b29ae7a6c3b31c90e69c9c44" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon May 24 23:53:37 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 24 23:53:37 2010 -0700" }, "message": "cls_cgroup: Fix build error when built-in\n\nThere is a typo in cgroup_cls_state when cls_cgroup is built-in.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4e8998f09bd777f99ea3dae6f87f2c367979e6c0", "tree": "207b06ef542375db76ac7c35ce63da019fc7a4f0", "parents": [ "96900c751dd16fc9455e7184cbe8758ac7aa7e79" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Fri May 21 11:28:33 2010 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon May 24 15:07:42 2010 -0400" }, "message": "wireless: fix mac80211.h kernel-doc warnings\n\nFix kernel-doc warnings in mac80211.h:\n\nWarning(include/net/mac80211.h:838): No description found for parameter \u0027ap_addr\u0027\nWarning(include/net/mac80211.h:1726): No description found for parameter \u0027get_survey\u0027\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "3dc3fc52ea1537f5f37ab301d2b1468a0e79988f", "tree": "1d958b8f26d09c26ff4e3b05c4126e75c8f799da", "parents": [ "617f3d0d71e2eae4d8d475cefe9363b140e52083" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon May 24 13:36:37 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon May 24 14:59:27 2010 -0400" }, "message": "Revert \"ath9k: Group Key fix for VAPs\"\n\nThis reverts commit 03ceedea972a82d343fa5c2528b3952fa9e615d5.\n\nThis patch was reported to cause a regression in which connectivity is\nlost and cannot be reestablished after a suspend/resume cycle.\n\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "a69eee4988752c7196677958b4ed8f4c2b28499a", "tree": "b676b8a05e10f5003d17091fc7085fad29910702", "parents": [ "3e766fd41ddc31c47ec5b2840c6a45803d35ff40" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 24 07:45:43 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 24 07:45:43 2010 -0700" }, "message": "Revert \"ath9k: Group Key fix for VAPs\"\n\nThis reverts commit 03ceedea972a82d343fa5c2528b3952fa9e615d5, since it\nbreaks resume from suspend-to-ram on Rafael\u0027s Acer Ferrari One.\nNetworkManager thinks everything is ok, but it can\u0027t connect to the AP\nto get an IP address after the resume.\n\nIn fact, it even breaks resume for non-ath9k chipsets: reverting it also\nfixes Rafael\u0027s Toshiba Protege R500 with the iwlagn driver. As Johannes\nsays:\n\n \"Indeed, this patch needs to be reverted. That mac80211 change is wrong\n and completely unnecessary.\"\n\nReported-and-requested-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nCc: Daniel Yingqiang Ma \u003cyma.cool@gmail.com\u003e\nCc: John W. Linville \u003clinville@tuxdriver.com\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f845172531fb7410c7fb7780b1a6e51ee6df7d52", "tree": "ef1030d0ad9d9dbc8fe800a145c587f04be50ade", "parents": [ "eda6e6f86b5f95b982ac7ebf7cf5be2a29a291e9" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon May 24 00:12:34 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 24 00:12:34 2010 -0700" }, "message": "cls_cgroup: Store classid in struct sock\n\nUp until now cls_cgroup has relied on fetching the classid out of\nthe current executing thread. This runs into trouble when a packet\nprocessing is delayed in which case it may execute out of another\nthread\u0027s context.\n\nFurthermore, even when a packet is not delayed we may fail to\nclassify it if soft IRQs have been disabled, because this scenario\nis indistinguishable from one where a packet unrelated to the\ncurrent thread is processed by a real soft IRQ.\n\nIn fact, the current semantics is inherently broken, as a single\nskb may be constructed out of the writes of two different tasks.\nA different manifestation of this problem is when the TCP stack\ntransmits in response of an incoming ACK. This is currently\nunclassified.\n\nAs we already have a concept of packet ownership for accounting\npurposes in the skb-\u003esk pointer, this is a natural place to store\nthe classid in a persistent manner.\n\nThis patch adds the cls_cgroup classid in struct sock, filling up\nan existing hole on 64-bit :)\n\nThe value is set at socket creation time. So all sockets created\nvia socket(2) automatically gains the ID of the thread creating it.\nWhenever another process touches the socket by either reading or\nwriting to it, we will change the socket classid to that of the\nprocess if it has a valid (non-zero) classid.\n\nFor sockets created on inbound connections through accept(2), we\ninherit the classid of the original listening socket through\nsk_clone, possibly preceding the actual accept(2) call.\n\nIn order to minimise risks, I have not made this the authoritative\nclassid. For now it is only used as a backup when we execute\nwith soft IRQs disabled. Once we\u0027re completely happy with its\nsemantics we can use it as the sole classid.\n\nFootnote: I have rearranged the error path on cls_group module\ncreation. If we didn\u0027t do this, then there is a window where\nsomeone could create a tc rule using cls_group before the cgroup\nsubsystem has been registered.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7aecf4944f2c05aafb73b4820e469c74b4ec8517", "tree": "b3237c96401a0f35c76798c1b04b19eef129a6da", "parents": [ "9e4b816bc31962ebbb8784d602acd5fa25a08ad8" ], "author": { "name": "Sjur Braendeland", "email": "sjur.brandeland@stericsson.com", "time": "Fri May 21 02:16:08 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 23 23:57:41 2010 -0700" }, "message": "caif: Bugfix - use standard Linux lists\n\nDiscovered bug when running high number of parallel connect requests.\nReplace buggy home brewed list with linux/list.h.\n\nSigned-off-by: Sjur Braendeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4681dbdacb5cdc4d3273c3a97a1858d6e00a5fe7", "tree": "e29be0d9f98caa7ee176cf0a1a3c3a22fca4934d", "parents": [ "bda8e7752063cdbdd1d308bc1705400a8cec1aeb" ], "author": { "name": "Sripathi Kodi", "email": "sripathik@in.ibm.com", "time": "Thu Mar 25 12:47:26 2010 +0000" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Fri May 21 16:44:34 2010 -0500" }, "message": "9p: add 9P2000.L rename operation\n\nI made a V2 of this patch on top of my patches for VFS switches.\nAll the changes were due to change in some offsets.\n\nrename - change name of file or directory\n\nsize[4] Trename tag[2] fid[4] newdirfid[4] name[s]\nsize[4] Rrename tag[2]\n\nThe rename message is used to change the name of a file, possibly moving it\nto a new directory. The 9P wstat message can only rename a file within the\nsame directory.\n\nSigned-off-by: Jim Garlick \u003cgarlick@llnl.gov\u003e\nSigned-off-by: Sripathi Kodi \u003csripathik@in.ibm.com\u003e\nSigned-off-by: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\n" }, { "commit": "bda8e7752063cdbdd1d308bc1705400a8cec1aeb", "tree": "cfc751da04d3ffe46d7b7e935f7ceb21b1f8a8d0", "parents": [ "9b6533c9b331ddbba9a40c972d82222ecffbc359" ], "author": { "name": "Sripathi Kodi", "email": "sripathik@in.ibm.com", "time": "Thu Mar 25 12:45:30 2010 +0000" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Fri May 21 16:44:33 2010 -0500" }, "message": "9p: add 9P2000.L statfs operation\n\nI made a V2 of this patch on top of my patches for VFS switches. The\nchange was adding v9fs_statfs pointer to v9fs_super_ops_dotl\ninstead of v9fs_super_ops.\n\nstatfs - get file system statistics\n\nsize[4] Tstatfs tag[2] fid[4]\nsize[4] Rstatfs tag[2] type[4] bsize[4] blocks[8] bfree[8] bavail[8]\n files[8] ffree[8] fsid[8] namelen[4]\n\nThe statfs message is used to request file system information returned\nby the statfs(2) system call, which is used by df(1) to report file\nsystem and disk space usage.\n\nSigned-off-by: Jim Garlick \u003cgarlick@llnl.gov\u003e\nSigned-off-by: Sripathi Kodi \u003csripathik@in.ibm.com\u003e\nSigned-off-by: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\n" }, { "commit": "41499bd6766314079417d1467c466d31b8612fec", "tree": "5ce777cd47603977ee55059891c67b8a420e05a1", "parents": [ "622e0ca1cd4d459f5af4f2c65f4dc0dd823cb4c3", "7ea7b858f4bc4fa1645f1327cf9e72c93981aa58" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 20 23:12:18 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 20 23:12:18 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6\n" }, { "commit": "fc350777c705a39a312728ac5e8a6f164a828f5d", "tree": "62aa121cd62e416a505d35de9b5d77ab8ae89f66", "parents": [ "a1d7c1b4b8dfbc5ecadcff9284d64bb6ad4c0196" ], "author": { "name": "Joerg Marx", "email": "joerg.marx@secunet.com", "time": "Thu May 20 15:55:30 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu May 20 15:55:30 2010 +0200" }, "message": "netfilter: nf_conntrack: fix a race in __nf_conntrack_confirm against nf_ct_get_next_corpse()\n\nThis race was triggered by a \u0027conntrack -F\u0027 command running in parallel\nto the insertion of a hash for a new connection. Losing this race led to\na dead conntrack entry effectively blocking traffic for a particular\nconnection until timeout or flushing the conntrack hashes again.\nNow the check for an already dying connection is done inside the lock.\n\nSigned-off-by: Joerg Marx \u003cjoerg.marx@secunet.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "e9d3e084975869754d16f639378675c353560be9", "tree": "3f933fea12746b24247ccec79cb4a1fbdf50833b", "parents": [ "e29f5dbc9e9719af158a960e5c1d16f32740ebc3" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue May 18 15:36:06 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 18 15:36:06 2010 -0700" }, "message": "ipv6: Replace inet6_ifaddr-\u003edead with state\n\nThis patch replaces the boolean dead flag on inet6_ifaddr with\na state enum. This allows us to roll back changes when deleting\nan address according to whether DAD has completed or not.\n\nThis patch only adds the state field and does not change the logic.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d19d56ddc88e7895429ef118db9c83c7bbe3ce6a", "tree": "c0db76f3527c88c95a8793c871f62d628fb3fd1d", "parents": [ "de213e5eedecdfb1b1eea7e6be28bc64cac5c078" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon May 17 22:36:55 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 17 22:36:55 2010 -0700" }, "message": "net: Introduce skb_tunnel_rx() helper\n\nskb rxhash should be cleared when a skb is handled by a tunnel before\nbeing delivered again, so that correct packet steering can take place.\n\nThere are other cleanups and accounting that we can factorize in a new\nhelper, skb_tunnel_rx()\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "820ae8a80eb59962aefbbd4908dfe144ec0f9edb", "tree": "6c0f7356afff14e1c7d266de644810cd2de7caa9", "parents": [ "380fefb2ddabd4cd5f14dbe090481f0544e65078", "6fe70aae0d128339febfabc073ba4c4a03de4f45" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 17 21:09:11 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 17 21:09:11 2010 -0700" }, "message": "Merge branch \u0027for-davem\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6\n" }, { "commit": "37cda78741ecdbf45dd9b64e4c99dbdb11b47b46", "tree": "ee213ce9347bc7434717092e600f970d919ceceb", "parents": [ "b7792e34cba641c49cd436d42fbfd2a632ff39d3" ], "author": { "name": "andrew hendry", "email": "andrew.hendry@gmail.com", "time": "Sun May 16 23:00:27 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 17 17:39:27 2010 -0700" }, "message": "X25: Move accept approve flag to bitfield\n\nMoves the x25 accept approve flag from char into bitfield.\n\nSigned-off-by: Andrew Hendry \u003candrew.hendry@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b7792e34cba641c49cd436d42fbfd2a632ff39d3", "tree": "f880770915e06678b287f1c6c7d16702677c6aef", "parents": [ "cb863ffd4a04f9f8619f52c01d472a64ccc716bd" ], "author": { "name": "andrew hendry", "email": "andrew.hendry@gmail.com", "time": "Sun May 16 23:00:02 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 17 17:39:27 2010 -0700" }, "message": "X25: Move interrupt flag to bitfield\n\nMoves the x25 interrupt flag from char into bitfield.\n\nSigned-off-by: Andrew Hendry \u003candrew.hendry@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cb863ffd4a04f9f8619f52c01d472a64ccc716bd", "tree": "c65de60a93641c36057b1e10accda36a54f64d76", "parents": [ "c89af1a30870e04986e2c8d24c0c765de0935f4b" ], "author": { "name": "andrew hendry", "email": "andrew.hendry@gmail.com", "time": "Sun May 16 22:59:41 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 17 17:39:26 2010 -0700" }, "message": "X25: Move qbit flag to bitfield\n\nMoves the X25 q bit flag from char into a bitfield to allow BKL cleanup.\n\nSigned-off-by: Andrew Hendry \u003candrew.hendry@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "407eadd996dc62a827db85f1d0c286a98fd5d336", "tree": "199b695cd045650b939aab61cbb55c31d9165b4e", "parents": [ "7fee226ad2397b635e2fd565a59ca3ae08a164cd" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon May 10 11:32:55 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 17 17:18:51 2010 -0700" }, "message": "net: implements ip_route_input_noref()\n\nip_route_input() is the version returning a refcounted dst, while\nip_route_input_noref() returns a non refcounted one.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7fee226ad2397b635e2fd565a59ca3ae08a164cd", "tree": "0bcd26150ad74ec1a237109de87a3d214a07fc22", "parents": [ "ebda37c27d0c768947e9b058332d7ea798210cf8" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue May 11 23:19:48 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 17 17:18:50 2010 -0700" }, "message": "net: add a noref bit on skb dst\n\nUse low order bit of skb-\u003e_skb_dst to tell dst is not refcounted.\n\nChange _skb_dst to _skb_refdst to make sure all uses are catched.\n\nskb_dst() returns the dst, regardless of noref bit set or not, but\nwith a lockdep check to make sure a noref dst is not given if current\nuser is not rcu protected.\n\nNew skb_dst_set_noref() helper to set an notrefcounted dst on a skb.\n(with lockdep check)\n\nskb_dst_drop() drops a reference only if skb dst was refcounted.\n\nskb_dst_force() helper is used to force a refcount on dst, when skb\nis queued and not anymore RCU protected.\n\nUse skb_dst_force() in __sk_add_backlog(), __dev_xmit_skb() if\n!IFF_XMIT_DST_RELEASE or skb enqueued on qdisc queue, in\nsock_queue_rcv_skb(), in __nf_queue().\n\nUse skb_dst_force() in dev_requeue_skb().\n\nNote: dst_use_noref() still dirties dst, we might transform it\nlater to do one dirtying per jiffies.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" } ], "next": "6fe70aae0d128339febfabc073ba4c4a03de4f45" }