)]}' { "log": [ { "commit": "6431cbc25fa21635ee04eb0516ba6c51389fbfac", "tree": "515deede7292fce41c019e7bd72b58cab34ecb9c", "parents": [ "ddd4aa424b866a08ceba7ddf38e61542c91b93a0" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Feb 07 20:38:06 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 10 13:33:41 2011 -0800" }, "message": "inet: Create a mechanism for upward inetpeer propagation into routes.\n\nIf we didn\u0027t have a routing cache, we would not be able to properly\npropagate certain kinds of dynamic path attributes, for example\nPMTU information and redirects.\n\nThe reason is that if we didn\u0027t have a routing cache, then there would\nbe no way to lookup all of the active cached routes hanging off of\nsockets, tunnels, IPSEC bundles, etc.\n\nConsider the case where we created a cached route, but no inetpeer\nentry existed and also we were not asked to pre-COW the route metrics\nand therefore did not force the creation a new inetpeer entry.\n\nIf we later get a PMTU message, or a redirect, and store this\ninformation in a new inetpeer entry, there is no way to teach that\ncached route about the newly existing inetpeer entry.\n\nThe facilities implemented here handle this problem.\n\nFirst we create a generation ID. When we create a cached route of any\nkind, we remember the generation ID at the time of attachment. Any\ntime we force-create an inetpeer entry in response to new path\ninformation, we bump that generation ID.\n\nThe dst_ops-\u003echeck() callback is where the knowledge of this event\nis propagated. If the global generation ID does not equal the one\nstored in the cached route, and the cached route has not attached\nto an inetpeer yet, we look it up and attach if one is found. Now\nthat we\u0027ve updated the cached route\u0027s information, we update the\nroute\u0027s generation ID too.\n\nThis clears the way for implementing PMTU and redirects directly in\nthe inetpeer cache. There is absolutely no need to consult cached\nroute information in order to maintain this information.\n\nAt this point nothing bumps the inetpeer genids, that comes in the\nlater changes which handle PMTUs and redirects using inetpeers.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ddd4aa424b866a08ceba7ddf38e61542c91b93a0", "tree": "654235ceccd1c3f9dfbb7422ebe09b21544325d6", "parents": [ "7a71ed899e77cc822abb863e24a422dcf7e9fa33" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 09 15:36:47 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 10 13:29:30 2011 -0800" }, "message": "inetpeer: Add redirect and PMTU discovery cached info.\n\nValidity of the cached PMTU information is indicated by it\u0027s\nexpiration value being non-zero, just as per dst-\u003eexpires.\n\nThe scheme we will use is that we will remember the pre-ICMP value\nheld in the metrics or route entry, and then at expiration time\nwe will restore that value.\n\nIn this way PMTU expiration does not kill off the cached route as is\ndone currently.\n\nRedirect information is permanent, or at least until another redirect\nis received.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7a71ed899e77cc822abb863e24a422dcf7e9fa33", "tree": "2811b8ca75c7019522f73c7d972208ae3a3ea8f9", "parents": [ "b6644cb706610874104dbf3359e3b67aa59cbc27" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 09 14:30:26 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 10 13:22:28 2011 -0800" }, "message": "inetpeer: Abstract address representation further.\n\nFuture changes will add caching information, and some of\nthese new elements will be addresses.\n\nSince the family is implicit via the -\u003edaddr.family member,\nreplicating the family in ever address we store is entirely\nredundant.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8d13a2a9fb3e5e3f68e9d3ec0de3c8fcfa56a224", "tree": "fee1865c2fbfe8fbb67e8aed97fd8df18254d777", "parents": [ "e7b66bdc02592f5573ade667e4d68ac6e7b0f9e1" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 08 16:17:55 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 08 16:17:55 2011 -0800" }, "message": "net: Kill NETEVENT_PMTU_UPDATE.\n\nNobody actually does anything in response to the event,\nso just kill it off.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e7b66bdc02592f5573ade667e4d68ac6e7b0f9e1", "tree": "66008bbdacf067c8dfc63619656c554de8dd7cec", "parents": [ "fa9921e46fd52b78070dc67ce0d27ec301a90410" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 08 15:33:22 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 08 15:33:22 2011 -0800" }, "message": "net: Remove bogus barrier() in dst_allfrag().\n\nI simply missed this one when modifying the other dst\nmetric interfaces earlier.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fa9921e46fd52b78070dc67ce0d27ec301a90410", "tree": "8684af3cd03cf8fed1e6be9f722c181278944f7b", "parents": [ "c0c84ef5c130f8871adbdaac2ba824b9195cb6d9" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Wed Feb 02 06:29:02 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 08 14:00:40 2011 -0800" }, "message": "ipsec: allow to align IPv4 AH on 32 bits\n\nThe Linux IPv4 AH stack aligns the AH header on a 64 bit boundary\n(like in IPv6). This is not RFC compliant (see RFC4302, Section\n3.3.3.2.1), it should be aligned on 32 bits.\n\nFor most of the authentication algorithms, the ICV size is 96 bits.\nThe AH header alignment on 32 or 64 bits gives the same results.\n\nHowever for SHA-256-128 for instance, the wrong 64 bit alignment results\nin adding useless padding in IPv4 AH, which is forbidden by the RFC.\n\nTo avoid breaking backward compatibility, we use a new flag\n(XFRM_STATE_ALIGN4) do change original behavior.\n\nInitial patch from Dang Hongwu \u003chongwu.dang@6wind.com\u003e and\nChristophe Gouault \u003cchristophe.gouault@6wind.com\u003e.\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c0c84ef5c130f8871adbdaac2ba824b9195cb6d9", "tree": "d7221b5323d5a4d3d84676d32bdca21d21d85a18", "parents": [ "2360d2e8f01043632d6b651672bec66c49892f94", "3ad97fbcc233a295f2ccc2c6bdeb32323e360a5e" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 08 13:52:31 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 08 13:52:31 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6\n" }, { "commit": "7eb38527c4e485923fa3f87d11ce11b4e6ebf807", "tree": "c728652e5b2a3522e0a9db249573724841187ceb", "parents": [ "92d8682926342d2b6aa5b2ecc02221e00e1573a0" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Feb 05 18:13:45 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Feb 05 18:13:45 2011 -0800" }, "message": "tcp: Add reference to initial CWND ietf draft.\n\nSuggested by Alexander Zimmermann\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "92d8682926342d2b6aa5b2ecc02221e00e1573a0", "tree": "7f70b9cc2975716ab60ddd632b9fecf0a51b828d", "parents": [ "0131ba451e20239c5dc701027c1a2edef95e1a6e" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 04 15:55:25 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 04 15:59:53 2011 -0800" }, "message": "inetpeer: Move ICMP rate limiting state into inet_peer entries.\n\nLike metrics, the ICMP rate limiting bits are cached state about\na destination. So move it into the inet_peer entries.\n\nIf an inet_peer cannot be bound (the reason is memory allocation\nfailure or similar), the policy is to allow.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bd4a6974cc9090ef3851e5b0a2071e5383565c7c", "tree": "e96ef46426d293b730a305b5185ba5412c9172d4", "parents": [ "2b7bcebf958c74124220ee8103024def8597b36c", "1e6d93e45b231b3ae87c01902ede2315aacfe976" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 04 14:28:58 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 04 14:28:58 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "38db9e1db1c91c953b2a539130257ce91533c9f6", "tree": "b907832971ddcc434ece367da89a0926bdd6cb22", "parents": [ "e2d57766e6744f2956975dd2086d82957187b0f6" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Fri Jan 28 05:43:40 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 03 20:47:08 2011 -0800" }, "message": "include/net/genetlink.h: Allow genlmsg_cancel to accept a NULL argument\n\nnlmsg_cancel can accept NULL as its second argument, so for similarity,\nthis patch extends genlmsg_cancel to be able to accept a NULL second\nargument as well.\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "681d119047761cc59a15c0bb86891f3a878997cf", "tree": "b118fdf78870de7eea5a0449e84b4e11b046b5be", "parents": [ "747d753df7fea1d2d29c5c33623f6d2e5d0ed2d6" ], "author": { "name": "Jouni Malinen", "email": "jouni.malinen@atheros.com", "time": "Thu Feb 03 18:35:19 2011 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Feb 03 16:45:29 2011 -0500" }, "message": "mac80211: Add testing functionality for TKIP\n\nTKIP countermeasures depend on devices being able to detect Michael\nMIC failures on received frames and for stations to report errors to\nthe AP. In order to test that behavior, it is useful to be able to\nsend out TKIP frames with incorrect Michael MIC. This testing behavior\nhas minimal effect on the TX path, so it can be added to mac80211 for\nconvenient use.\n\nThe interface for using this functionality is a file in mac80211\nnetdev debugfs (tkip_mic_test). Writing a MAC address to the file\nmakes mac80211 generate a dummy data frame that will be sent out using\ninvalid Michael MIC value. In AP mode, the address needs to be for one\nof the associated stations or ff:ff:ff:ff:ff:ff to use a broadcast\nframe. In station mode, the address can be anything, e.g., the current\nBSSID. It should be noted that this functionality works correctly only\nwhen associated and using TKIP.\n\nSigned-off-by: Jouni Malinen \u003cjouni.malinen@atheros.com\u003e\nAcked-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "d057e5a381cbaec5632117bf62ba49438ab16214", "tree": "723bd8c982747393b3f390b2c0ea75eb0c6bb62e", "parents": [ "8fd369eeaa81d05969787c9ddf9cf3f1a8c4e084" ], "author": { "name": "Arik Nemtsov", "email": "arik@wizery.com", "time": "Mon Jan 31 22:29:13 2011 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Feb 03 16:44:44 2011 -0500" }, "message": "mac80211: add HW flag for disabling auto link-PS in AP mode\n\nWhen operating in AP mode the wl1271 hardware filters out null-data\npackets as well as management packets. This makes it impossible for\nmac80211 to monitor the PS mode by using the PM bit of incoming frames.\n\nImplement a HW flag to indicate that mac80211 should ignore the PM bit.\nIn addition, expose ieee80211_sta_ps_transition() to make low-level\ndrivers capable of controlling PS-mode.\n\nSigned-off-by: Arik Nemtsov \u003carik@wizery.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "fd95240568977ebd1ebb15b071464e0e392cde1a", "tree": "6458cf8f33a8b8ab6a8098208de29c83206ca3aa", "parents": [ "cdfb74d4c2e3bcc9383121af2591d0ae15007ba7", "fa9a741b841d0c2db04875310a06e8718c56fd4f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 03 13:06:43 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 03 13:06:43 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6\n" }, { "commit": "442b9635c569fef038d5367a7acd906db4677ae1", "tree": "c20d06ca161c70c0db61ed298eaf51102b67a38e", "parents": [ "5ea74318c68fcb38f02fc2fc920abd37d9a9bc33" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 02 17:05:11 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 02 20:48:47 2011 -0800" }, "message": "tcp: Increase the initial congestion window to 10.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Nandita Dukkipati \u003cnanditad@google.com\u003e\n" }, { "commit": "0bc0be7f20efea664b7c4c1d0b1822bc8f53a8b4", "tree": "ead6485944f5c1db64c9f6b6dd7ef0f9e4842a67", "parents": [ "34a6ef381d402c6547aa9abb8a74b0262ae8255f", "3db7e93d3308fb882884b9f024235d6fbf542034" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 02 15:52:23 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 02 15:52:23 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6\n" }, { "commit": "8fe73503fae8cb8f00c80dd6444c1ddcd19257bd", "tree": "39cc6d38a628c445da7d52c006df6930a2c58411", "parents": [ "123b9731b14f49cd41c91ed2b6c31e515615347c", "9291747f118d6404e509747b85ff5f6dfec368d2" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 02 15:24:48 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 02 15:24:48 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6\n" }, { "commit": "5348ba85a02ffe80a8af33a524b6610966760d3d", "tree": "37e2fd7f990692508906cfcabc0b7d7500e087ef", "parents": [ "3630b7c050d9c3564f143d595339fc06b888d6f3" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 01 15:30:56 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 01 15:35:25 2011 -0800" }, "message": "ipv4: Update some fib_hash centric interface names.\n\nfib_hash_init() --\u003e fib_trie_init()\nfib_hash_table() --\u003e fib_trie_table()\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a13676476e289ba03a23e27df130c7f33ab00e2f", "tree": "442c46b665362215128c660f16bea89724faae8b", "parents": [ "258e958b85cef23b1598515504426e8d0576d223" ], "author": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Tue Feb 01 18:27:51 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Feb 01 18:27:51 2011 +0100" }, "message": "IPVS: Remove unused variables\n\nThese variables are unused as a result of the recent netns work.\n\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\nAcked-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Hans Schillstrom \u003chans@schillstrom.com\u003e\nTested-by: Hans Schillstrom \u003chans@schillstrom.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "3db7e93d3308fb882884b9f024235d6fbf542034", "tree": "6488a45704107f77645774c85d67511b7a73fed1", "parents": [ "9d0db8b6b1da9e3d4c696ef29449700c58d589db" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue Feb 01 16:06:30 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Feb 01 16:06:30 2011 +0100" }, "message": "netfilter: ecache: always set events bits, filter them later\n\nFor the following rule:\n\niptables -I PREROUTING -t raw -j CT --ctevents assured\n\nThe event delivered looks like the following:\n\n [UPDATE] tcp 6 src\u003d192.168.0.2 dst\u003d192.168.1.2 sport\u003d37041 dport\u003d80 src\u003d192.168.1.2 dst\u003d192.168.1.100 sport\u003d80 dport\u003d37041 [ASSURED]\n\nNote that the TCP protocol state is not included. For that reason\nthe CT event filtering is not very useful for conntrackd.\n\nTo resolve this issue, instead of conditionally setting the CT events\nbits based on the ctmask, we always set them and perform the filtering\nin the late stage, just before the delivery.\n\nThus, the event delivered looks like the following:\n\n [UPDATE] tcp 6 432000 ESTABLISHED src\u003d192.168.0.2 dst\u003d192.168.1.2 sport\u003d37041 dport\u003d80 src\u003d192.168.1.2 dst\u003d192.168.1.100 sport\u003d80 dport\u003d37041 [ASSURED]\n\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "f703651ef870bd6b94ddc98ae07488b7d3fd9335", "tree": "1840dadb9102fe0cf0216daf63cb97d4e2552629", "parents": [ "6a4ddef2a3805d5b0664a94579b7a651bc202266" ], "author": { "name": "Jozsef Kadlecsik", "email": "kadlec@blackhole.kfki.hu", "time": "Tue Feb 01 15:20:14 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Feb 01 15:20:14 2011 +0100" }, "message": "netfilter: NFNL_SUBSYS_IPSET id and NLA_PUT_NET* macros\n\nThe patch adds the NFNL_SUBSYS_IPSET id and NLA_PUT_NET* macros to the\nvanilla kernel.\n\nSigned-off-by: Jozsef Kadlecsik \u003ckadlec@blackhole.kfki.hu\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "0c838ff1ade71162775afffd9e5c6478a60bdca6", "tree": "81910cc5582f4862770307784c40c66aa3a44948", "parents": [ "5b4704419cbd0b7597a91c19f9e8e8b17c1af071" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 31 16:16:50 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 31 16:16:50 2011 -0800" }, "message": "ipv4: Consolidate all default route selection implementations.\n\nBoth fib_trie and fib_hash have a local implementation of\nfib_table_select_default(). This is completely unnecessary\ncode duplication.\n\nSince we now remember the fib_table and the head of the fib\nalias list of the default route, we can implement one single\ngeneric version of this routine.\n\nLooking at the fib_hash implementation you may get the impression\nthat it\u0027s possible for there to be multiple top-level routes in\nthe table for the default route. The truth is, it isn\u0027t, the\ninsert code will only allow one entry to exist in the zero\nprefix hash table, because all keys evaluate to zero and all\nkeys in a hash table must be unique.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5b4704419cbd0b7597a91c19f9e8e8b17c1af071", "tree": "94ee46905ba2a142bdf910fb26f7450c41ebc46a", "parents": [ "a5e3c2aae23a3719105c1ae662c67ef282f213db" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 31 16:10:03 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 31 16:10:03 2011 -0800" }, "message": "ipv4: Remember FIB alias list head and table in lookup results.\n\nThis will be used later to implement fib_select_default() in a\ncompletely generic manner, instead of the current situation where the\ndefault route is re-looked up in the TRIE/HASH table and then the\navailable aliases are analyzed.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5403c8a29521a6eb02f9283dbbe0184527f8f42b", "tree": "4f1ca17feda4dfa88f53eceeaa39583ec840d27e", "parents": [ "c79b9e4936142d5ed26073d58bdd4a5a0ac62f32", "c4c93106741bbf61ecd05a2a835af8e3bf31c1bd" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 31 13:13:24 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 31 13:13:24 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "709b46e8d90badda1898caea50483c12af178e96", "tree": "799b57704dda3684777fb57a6e413dabac78858c", "parents": [ "13ad17745c2cbd437d9e24b2d97393e0be11c439" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Sat Jan 29 16:15:56 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 30 01:14:38 2011 -0800" }, "message": "net: Add compat ioctl support for the ipv4 multicast ioctl SIOCGETSGCNT\n\nSIOCGETSGCNT is not a unique ioctl value as it it maps tio SIOCPROTOPRIVATE +1,\nwhich unfortunately means the existing infrastructure for compat networking\nioctls is insufficient. A trivial compact ioctl implementation would conflict\nwith:\n\nSIOCAX25ADDUID\nSIOCAIPXPRISLT\nSIOCGETSGCNT_IN6\nSIOCGETSGCNT\nSIOCRSSCAUSE\nSIOCX25SSUBSCRIP\nSIOCX25SDTEFACILITIES\n\nTo make this work I have updated the compat_ioctl decode path to mirror the\nthe normal ioctl decode path. I have added an ipv4 inet_compat_ioctl function\nso that I can have ipv4 specific compat ioctls. I have added a compat_ioctl\nfunction into struct proto so I can break out ioctls by which kind of ip socket\nI am using. I have added a compat_raw_ioctl function because SIOCGETSGCNT only\nworks on raw sockets. I have added a ipmr_compat_ioctl that mirrors the normal\nipmr_ioctl.\n\nThis was necessary because unfortunately the struct layout for the SIOCGETSGCNT\nhas unsigned longs in it so changes between 32bit and 64bit kernels.\n\nThis change was sufficient to run a 32bit ip multicast routing daemon on a\n64bit kernel.\n\nReported-by: Bill Fenner \u003cfenner@aristanetworks.com\u003e\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "725d1e1b457dc2bbebb337677e73efe7c6d14da5", "tree": "b001a08feeff741963d8232ecb26e5c1a75efb92", "parents": [ "9c150e82ac50a611237bbebd508d17f6347d577c" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 28 14:05:05 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 28 14:05:05 2011 -0800" }, "message": "ipv4: Attach FIB info to dst_default_metrics when possible\n\nIf there are no explicit metrics attached to a route, hook\nfi-\u003efib_info up to dst_default_metrics.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9c150e82ac50a611237bbebd508d17f6347d577c", "tree": "7c79c013857cc13570595e805de0dbdb8f00332e", "parents": [ "a4daad6b0923030fbd3b00a01f570e4c3eef446b" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 28 14:01:25 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 28 14:01:25 2011 -0800" }, "message": "ipv4: Allocate fib metrics dynamically.\n\nThis is the initial gateway towards super-sharing metrics\nif they are all set to zero for a route.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3e11210d46a4f252f41db6e442b46026aeddbb59", "tree": "b258375de649a5e04e8d567c850b47c41f8ceb11", "parents": [ "3bf63e59e577cbecd41334c866f501c4cc5d54c5", "c7c1806098752c1f46943d8db2c69aff07f5d4bc" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jan 28 16:23:14 2011 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jan 28 16:23:14 2011 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n\nConflicts:\n\tdrivers/net/wireless/ath/ath9k/init.c\n" }, { "commit": "6d744bacee8195c915c514409a81d470ce7b1177", "tree": "5697c3b9211b2ebae666f42a35c174ad15ee73a5", "parents": [ "ebefce3d13f8b5a871337ff7c3821ee140c1ea8a" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu Jan 27 14:13:17 2011 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jan 28 15:44:29 2011 -0500" }, "message": "mac80211: add MCS information to radiotap\n\nThis adds the MCS information we currently get\nfrom the drivers into radiotap.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "a4daad6b0923030fbd3b00a01f570e4c3eef446b", "tree": "b8e5b9a2110628503e57149f0bb2a4bb1bf3f027", "parents": [ "8571a19c4ac140f1a507f3e7eb716892afa27109" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 27 22:01:53 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 27 22:01:53 2011 -0800" }, "message": "net: Pre-COW metrics for TCP.\n\nTCP is going to record metrics for the connection,\nso pre-COW the route metrics at route cache entry\ncreation time.\n\nThis avoids several atomic operations that have to\noccur if we COW the metrics after the entry reaches\nglobal visibility.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8571a19c4ac140f1a507f3e7eb716892afa27109", "tree": "55ef6a0ab68d6388177d3290a7fd6bc3f12a381f", "parents": [ "aae7c47311659e5150b740d61c4be418198239fa", "8d8d3fdc0d42be0ba75be227465773a54bb48a0b" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 27 16:00:37 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 27 16:00:37 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6\n" }, { "commit": "144001bddcb4db62c2261f1d703d835851031577", "tree": "e10cd1840542b2a6d4873ff8477314d91e453881", "parents": [ "606598237c856b0c6584c2263288657658140da9" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 27 13:52:16 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 27 13:52:16 2011 -0800" }, "message": "inetpeer: Mark metrics as \"new\" in fresh inetpeer entries.\n\nSet the RTAX_LOCKED metric to INETPEER_METRICS_NEW (basically,\nall ones) on fresh inetpeer entries.\n\nThis way code can determine if default metrics have been loaded\nin from a routing table entry already.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "606598237c856b0c6584c2263288657658140da9", "tree": "e11c1d95b531a6b815c1c24094435d06e39f0dee", "parents": [ "62fa8a846d7de4b299232e330c74b7783539df76" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 26 20:55:53 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 27 13:48:26 2011 -0800" }, "message": "inetpeer: Add metrics storage to inetpeer entries.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "62fa8a846d7de4b299232e330c74b7783539df76", "tree": "e401dbdbf4b11cbd27bdc3a47d9dc8b512173c9f", "parents": [ "b4e69ac670d71b5748dc81e536b2cb103489badd" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 26 20:51:05 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 26 20:51:05 2011 -0800" }, "message": "net: Implement read-only protection and COW\u0027ing of metrics.\n\nRouting metrics are now copy-on-write.\n\nInitially a route entry points it\u0027s metrics at a read-only location.\nIf a routing table entry exists, it will point there. Else it will\npoint at the all zero metric place-holder called \u0027dst_default_metrics\u0027.\n\nThe writeability state of the metrics is stored in the low bits of the\nmetrics pointer, we have two bits left to spare if we want to store\nmore states.\n\nFor the initial implementation, COW is implemented simply via kmalloc.\nHowever future enhancements will change this to place the writable\nmetrics somewhere else, in order to increase sharing. Very likely\nthis \"somewhere else\" will be the inetpeer cache.\n\nNote also that this means that metrics updates may transiently fail\nif we cannot COW the metrics successfully.\n\nBut even by itself, this patch should decrease memory usage and\nincrease cache locality especially for routing workloads. In those\ncases the read-only metric copies stay in place and never get written\nto.\n\nTCP workloads where metrics get updated, and those rare cases where\nPMTU triggers occur, will take a very slight performance hit. But\nthat hit will be alleviated when the long-term writable metrics\nmove to a more sharable location.\n\nSince the metrics storage went from a u32 array of RTAX_MAX entries to\nwhat is essentially a pointer, some retooling of the dst_entry layout\nwas necessary.\n\nMost importantly, we need to preserve the alignment of the reference\ncount so that it doesn\u0027t share cache lines with the read-mostly state,\nas per Eric Dumazet\u0027s alignment assertion checks.\n\nThe only non-trivial bit here is the move of the \u0027flags\u0027 member into\nthe writeable cacheline. This is OK since we are always accessing the\nflags around the same moment when we made a modification to the\nreference count.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b4e69ac670d71b5748dc81e536b2cb103489badd", "tree": "26a04ba5d950657132fd6acb4e0ef17d0bcabe93", "parents": [ "144ce879b057c760194d808c90826cd96308f423", "7cc2edb83447775a34ed3bf9d29d8295a434b523" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 26 13:49:30 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 26 13:49:30 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "9b6941d8b103fe95d1a90b7996046be9ee0e55e4", "tree": "03c4e26abb8d6212741c3821061f2f40f2b5c8ec", "parents": [ "de221bd5eb5e754806fcc39c40bb12b96515d9c5", "acd9f9cc305ca2e5da2a39f6f6160cd4b476e38b" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 26 11:49:49 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 26 11:49:49 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "04ed3e741d0f133e02bed7fa5c98edba128f90e7", "tree": "3dde4ca8306e98536faa69bccf0e47a2549c088f", "parents": [ "57422dc530115e427dff464cc0a32bcd0efb5008" ], "author": { "name": "Michał Mirosław", "email": "mirq-linux@rere.qmqm.pl", "time": "Mon Jan 24 15:32:47 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 24 15:32:47 2011 -0800" }, "message": "net: change netdev-\u003efeatures to u32\n\nQuoting Ben Hutchings: we presumably won\u0027t be defining features that\ncan only be enabled on 64-bit architectures.\n\nOccurences found by `grep -r` on net/, drivers/net, include/\n\n[ Move features and vlan_features next to each other in\n struct netdev, as per Eric Dumazet\u0027s suggestion -DaveM ]\n\nSigned-off-by: Michał Mirosław \u003cmirq-linux@rere.qmqm.pl\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5bdc22a56549e7983c6b443298672641952ea035", "tree": "fbfd4e7453e4fd23dfef826d4610ed2aae47b36c", "parents": [ "b6f4098897f30b7ea90a1c1edf35e9b20a9d828a", "e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 24 14:09:35 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 24 14:09:35 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tnet/sched/sch_hfsc.c\n\tnet/sched/sch_htb.c\n\tnet/sched/sch_tbf.c\n" }, { "commit": "e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb", "tree": "6d30e5e7b7f8e9aaa51d43b7128ac56860fa03bb", "parents": [ "c506653d35249bb4738bb139c24362e1ae724bc1", "ec30f343d61391ab23705e50a525da1d55395780" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 24 13:17:06 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 24 13:17:06 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6\n" }, { "commit": "59eb21a6504731fc16db4cf9463065dd61093e08", "tree": "4a3732d451c85a5949c6d6294db51a56530677d8", "parents": [ "60f2d1d506195803fa6e1dcf3972637b740fdd60" ], "author": { "name": "Bruno Randolf", "email": "br1@einfach.org", "time": "Mon Jan 17 13:37:28 2011 +0900" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jan 21 15:34:17 2011 -0500" }, "message": "cfg80211: Extend channel to frequency mapping for 802.11j\n\nExtend channel to frequency mapping for 802.11j Japan 4.9GHz band, according to\nIEEE802.11 section 17.3.8.3.2 and Annex J. Because there are now overlapping\nchannel numbers in the 2GHz and 5GHz band we can\u0027t map from channel to\nfrequency without knowing the band. This is no problem as in most contexts we\nknow the band. In places where we don\u0027t know the band (and WEXT compatibility)\nwe assume the 2GHz band for channels below 14.\n\nThis patch does not implement all channel to frequency mappings defined in\n802.11, it\u0027s just an extension for 802.11j 20MHz channels. 5MHz and 10MHz\nchannels as well as 802.11y channels have been omitted.\n\nThe following drivers have been updated to reflect the API changes:\niwl-3945, iwl-agn, iwmc3200wifi, libertas, mwl8k, rt2x00, wl1251, wl12xx.\nThe drivers have been compile-tested only.\n\nSigned-off-by: Bruno Randolf \u003cbr1@einfach.org\u003e\nSigned-off-by: Brian Prodoehl \u003cbprodoehl@gmail.com\u003e\nAcked-by: Luciano Coelho \u003ccoelho@ti.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "9190b3b3208d052d98cb601fcc192f3f71a5658b", "tree": "b642a00320a1b35e33741fcd162072724f228fbf", "parents": [ "b30532515f0a62bfe17207ab00883dd262497006" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Jan 20 23:31:33 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 20 23:31:33 2011 -0800" }, "message": "net_sched: accurate bytes/packets stats/rates\n\nIn commit 44b8288308ac9d (net_sched: pfifo_head_drop problem), we fixed\na problem with pfifo_head drops that incorrectly decreased\nsch-\u003ebstats.bytes and sch-\u003ebstats.packets\n\nSeveral qdiscs (CHOKe, SFQ, pfifo_head, ...) are able to drop a\npreviously enqueued packet, and bstats cannot be changed, so\nbstats/rates are not accurate (over estimated)\n\nThis patch changes the qdisc_bstats updates to be done at dequeue() time\ninstead of enqueue() time. bstats counters no longer account for dropped\nframes, and rates are more correct, since enqueue() bursts dont have\neffect on dequeue() rate.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a2da570d62fcb9e8816f6920e1ec02c706b289fa", "tree": "9a24b76262c40ec2f1be11e29e224c7d7b20fa26", "parents": [ "fd245a4adb5288eac37250875f237c40a20a1944" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Jan 20 03:48:19 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 20 16:59:32 2011 -0800" }, "message": "net_sched: RCU conversion of stab\n\nThis patch converts stab qdisc management to RCU, so that we can perform\nthe qdisc_calculate_pkt_len() call before getting qdisc lock.\n\nThis shortens the lock\u0027s held time in __dev_xmit_skb().\n\nThis permits more qdiscs to get TCQ_F_CAN_BYPASS status, avoiding lot of\ncache misses and so reducing latencies.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Patrick McHardy \u003ckaber@trash.net\u003e\nCC: Jesper Dangaard Brouer \u003chawk@diku.dk\u003e\nCC: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nCC: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nCC: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fd245a4adb5288eac37250875f237c40a20a1944", "tree": "1c16670c53dab9d9d05b26a7e7ae8a6a8267e847", "parents": [ "817fb15dfd988d8dda916ee04fa506f0c466b9d6" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Jan 20 05:27:16 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 20 16:59:32 2011 -0800" }, "message": "net_sched: move TCQ_F_THROTTLED flag\n\nIn commit 371121057607e (net: QDISC_STATE_RUNNING dont need atomic bit\nops) I moved QDISC_STATE_RUNNING flag to __state container, located in\nthe cache line containing qdisc lock and often dirtied fields.\n\nI now move TCQ_F_THROTTLED bit too, so that we let first cache line read\nmostly, and shared by all cpus. This should speedup HTB/CBQ for example.\n\nNot using test_bit()/__clear_bit()/__test_and_set_bit allows to use an\n\"unsigned int\" for __state container, reducing by 8 bytes Qdisc size.\n\nIntroduce helpers to hide implementation details.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Patrick McHardy \u003ckaber@trash.net\u003e\nCC: Jesper Dangaard Brouer \u003chawk@diku.dk\u003e\nCC: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nCC: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nCC: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2f1e3176723d74ea2dd975e5be0ef6bb4fed2e2e", "tree": "5f8b12f4e3d58d67bb9c1c8d00ef4d7922e3ed8e", "parents": [ "06988b06935da7a210887e9d3f50f46f2faa4953" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Jan 20 20:46:52 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Jan 20 20:46:52 2011 +0100" }, "message": "netfilter: nf_conntrack: fix linker error with NF_CONNTRACK_TIMESTAMP\u003dn\n\nnet/built-in.o: In function `nf_conntrack_init_net\u0027:\nnet/netfilter/nf_conntrack_core.c:1521:\n\tundefined reference to `nf_conntrack_tstamp_init\u0027\nnet/netfilter/nf_conntrack_core.c:1531:\n\tundefined reference to `nf_conntrack_tstamp_fini\u0027\n\nAdd dummy inline functions for the \u003dn case to fix this.\n\nReported-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "a07aa004c8d814a975b1a68afdb7baaa8f1b91d5", "tree": "652edc2dce9732a64780b9e332034b6567631a8b", "parents": [ "cc7ec456f82da7f89a5b376e613b3ac4311b3e9a", "5d8449286456659cdd0998e62d80df2d9e77e9e3" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 20 00:06:15 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 20 00:06:15 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6\n" }, { "commit": "1268afe676ee9431a229fc68a2efb0dad4d5852f", "tree": "c252b969a51bd97317415cfc3b6465441f1b8aec", "parents": [ "c56eb8fb6dccb83d9fe62fd4dc00c834de9bc470", "4580ccc04ddd8c17a470573a7fdb8def2e036dfa" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 19 20:25:45 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 19 20:25:45 2011 -0800" }, "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: (41 commits)\n sctp: user perfect name for Delayed SACK Timer option\n net: fix can_checksum_protocol() arguments swap\n Revert \"netlink: test for all flags of the NLM_F_DUMP composite\"\n gianfar: Fix misleading indentation in startup_gfar()\n net/irda/sh_irda: return to RX mode when TX error\n net offloading: Do not mask out NETIF_F_HW_VLAN_TX for vlan.\n USB CDC NCM: tx_fixup() race condition fix\n ns83820: Avoid bad pointer deref in ns83820_init_one().\n ipv6: Silence privacy extensions initialization\n bnx2x: Update bnx2x version to 1.62.00-4\n bnx2x: Fix AER setting for BCM57712\n bnx2x: Fix BCM84823 LED behavior\n bnx2x: Mark full duplex on some external PHYs\n bnx2x: Fix BCM8073/BCM8727 microcode loading\n bnx2x: LED fix for BCM8727 over BCM57712\n bnx2x: Common init will be executed only once after POR\n bnx2x: Swap BCM8073 PHY polarity if required\n iwlwifi: fix valid chain reading from EEPROM\n ath5k: fix locking in tx_complete_poll_work\n ath9k_hw: do PA offset calibration only on longcal interval\n ...\n" }, { "commit": "4580ccc04ddd8c17a470573a7fdb8def2e036dfa", "tree": "09c0d4c275c95b70b7e859b0449019fb791fc09c", "parents": [ "d402786ea4f8433774a812d6b8635e737425cddd" ], "author": { "name": "Shan Wei", "email": "shanwei@cn.fujitsu.com", "time": "Tue Jan 18 22:39:00 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 19 16:51:29 2011 -0800" }, "message": "sctp: user perfect name for Delayed SACK Timer option\n\nThe option name of Delayed SACK Timer should be SCTP_DELAYED_SACK,\nnot SCTP_DELAYED_ACK.\n\nLeft SCTP_DELAYED_ACK be concomitant with SCTP_DELAYED_SACK,\nfor making compatibility with existing applications.\n\nReference:\n8.1.19. Get or Set Delayed SACK Timer (SCTP_DELAYED_SACK)\n（http://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-25)\n\nSigned-off-by: Shan Wei \u003cshanwei@cn.fujitsu.com\u003e\nAcked-by: Wei Yongjun \u003cyjwei@cn.fujitsu.com\u003e\nAcked-by: Vlad Yasevich \u003cvladislav.yasevich@hp.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "14f0290ba44de6ed435fea24bba26e7868421c66", "tree": "449d32e4848007e3edbcab14fa8e09fdc66608ed", "parents": [ "f5c88f56b35599ab9ff2d3398e0153e4cd4a4c82", "a5db219f4cf9f67995eabd53b81a1232c82f5852" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Wed Jan 19 23:51:37 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Wed Jan 19 23:51:37 2011 +0100" }, "message": "Merge branch \u0027master\u0027 of /repos/git/net-next-2.6\n" }, { "commit": "765c2a964b49bd06b61a52991519281c85d82b67", "tree": "e646cb50bd43f9a74583391805529d3397934f42", "parents": [ "d00ef24fc2923b65fdd440dc6445903e965841ac" ], "author": { "name": "Johan Hedberg", "email": "johan.hedberg@nokia.com", "time": "Wed Jan 19 12:06:52 2011 +0530" }, "committer": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Wed Jan 19 14:43:11 2011 -0200" }, "message": "Bluetooth: Fix race condition with conn-\u003esec_level\n\nThe conn-\u003esec_level value is supposed to represent the current level of\nsecurity that the connection has. However, by assigning to it before\nrequesting authentication it will have the wrong value during the\nauthentication procedure. To fix this a pending_sec_level variable is\nadded which is used to track the desired security level while making\nsure that sec_level always represents the current level of security.\n\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@nokia.com\u003e\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "5dd36bc933e8be84f8369ac64505a2938f9ce036", "tree": "11538bafde53b6189da2af10d2f8a21c1b57565e", "parents": [ "0b01f030d38e00650e2db42da083d8647aad40a5" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Tue Jan 18 13:52:23 2011 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jan 19 11:36:12 2011 -0500" }, "message": "mac80211: allow advertising correct maximum aggregate size\n\nCurrently, mac80211 always advertises that it may send\nup to 64 subframes in an aggregate. This is fine, since\nit\u0027s the max, but might as well be set to zero instead\nsince it doesn\u0027t have any information.\n\nHowever, drivers might have that information, so allow\nthem to set a variable giving it, which will then be\nused. The default of zero will be fine since to the\npeer that means we don\u0027t know and it will just use its\nown limit for the buffer size.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "0b01f030d38e00650e2db42da083d8647aad40a5", "tree": "14519750d9b6cdb046624dd87d5323a4826821e2", "parents": [ "ac1bd8464f161ed1475ef73c431b926256c6b5bb" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Tue Jan 18 13:51:05 2011 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jan 19 11:36:11 2011 -0500" }, "message": "mac80211: track receiver\u0027s aggregation reorder buffer size\n\nThe aggregation code currently doesn\u0027t implement the\nbuffer size negotiation. It will always request a max\nbuffer size (which is fine, if a little pointless, as\nthe mac80211 code doesn\u0027t know and might just use 0\ninstead), but if the peer requests a smaller size it\nisn\u0027t possible to honour this request.\n\nIn order to fix this, look at the buffer size in the\naddBA response frame, keep track of it and pass it to\nthe driver in the ampdu_action callback when called\nwith the IEEE80211_AMPDU_TX_OPERATIONAL action. That\nway the driver can limit the number of subframes in\naggregates appropriately.\n\nNote that this doesn\u0027t fix any drivers apart from the\naddition of the new argument -- they all need to be\nupdated separately to use this variable!\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "df6ba5d80d6c9b51471d5fa046c3c06988e5f62a", "tree": "9321170ce223172318ff6e6fa34bd3b30559cf44", "parents": [ "dcac908babcd8ce21057e476c8df609b28ad2cd8" ], "author": { "name": "Luciano Coelho", "email": "coelho@ti.com", "time": "Wed Jan 12 15:26:30 2011 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jan 19 11:36:09 2011 -0500" }, "message": "mac80211: add hw configuration for max ampdu buffer size\n\nSome devices don\u0027t support the maximum AMDPU buffer size of 64, so we\nneed to add an option to configure this in the hardware configuration.\nThis value will be used in the ADDBA response instead of the value\nsuggested in the request, if the latter is greater than the max\nsupported.\n\nSigned-off-by: Luciano Coelho \u003ccoelho@ti.com\u003e\nTested-by: Juuso Oikarinen \u003cjuuso.oikarinen@nokia.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "a992ca2a0498edd22a88ac8c41570f536de29c9e", "tree": "4574d4da3f44c7dd3879cb4f209a8bd3a37c0ca9", "parents": [ "93557f53e1fbd9e2b6574ab0a9b5852628fde9e3" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Wed Jan 19 16:00:07 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Wed Jan 19 16:00:07 2011 +0100" }, "message": "netfilter: nf_conntrack_tstamp: add flow-based timestamp extension\n\nThis patch adds flow-based timestamping for conntracks. This\nconntrack extension is disabled by default. Basically, we use\ntwo 64-bits variables to store the creation timestamp once the\nconntrack has been confirmed and the other to store the deletion\ntime. This extension is disabled by default, to enable it, you\nhave to:\n\necho 1 \u003e /proc/sys/net/netfilter/nf_conntrack_timestamp\n\nThis patch allows to save memory for user-space flow-based\nloogers such as ulogd2. In short, ulogd2 does not need to\nkeep a hashtable with the conntrack in user-space to know\nwhen they were created and destroyed, instead we use the\nkernel timestamp. If we want to have a sane IPFIX implementation\nin user-space, this nanosecs resolution timestamps are also\nuseful. Other custom user-space applications can benefit from\nthis via libnetfilter_conntrack.\n\nThis patch modifies the /proc output to display the delta time\nin seconds since the flow start. You can also obtain the\nflow-start date by means of the conntrack-tools.\n\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "80f8f1027b99660897bdeaeae73002185d829906", "tree": "b8aafe71974b2b7295f20eeb1fad6191fadd8551", "parents": [ "d6ae3bae3d1bf7a8bf367e29f2cac0788dcd0db5" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Jan 18 07:46:52 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 18 21:33:05 2011 -0800" }, "message": "net: filter: dont block softirqs in sk_run_filter()\n\nPacket filter (BPF) doesnt need to disable softirqs, being fully\nre-entrant and lock-less.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "93557f53e1fbd9e2b6574ab0a9b5852628fde9e3", "tree": "b6bc24a10d4a48c354935d8e4fe4d110cf6dc060", "parents": [ "94d117a1c78df38abdea0c09ef00c205b923b567" ], "author": { "name": "Jiri Olsa", "email": "jolsa@redhat.com", "time": "Tue Jan 18 18:12:24 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Jan 18 18:12:24 2011 +0100" }, "message": "netfilter: nf_conntrack: nf_conntrack snmp helper\n\nAdding support for SNMP broadcast connection tracking. The SNMP\nbroadcast requests are now paired with the SNMP responses.\nThus allowing using SNMP broadcasts with firewall enabled.\n\nPlease refer to the following conversation:\nhttp://marc.info/?l\u003dnetfilter-devel\u0026m\u003d125992205006600\u0026w\u003d2\n\nPatrick McHardy wrote:\n\u003e \u003e The best solution would be to add generic broadcast tracking, the\n\u003e \u003e use of expectations for this is a bit of abuse.\n\u003e \u003e The second best choice I guess would be to move the help() function\n\u003e \u003e to a shared module and generalize it so it can be used for both.\nThis patch implements the \"second best choice\".\n\nSince the netbios-ns conntrack module uses the same helper\nfunctionality as the snmp, only one helper function is added\nfor both snmp and netbios-ns modules into the new object -\nnf_conntrack_broadcast.\n\nSigned-off-by: Jiri Olsa \u003cjolsa@redhat.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "a7c2f4d7daf9bbea362763fa7353b1862a2487ad", "tree": "84dfadd50d341c86615f58712b86684ec8ebf2d1", "parents": [ "fbabf31e4d482149b5e2704eb0287cf9117bdcf3" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Tue Jan 18 15:02:48 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Jan 18 15:02:48 2011 +0100" }, "message": "netfilter: nf_nat: fix conversion to non-atomic bit ops\n\nMy previous patch (netfilter: nf_nat: don\u0027t use atomic bit operation)\nmade a mistake when converting atomic_set to a normal bit \u0027or\u0027.\nIPS_*_BIT should be replaced with IPS_*.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nCc: Tim Gardner \u003ctim.gardner@canonical.com\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "d018b6f4f1539f3679fbdc2d02d58d09e76be84a", "tree": "317b9e04d8e7a73a4d07c69a5cb5455ec34f47e5", "parents": [ "18bce371ae09af6c20ee62c1092a4d1d0e84dd49", "0f73f2c5a3ebb957ee66718c903c17ed71a4fc2e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 14 13:25:30 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 14 13:25:30 2011 -0800" }, "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: (47 commits)\n GRETH: resolve SMP issues and other problems\n GRETH: handle frame error interrupts\n GRETH: avoid writing bad speed/duplex when setting transfer mode\n GRETH: fixed skb buffer memory leak on frame errors\n GRETH: GBit transmit descriptor handling optimization\n GRETH: fix opening/closing\n GRETH: added raw AMBA vendor/device number to match against.\n cassini: Fix build bustage on x86.\n e1000e: consistent use of Rx/Tx vs. RX/TX/rx/tx in comments/logs\n e1000e: update Copyright for 2011\n e1000: Avoid unhandled IRQ\n r8169: keep firmware in memory.\n netdev: tilepro: Use is_unicast_ether_addr helper\n etherdevice.h: Add is_unicast_ether_addr function\n ks8695net: Use default implementation of ethtool_ops::get_link\n ks8695net: Disable non-working ethtool operations\n USB CDC NCM: Don\u0027t deref NULL in cdc_ncm_rx_fixup() and don\u0027t use uninitialized variable.\n vxge: Remember to release firmware after upgrading firmware\n netdev: bfin_mac: Remove is_multicast_ether_addr use in netdev_for_each_mc_addr\n ipsec: update MAX_AH_AUTH_LEN to support sha512\n ...\n" }, { "commit": "d862a6622e9db508d4b28cc7c5bc28bd548cc24e", "tree": "d0d65ef88e8f158a33c370a0f1a6f98b41191d6c", "parents": [ "0134e89c7bcc9fde1da962c82a120691e185619f" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jan 14 15:45:56 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jan 14 15:45:56 2011 +0100" }, "message": "netfilter: nf_conntrack: use is_vmalloc_addr()\n\nUse is_vmalloc_addr() in nf_ct_free_hashtable() and get rid of\nthe vmalloc flags to indicate that a hash table has been allocated\nusing vmalloc().\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "0134e89c7bcc9fde1da962c82a120691e185619f", "tree": "3e03335cf001019a2687d161e956de4f73379984", "parents": [ "c7066f70d9610df0b9406cc635fc09e86136e714", "6faee60a4e82075853a437831768cc9e2e563e4e" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jan 14 14:12:37 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jan 14 14:12:37 2011 +0100" }, "message": "Merge branch \u0027master\u0027 of git://1984.lsi.us.es/net-next-2.6\n\nConflicts:\n\tnet/ipv4/route.c\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "c7066f70d9610df0b9406cc635fc09e86136e714", "tree": "ce98855b2c1ba2da15b7b47fc7a447d1903c4d89", "parents": [ "ae90bdeaeac6b964b7a1e853a90a19f358a9ac20" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jan 14 13:36:42 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jan 14 13:36:42 2011 +0100" }, "message": "netfilter: fix Kconfig dependencies\n\nFix dependencies of netfilter realm match: it depends on NET_CLS_ROUTE,\nwhich itself depends on NET_SCHED; this dependency is missing from netfilter.\n\nSince matching on realms is also useful without having NET_SCHED enabled and\nthe option really only controls whether the tclassid member is included in\nroute and dst entries, rename the config option to IP_ROUTE_CLASSID and move\nit outside of traffic scheduling context to get rid of the NET_SCHED dependeny.\n\nReported-by: Vladis Kletnieks \u003cValdis.Kletnieks@vt.edu\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "78d07369462e9feeaa5db301b0aa70e9dcb40b48", "tree": "8756347993a87a302df4f731ab59dc97ca3a5720", "parents": [ "1ac9ad1394fa542ac7ae0dc943ee3cda678799fa" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Thu Jan 13 11:51:03 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 13 21:48:25 2011 -0800" }, "message": "ipsec: update MAX_AH_AUTH_LEN to support sha512\n\nicv_truncbits is set to 256 for sha512, so update\nMAX_AH_AUTH_LEN to 64.\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "008d23e4852d78bb2618f2035f8b2110b6a6b968", "tree": "81c88f744f6f3fc84132527c1ddc0b4da410c5e2", "parents": [ "8f685fbda43deccd130d192c9fcef1444649eaca", "bfc672dcf323877228682aff79dff8ecd9f30ff8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:05:56 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:05:56 2011 -0800" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)\n Documentation/trace/events.txt: Remove obsolete sched_signal_send.\n writeback: fix global_dirty_limits comment runtime -\u003e real-time\n ppc: fix comment typo singal -\u003e signal\n drivers: fix comment typo diable -\u003e disable.\n m68k: fix comment typo diable -\u003e disable.\n wireless: comment typo fix diable -\u003e disable.\n media: comment typo fix diable -\u003e disable.\n remove doc for obsolete dynamic-printk kernel-parameter\n remove extraneous \u0027is\u0027 from Documentation/iostats.txt\n Fix spelling milisec -\u003e ms in snd_ps3 module parameter description\n Fix spelling mistakes in comments\n Revert conflicting V4L changes\n i7core_edac: fix typos in comments\n mm/rmap.c: fix comment\n sound, ca0106: Fix assignment to \u0027channel\u0027.\n hrtimer: fix a typo in comment\n init/Kconfig: fix typo\n anon_inodes: fix wrong function name in comment\n fix comment typos concerning \"consistent\"\n poll: fix a typo in comment\n ...\n\nFix up trivial conflicts in:\n - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)\n - fs/ext4/ext4.h\n\nAlso fix missed \u0027diabled\u0027 typo in drivers/net/bnx2x/bnx2x.h while at it.\n" }, { "commit": "838b4dc6d8a6bd83a93077ebc6873712c65bf85e", "tree": "bda502af1bd185298390da2aaf511397105bc798", "parents": [ "35ab7b798a2dc4a9b19bd85833f83a19736bcfd8" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Wed Jan 12 15:42:32 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 12 19:00:39 2011 -0800" }, "message": "sched: remove unused backlog in RED stats\n\nThe RED statistics structure includes backlog field which is not\nset or used by any code.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "464143c911df98d4913932534485113a0a14aa74", "tree": "4df3953e3cbba8931b6305aa6d16981f1a93de6c", "parents": [ "bb1231052e265e960d902ab32e67c5ccdabc9434", "2fc72c7b84002ffb3c66918e2a7b0ee607d8b5aa" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 12 18:58:40 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 12 18:58:40 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of git://1984.lsi.us.es/net-2.6\n" }, { "commit": "bb1231052e265e960d902ab32e67c5ccdabc9434", "tree": "3dd999a598355ff0d82f56eea1ffa49a81c8a42c", "parents": [ "72b43d0898e97f588293b4a24b33c58c46633d81", "4e5518ca53be29c1ec3c00089c97bef36bfed515" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 12 18:52:31 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 12 18:52:31 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "763f8d0ed4f1ce38b35cc0e05482b7799b82789b", "tree": "bc9938998b6af45a44bb35dba078851ccb21d95e", "parents": [ "f2431e6e9255461eb1476340a89ad32ad4b38b03" ], "author": { "name": "Hans Schillstrom", "email": "hans.schillstrom@ericsson.com", "time": "Mon Jan 03 14:45:01 2011 +0100" }, "committer": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Thu Jan 13 10:30:28 2011 +0900" }, "message": "IPVS: netns, svc counters moved in ip_vs_ctl,c\n\nLast two global vars to be moved,\nip_vs_ftpsvc_counter and ip_vs_nullsvc_counter.\n\n[horms@verge.net.au: removed whitespace-change-only hunk]\nSigned-off-by: Hans Schillstrom \u003chans.schillstrom@ericsson.com\u003e\nAcked-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "f2431e6e9255461eb1476340a89ad32ad4b38b03", "tree": "934974c80d2c01b44768369ca9b188f64c6ab979", "parents": [ "f6340ee0c6b9498ec918a7bb2f44e20abb8b2833" ], "author": { "name": "Hans Schillstrom", "email": "hans.schillstrom@ericsson.com", "time": "Mon Jan 03 14:45:00 2011 +0100" }, "committer": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Thu Jan 13 10:30:28 2011 +0900" }, "message": "IPVS: netns, trash handling\n\ntrash list per namspace,\nand reordering of some params in dst struct.\n\n[ horms@verge.net.au: Use cancel_delayed_work_sync() instead of\n\t cancel_rearming_delayed_work(). Found during\n\t\t merge conflict resoliution ]\nSigned-off-by: Hans Schillstrom \u003chans.schillstrom@ericsson.com\u003e\nAcked-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "f6340ee0c6b9498ec918a7bb2f44e20abb8b2833", "tree": "46e0f99416479f31bbd8093e18c360171e86fd59", "parents": [ "a0840e2e165a370ca24a59545e564e9881a55891" ], "author": { "name": "Hans Schillstrom", "email": "hans.schillstrom@ericsson.com", "time": "Mon Jan 03 14:44:59 2011 +0100" }, "committer": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Thu Jan 13 10:30:28 2011 +0900" }, "message": "IPVS: netns, defense work timer.\n\nThis patch makes defense work timer per name-space,\nA net ptr had to be added to the ipvs struct,\nsince it\u0027s needed by defense_work_handler.\n\n[ horms@verge.net.au: Use cancel_delayed_work_sync() instead of\n\t cancel_rearming_delayed_work(). Found during\n\t\t merge conflict resoliution ]\nSigned-off-by: Hans Schillstrom \u003chans.schillstrom@ericsson.com\u003e\nAcked-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "a0840e2e165a370ca24a59545e564e9881a55891", "tree": "deb10e3931be9410aebbb55e5fccbd42a5edd633", "parents": [ "6e67e586e7289c144d5a189d6e0fa7141d025746" ], "author": { "name": "Hans Schillstrom", "email": "hans.schillstrom@ericsson.com", "time": "Mon Jan 03 14:44:58 2011 +0100" }, "committer": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Thu Jan 13 10:30:28 2011 +0900" }, "message": "IPVS: netns, ip_vs_ctl local vars moved to ipvs struct.\n\nMoving global vars to ipvs struct, except for svc table lock.\nNext patch for ctl will be drop-rate handling.\n\n*v3\n__ip_vs_mutex remains global\n ip_vs_conntrack_enabled(struct netns_ipvs *ipvs)\n\nSigned-off-by: Hans Schillstrom \u003chans.schillstrom@ericsson.com\u003e\nAcked-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "6e67e586e7289c144d5a189d6e0fa7141d025746", "tree": "33a064ac5fa2e2ac4270c6361d5566bc99c671e6", "parents": [ "b17fc9963f837ef1acfe36e193108fb16ed58647" ], "author": { "name": "Hans Schillstrom", "email": "hans.schillstrom@ericsson.com", "time": "Mon Jan 03 14:44:57 2011 +0100" }, "committer": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Thu Jan 13 10:30:28 2011 +0900" }, "message": "IPVS: netns, connection hash got net as param.\n\nConnection hash table is now name space aware.\ni.e. net ptr \u003e\u003e 8 is xor:ed to the hash,\nand this is the first param to be compared.\nThe net struct is 0xa40 in size ( a little bit smaller for 32 bit arch:s)\nand cache-line aligned, so a ptr \u003e\u003e 5 might be a more clever solution ?\n\nAll lookups where net is compared uses net_eq() which returns 1 when netns\nis disabled, and the compiler seems to do something clever in that case.\n\nip_vs_conn_fill_param() have *net as first param now.\n\nThree new inlines added to keep conn struct smaller\nwhen names space is disabled.\n- ip_vs_conn_net()\n- ip_vs_conn_net_set()\n- ip_vs_conn_net_eq()\n\n*v3\n moved net compare to the end in \"fast path\"\n\nSigned-off-by: Hans Schillstrom \u003chans.schillstrom@ericsson.com\u003e\nAcked-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "b17fc9963f837ef1acfe36e193108fb16ed58647", "tree": "8c41814df22f7b788bc2103c39ab8fd4882a0091", "parents": [ "f131315fa272d337dfca7dad2f033ff5296dad65" ], "author": { "name": "Hans Schillstrom", "email": "hans.schillstrom@ericsson.com", "time": "Mon Jan 03 14:44:56 2011 +0100" }, "committer": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Thu Jan 13 10:30:28 2011 +0900" }, "message": "IPVS: netns, ip_vs_stats and its procfs\n\nThe statistic counter locks for every packet are now removed,\nand that statistic is now per CPU, i.e. no locks needed.\nHowever summing is made in ip_vs_est into ip_vs_stats struct\nwhich is moved to ipvs struc.\n\nprocfs, ip_vs_stats now have a \"per cpu\" count and a grand total.\nA new function seq_file_single_net() in ip_vs.h created for handling of\nsingle_open_net() since it does not place net ptr in a struct, like others.\n\n/var/lib/lxc # cat /proc/net/ip_vs_stats_percpu\n Total Incoming Outgoing Incoming Outgoing\nCPU Conns Packets Packets Bytes Bytes\n 0 0 3 1 9D 34\n 1 0 1 2 49 70\n 2 0 1 2 34 76\n 3 1 2 2 70 74\n ~ 1 7 7 18A 18E\n\n Conns/s Pkts/s Pkts/s Bytes/s Bytes/s\n 0 0 0 0 0\n\n*v3\nip_vs_stats reamains as before, instead ip_vs_stats_percpu is added.\nu64 seq lock added\n\n*v4\nBug correction inbytes and outbytes as own vars..\nper_cpu counter for all stats now as suggested by Julian.\n\n[horms@verge.net.au: removed whitespace-change-only hunk]\nSigned-off-by: Hans Schillstrom \u003chans.schillstrom@ericsson.com\u003e\nAcked-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "f131315fa272d337dfca7dad2f033ff5296dad65", "tree": "4abe0b8cd421229e27be614e23e3bbc800dff98b", "parents": [ "29c2026fd4980c144d9c746dc1565060f08e5796" ], "author": { "name": "Hans Schillstrom", "email": "hans.schillstrom@ericsson.com", "time": "Mon Jan 03 14:44:55 2011 +0100" }, "committer": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Thu Jan 13 10:30:28 2011 +0900" }, "message": "IPVS: netns awareness to ip_vs_sync\n\nAll global variables moved to struct ipvs,\nmost external changes fixed (i.e. init_net removed)\nin sync_buf create + 4 replaced by sizeof(struct..)\n\nSigned-off-by: Hans Schillstrom \u003chans.schillstrom@ericsson.com\u003e\nAcked-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "29c2026fd4980c144d9c746dc1565060f08e5796", "tree": "37373a66fac997e01c83e774c21e00dca713598a", "parents": [ "ab8a5e8408c3df2d654611bffc3aaf04f418b266" ], "author": { "name": "Hans Schillstrom", "email": "hans.schillstrom@ericsson.com", "time": "Mon Jan 03 14:44:54 2011 +0100" }, "committer": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Thu Jan 13 10:30:28 2011 +0900" }, "message": "IPVS: netns awareness to ip_vs_est\n\nAll variables moved to struct ipvs,\nmost external changes fixed (i.e. init_net removed)\n\n*v3\n timer per ns instead of a common timer in estimator.\n\nSigned-off-by: Hans Schillstrom \u003chans.schillstrom@ericsson.com\u003e\nAcked-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "ab8a5e8408c3df2d654611bffc3aaf04f418b266", "tree": "665454a0426b9209a53018ee71103914b29d95a7", "parents": [ "9bbac6a904d0816dae58b454692c54d6773cc20d" ], "author": { "name": "Hans Schillstrom", "email": "hans.schillstrom@ericsson.com", "time": "Mon Jan 03 14:44:53 2011 +0100" }, "committer": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Thu Jan 13 10:30:28 2011 +0900" }, "message": "IPVS: netns awareness to ip_vs_app\n\nAll variables moved to struct ipvs,\nmost external changes fixed (i.e. init_net removed)\n\nin ip_vs_protocol param struct net *net added to:\n - register_app()\n - unregister_app()\nThis affected almost all proto_xxx.c files\n\nSigned-off-by: Hans Schillstrom \u003chans.schillstrom@ericsson.com\u003e\nAcked-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "9bbac6a904d0816dae58b454692c54d6773cc20d", "tree": "f29698f1230e2a0b6fda2546f1f6da256d442979", "parents": [ "9330419d9aa4f97df412ac9be9fc0388c67dd315" ], "author": { "name": "Hans Schillstrom", "email": "hans.schillstrom@ericsson.com", "time": "Mon Jan 03 14:44:52 2011 +0100" }, "committer": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Thu Jan 13 10:30:27 2011 +0900" }, "message": "IPVS: netns, common protocol changes and use of appcnt.\n\nappcnt and timeout_table moved from struct ip_vs_protocol to\nip_vs proto_data.\n\nstruct net *net added as first param to\n - register_app()\n - unregister_app()\n - app_conn_bind()\n - ip_vs_conn_new()\n\n[horms@verge.net.au: removed cosmetic-change-only hunk]\nSigned-off-by: Hans Schillstrom \u003chans.schillstrom@ericsson.com\u003e\nAcked-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "9330419d9aa4f97df412ac9be9fc0388c67dd315", "tree": "3fdd9103f299fcd2dfafcf0f51d1b5c4430987c2", "parents": [ "88fe2d372793a71ae4f6319a16f537d56a83906c" ], "author": { "name": "Hans Schillstrom", "email": "hans.schillstrom@ericsson.com", "time": "Mon Jan 03 14:44:51 2011 +0100" }, "committer": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Thu Jan 13 10:30:27 2011 +0900" }, "message": "IPVS: netns, use ip_vs_proto_data as param.\n\nip_vs_protocol *pp is replaced by ip_vs_proto_data *pd in\nfunction call in ip_vs_protocol struct i.e. :,\n - timeout_change()\n - state_transition()\n\nip_vs_protocol_timeout_change() got ipvs as param, due to above\nand a upcoming patch - defence work\n\nMost of this changes are triggered by Julians comment:\n\"tcp_timeout_change should work with the new struct ip_vs_proto_data\n so that tcp_state_table will go to pd-\u003estate_table\n and set_tcp_state will get pd instead of pp\"\n\n*v3\nMostly comments from Julian\nThe pp -\u003e pd conversion should start from functions like\nip_vs_out() that use pp \u003d ip_vs_proto_get(iph.protocol),\nnow they should use ip_vs_proto_data_get(net, iph.protocol).\nconn_in_get() and conn_out_get() unused param *pp, removed.\n\n*v4\nip_vs_protocol_timeout_change() walk the proto_data path.\n\nSigned-off-by: Hans Schillstrom \u003chans.schillstrom@ericsson.com\u003e\nAcked-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "9d934878e7870fbbbd8eaed2e467552536877def", "tree": "82be8a59a2a68a7f8511c9d2b5a1a457b21fce58", "parents": [ "78b16bde104cc74bedbf462b0ebed2990f35ff6b" ], "author": { "name": "Hans Schillstrom", "email": "hans.schillstrom@ericsson.com", "time": "Mon Jan 03 14:44:49 2011 +0100" }, "committer": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Thu Jan 13 10:30:27 2011 +0900" }, "message": "IPVS: netns preparation for proto_sctp\n\nIn this phase (one), all local vars will be moved to ipvs struct.\n\nRemaining work, add param struct net *net to a couple of\nfunctions that is common for all protos and use ip_vs_proto_data\n\n*v3\n Removed unuset function set_state_timeout()\n\nSigned-off-by: Hans Schillstrom \u003chans.schillstrom@ericsson.com\u003e\nAcked-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "78b16bde104cc74bedbf462b0ebed2990f35ff6b", "tree": "1cf3bfb3fd5005be421e7b7bbeb0374e1cc1128a", "parents": [ "4a85b96c08ef84076f84e87280223a4301988ed9" ], "author": { "name": "Hans Schillstrom", "email": "hans.schillstrom@ericsson.com", "time": "Mon Jan 03 14:44:48 2011 +0100" }, "committer": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Thu Jan 13 10:30:27 2011 +0900" }, "message": "IPVS: netns preparation for proto_udp\n\nIn this phase (one), all local vars will be moved to ipvs struct.\n\nRemaining work, add param struct net *net to a couple of\nfunctions that is common for all protos and use ip_vs_proto_data\n\n*v3\nRemoved unused function set_state_timeout()\n\nSigned-off-by: Hans Schillstrom \u003chans.schillstrom@ericsson.com\u003e\nAcked-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "4a85b96c08ef84076f84e87280223a4301988ed9", "tree": "14ec2ae8cd5c159dc4400c5a97a13231de1c9efb", "parents": [ "252c64103237f1841088f0f29b4f084b1c774546" ], "author": { "name": "Hans Schillstrom", "email": "hans.schillstrom@ericsson.com", "time": "Mon Jan 03 14:44:47 2011 +0100" }, "committer": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Thu Jan 13 10:30:27 2011 +0900" }, "message": "IPVS: netns preparation for proto_tcp\n\nIn this phase (one), all local vars will be moved to ipvs struct.\n\nRemaining work, add param struct net *net to a couple of\nfunctions that is common for all protos and use all\nip_vs_proto_data\n\n*v3\nRemoved unused function as sugested by Simon\n\nSigned-off-by: Hans Schillstrom \u003chans.schillstrom@ericsson.com\u003e\nAcked-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "252c64103237f1841088f0f29b4f084b1c774546", "tree": "81de130280300698260ca35fe4dde8a92fdebac5", "parents": [ "b6e885ddb903e681b7cbb4e68ad775154660e1f4" ], "author": { "name": "Hans Schillstrom", "email": "hans.schillstrom@ericsson.com", "time": "Mon Jan 03 14:44:46 2011 +0100" }, "committer": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Thu Jan 13 10:30:27 2011 +0900" }, "message": "IPVS: netns, prepare protocol\n\nAdd support for protocol data per name-space.\nin struct ip_vs_protocol, appcnt will be removed when all protos\nare modified for network name-space.\n\nThis patch causes warnings of unused functions, they will be used\nwhen next patch will be applied.\n\nSigned-off-by: Hans Schillstrom \u003chans.schillstrom@ericsson.com\u003e\nAcked-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "b6e885ddb903e681b7cbb4e68ad775154660e1f4", "tree": "d638b728989f152806d26702b7a5cba4cadb495f", "parents": [ "d0a1eef9c38218af20c809b2220a960b7ed81a36" ], "author": { "name": "Hans Schillstrom", "email": "hans.schillstrom@ericsson.com", "time": "Mon Jan 03 14:44:45 2011 +0100" }, "committer": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Thu Jan 13 10:30:27 2011 +0900" }, "message": "IPVS: netns awarness to lblc sheduler\n\nvar sysctl_ip_vs_lblc_expiration moved to ipvs struct as\n sysctl_lblc_expiration\n\nprocfs updated to handle this.\n\nSigned-off-by: Hans Schillstrom \u003chans.schillstrom@ericsson.com\u003e\nAcked-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "d0a1eef9c38218af20c809b2220a960b7ed81a36", "tree": "a2ba65169f823bfc06fa2ca4ae0bf4da3c6ffbf0", "parents": [ "fc723250c9cb046cc19833a2b1c4309bbf59ac36" ], "author": { "name": "Hans Schillstrom", "email": "hans.schillstrom@ericsson.com", "time": "Mon Jan 03 14:44:44 2011 +0100" }, "committer": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Thu Jan 13 10:30:27 2011 +0900" }, "message": "IPVS: netns awarness to lblcr sheduler\n\nvar sysctl_ip_vs_lblcr_expiration moved to ipvs struct as\n sysctl_lblcr_expiration\n\nprocfs updated to handle this.\n\nSigned-off-by: Hans Schillstrom \u003chans.schillstrom@ericsson.com\u003e\nAcked-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "fc723250c9cb046cc19833a2b1c4309bbf59ac36", "tree": "fa8cd33ad9e020549dd8c6389f311d25e495ca7d", "parents": [ "61b1ab4583e275af216c8454b9256de680499b19" ], "author": { "name": "Hans Schillstrom", "email": "hans.schillstrom@ericsson.com", "time": "Mon Jan 03 14:44:43 2011 +0100" }, "committer": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Thu Jan 13 10:30:26 2011 +0900" }, "message": "IPVS: netns to services part 1\n\nServices hash tables got netns ptr a hash arg,\nWhile Real Servers (rs) has been moved to ipvs struct.\nTwo new inline functions added to get net ptr from skb.\n\nSince ip_vs is called from different contexts there is two\nplaces to dig for the net ptr skb-\u003edev or skb-\u003esk\nthis is handled in skb_net() and skb_sknet()\n\nGlobal functions, ip_vs_service_get() ip_vs_lookup_real_service()\netc have got struct net *net as first param.\nIf possible get net ptr skb etc,\n - if not \u0026init_net is used at this early stage of patching.\n\nip_vs_ctl.c procfs not ready for netns yet.\n\n*v3\n Comments by Julian\n- __ip_vs_service_find and __ip_vs_svc_fwm_find are fast path,\n net_eq(svc-\u003enet, net) so the check is at the end now.\n- net \u003d skb_net(skb) in ip_vs_out moved after check for skb_dst.\n\nSigned-off-by: Hans Schillstrom \u003chans.schillstrom@ericsson.com\u003e\nAcked-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "61b1ab4583e275af216c8454b9256de680499b19", "tree": "43e7cd6c71030c4d94c4e02dd34de77e57943a2d", "parents": [ "fee1cc0895fd7bde875a86bbc3a1e82089e540b8" ], "author": { "name": "Hans Schillstrom", "email": "hans.schillstrom@ericsson.com", "time": "Mon Jan 03 14:44:42 2011 +0100" }, "committer": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Thu Jan 13 10:30:26 2011 +0900" }, "message": "IPVS: netns, add basic init per netns.\n\nPreparation for network name-space init, in this stage\nsome empty functions exists.\n\nIn most files there is a check if it is root ns i.e. init_net\nif (!net_eq(net, \u0026init_net))\n return ...\nthis will be removed by the last patch, when enabling name-space.\n\n*v3\n ip_vs_conn.c merge error corrected.\n net_ipvs #ifdef removed as sugested by Jan Engelhardt\n\n[ horms@verge.net.au: Removed whitespace-change-only hunks ]\nSigned-off-by: Hans Schillstrom \u003chans.schillstrom@ericsson.com\u003e\nAcked-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "fee1cc0895fd7bde875a86bbc3a1e82089e540b8", "tree": "df0a07a650229fd7aa775ca6c20a8d2939c96e72", "parents": [ "ae90bdeaeac6b964b7a1e853a90a19f358a9ac20", "0c21e3aaf6ae85bee804a325aa29c325209180fd" ], "author": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Thu Jan 13 10:29:21 2011 +0900" }, "committer": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Thu Jan 13 10:29:21 2011 +0900" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 into HEAD\n" }, { "commit": "2fc72c7b84002ffb3c66918e2a7b0ee607d8b5aa", "tree": "df97dadb97bf3c9b46b7c557d8ac14b9ab1c17b3", "parents": [ "2f46e07995734a363608e974a82fd05d5b610750" ], "author": { "name": "KOVACS Krisztian", "email": "hidden@balabit.hu", "time": "Wed Jan 12 20:25:08 2011 +0100" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Wed Jan 12 20:25:08 2011 +0100" }, "message": "netfilter: fix compilation when conntrack is disabled but tproxy is enabled\n\nThe IPv6 tproxy patches split IPv6 defragmentation off of conntrack, but\nfailed to update the #ifdef stanzas guarding the defragmentation related\nfields and code in skbuff and conntrack related code in nf_defrag_ipv6.c.\n\nThis patch adds the required #ifdefs so that IPv6 tproxy can truly be used\nwithout connection tracking.\n\nOriginal report:\nhttp://marc.info/?l\u003dlinux-netdev\u0026m\u003d129010118516341\u0026w\u003d2\n\nReported-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nAcked-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: KOVACS Krisztian \u003chidden@balabit.hu\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "e44f391187495e0deaf7b9f0077e94f270837d1a", "tree": "96f3f1b035cff852615a6b030cb560338af26d8d", "parents": [ "fa6dd8a2c89861d05621ce7e2880e485bec22fba" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Tue Jan 11 08:06:19 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 11 14:03:10 2011 -0800" }, "message": "ah: update maximum truncated ICV length\n\nFor SHA256, RFC4868 requires to truncate ICV length to 128 bits,\nhence MAX_AH_AUTH_LEN should be updated to 16.\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "545ecdc3b3a2fe0b54a3053bf8bf85321bbca7da", "tree": "2ece08798301e13a05f2d8b05e4e743105903f05", "parents": [ "bfe0d0298f2a67d94d58c39ea904a999aeeb7c3c" ], "author": { "name": "Maxim Levitsky", "email": "maximlevitsky@gmail.com", "time": "Sat Jan 08 13:57:12 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 10 16:10:37 2011 -0800" }, "message": "arp: allow to invalidate specific ARP entries\n\nIPv4 over firewire needs to be able to remove ARP entries\nfrom the ARP cache that belong to nodes that are removed, because\nIPv4 over firewire uses ARP packets for private information\nabout nodes.\n\nThis information becomes invalid as soon as node drops\noff the bus and when it reconnects, its only possible\nto start talking to it after it responded to an ARP packet.\nBut ARP cache prevents such packets from being sent.\n\nSigned-off-by: Maxim Levitsky \u003cmaximlevitsky@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bfe0d0298f2a67d94d58c39ea904a999aeeb7c3c", "tree": "5a6f966ebabe8d88d6d6c78c61411e325150927f", "parents": [ "f1593d2298acca8b6680100d622911827edb8b0a" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sun Jan 09 08:30:54 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 10 16:07:54 2011 -0800" }, "message": "net_sched: factorize qdisc stats handling\n\nHTB takes into account skb is segmented in stats updates.\nGeneralize this to all schedulers.\n\nThey should use qdisc_bstats_update() helper instead of manipulating\nbstats.bytes and bstats.packets\n\nAdd bstats_update() helper too for classes that use\ngnet_stats_basic_packed fields.\n\nNote : Right now, TCQ_F_CAN_BYPASS shortcurt can be taken only if no\nstab is setup on qdisc.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "facb4edc1e0e849ea98e147a821e60d6d6272c0a", "tree": "4de1206d197e889690b622593ab785b318d1905f", "parents": [ "c599bd6b9ac8926b03e6bf332a8c14ae2ffb43a3" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Mon Jan 10 04:06:58 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 10 13:33:17 2011 -0800" }, "message": "phonet: some signedness bugs\n\nDan Rosenberg pointed out that there were some signed comparison bugs\nin the phonet protocol.\n\nhttp://marc.info/?l\u003dfull-disclosure\u0026m\u003d129424528425330\u0026w\u003d2\n\nThe problem is that we check for array overflows but \"protocol\" is\nsigned and we don\u0027t check for array underflows. If you have already\nhave CAP_SYS_ADMIN then you could use the bugs to get root, or someone\ncould cause an oops by mistake.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nAcked-by: Rémi Denis-Courmont \u003cremi.denis-courmont@nokia.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f52555a4b2d229079155e6642ec09afa63d10cab", "tree": "3e0c8941fe89d2a9c9b4e3d697a7a3f017499edd", "parents": [ "610dbc980f7ad886313278ce946287f24b44cf55" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu Jan 06 22:36:45 2011 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jan 10 15:40:52 2011 -0500" }, "message": "cfg80211: add mesh join/leave callback docs\n\nWhen I made the patch to add mesh join/leave I\ndidn\u0027t pay attention to docs because it was a\nproof of concept, and then when we actually did\nmerge it I forgot -- add docs now.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "610dbc980f7ad886313278ce946287f24b44cf55", "tree": "f4f8d69352012a4f24554aa2b4867df31f7f53e8", "parents": [ "55de80d64545e5c4cca7f574fdf04b1f02a5f8fd" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu Jan 06 22:36:44 2011 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jan 10 15:40:52 2011 -0500" }, "message": "mac80211: add missing docs for off-chan TX flag\n\nThe flag is IEEE80211_TX_CTL_TX_OFFCHAN and I had\nadded that in a previous patch but forgotten docs.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "4976b4eb9d083f035aa97afec560c7e1c16c6afd", "tree": "9335c15f332d604d418c64370202516f4541439a", "parents": [ "6d50192c17d4481c0e34c1ed2ae24fd7bc16e121" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Tue Jan 04 13:02:32 2011 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jan 10 15:40:51 2011 -0500" }, "message": "mac80211: add remain-on-channel docs\n\nAdd documentation for the new callbacks that I\nforgot in the patch adding the callbacks.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "928c41e7a15d1164bb725f3445575f4651b5b9f0", "tree": "9e46a8e57d9ee136bd3ba7c21102533c9bf3e287", "parents": [ "0ab03c2b1478f2438d2c80204f7fef65b1bca9cf" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Sat Jan 08 17:39:21 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 09 16:26:51 2011 -0800" }, "message": "net/sock.h: make some fields private to fix kernel-doc warning(s)\n\nFix new kernel-doc notation warning in sock.h by annotating skc_dontcopy_*\nas private fields.\n\nWarning(include/net/sock.h:163): No description found for parameter \u0027skc_dontcopy_end[0]\u0027\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f682cefa5ad204d3bfaa54a58046c66d2d035ac1", "tree": "8c55a0b722df666bb0a75f5749c7457cd5d44f3b", "parents": [ "6623e3b24a5ebb07e81648c478d286a1329ab891" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Wed Jan 05 04:23:23 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 06 11:22:20 2011 -0800" }, "message": "netfilter: fix the race when initializing nf_ct_expect_hash_rnd\n\nSince nf_ct_expect_dst_hash() may be called without nf_conntrack_lock\nlocked, nf_ct_expect_hash_rnd should be initialized in the atomic way.\n\nIn this patch, we use nf_conntrack_hash_rnd instead of\nnf_ct_expect_hash_rnd.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "21f83589644bb2ed98079bf1e2154c8e70ca6a6c", "tree": "ede391a8c788a43f7c4ea3baa3367e020d45f179", "parents": [ "c96e96354a6c9456cdf1f150eca504e2ea35301e" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Sat Dec 18 17:20:47 2010 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jan 05 16:07:12 2011 -0500" }, "message": "mac80211: implement hardware offload for remain-on-channel\n\nThis allows drivers to support remain-on-channel\noffload if they implement smarter timing or need\nto use a device implementation like iwlwifi.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "c96e96354a6c9456cdf1f150eca504e2ea35301e", "tree": "751bec601fb8152116b8e31e0f1f83d687a37d6f", "parents": [ "dbbe68bb12b34f3e450da7a73c20e6fa1f85d63a", "33af88138b859f515b365a074e0a014d7cdbf846" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jan 05 16:06:25 2011 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jan 05 16:06:25 2011 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem\n\nConflicts:\n\tnet/bluetooth/Makefile\n" }, { "commit": "782a9e31e81956a271375c0ba8d46fbb0480983e", "tree": "0db1e951862111d3ea44fdcedeaee6ea55821165", "parents": [ "5c4bc1ce917d93ce8f7dd498fbec6881b3d7743a", "17f9cc3124c97f50a19a7597e5f29f915b5b835c" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jan 04 14:25:28 2011 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jan 04 14:25:28 2011 -0500" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6\n" }, { "commit": "ea45fe4e176a42d2396878f530cfdc8265bef37b", "tree": "bf4d4b035223b3e315fcdabf814398766482fb58", "parents": [ "6241b6259b16aa390ff4bf50f520685b3801200b" ], "author": { "name": "Shmulik Ravid", "email": "shmulikr@broadcom.com", "time": "Thu Dec 30 06:26:55 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 31 10:50:54 2010 -0800" }, "message": "dcbnl: adding DCBX feature flags get-set\n\nAdding a pair of set-get routines to dcbnl for setting the negotiation\nflags of the various DCB features. Conforms to the CEE flavor of DCBX\nThe user sets these flags (enable, advertise, willing) for each feature\nto be used by the DCBX engine. The \u0027get\u0027 routine returns which of the\nfeatures is enabled after the negotiation.\n\nThis patch is dependent on the following patches:\n[net-next-2.6 PATCH 1/3] dcbnl: add support for ieee8021Qaz attributes\n[net-next-2.6 PATCH 2/3] dcbnl: add appliction tlv handlers\n[net-next-2.6 PATCH 3/3] net_dcb: add application notifiers\n\nSigned-off-by: Shmulik Ravid \u003cshmulikr@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6241b6259b16aa390ff4bf50f520685b3801200b", "tree": "e80fbdd538b1edd1220b93103b66271194a0653d", "parents": [ "96b99684e365f28d49bdb1221ca022b75cb91a98" ], "author": { "name": "Shmulik Ravid", "email": "shmulikr@broadcom.com", "time": "Thu Dec 30 06:26:48 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 31 10:50:54 2010 -0800" }, "message": "dcbnl: adding DCBX engine capability\n\nAdding an optional DCBX capability and a pair for get-set routines for\nsetting the device DCBX mode. The DCBX capability is a bit field of\nsupported attributes. The user is expected to set the DCBX mode with a\nsubset of the advertised attributes.\n\nThis patch is dependent on the following patches:\n[net-next-2.6 PATCH 1/3] dcbnl: add support for ieee8021Qaz attributes\n[net-next-2.6 PATCH 2/3] dcbnl: add appliction tlv handlers\n[net-next-2.6 PATCH 3/3] net_dcb: add application notifiers\n\nSigned-off-by: Shmulik Ravid \u003cshmulikr@broadcom.com\u003e\nAcked-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" } ], "next": "96b99684e365f28d49bdb1221ca022b75cb91a98" }