)]}' { "log": [ { "commit": "25985edcedea6396277003854657b5f3cb31a628", "tree": "f026e810210a2ee7290caeb737c23cb6472b7c38", "parents": [ "6aba74f2791287ec407e0f92487a725a25908067" ], "author": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Wed Mar 30 22:57:33 2011 -0300" }, "committer": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Thu Mar 31 11:26:23 2011 -0300" }, "message": "Fix common misspellings\n\nFixes generated by \u0027codespell\u0027 and manually reviewed.\n\nSigned-off-by: Lucas De Marchi \u003clucas.demarchi@profusion.mobi\u003e\n" }, { "commit": "5e2b61f78411be25f0b84f97d5b5d312f184dfd1", "tree": "6a5faa5fb7a2242bebacba4cdb5722b988d3e909", "parents": [ "1018b5c01636c7c6bda31a719bda34fc631db29a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Mar 04 21:47:09 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Mar 04 21:55:31 2011 -0800" }, "message": "ipv4: Remove flowi from struct rtable.\n\nThe only necessary parts are the src/dst addresses, the\ninterface indexes, the TOS, and the mark.\n\nThe rest is unnecessary bloat, which amounts to nearly\n50 bytes on 64-bit.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0a0e9ae1bd788bc19adc4d4ae08c98b233697402", "tree": "13825eeb5bbeae27d66e95f12168eff4b60701ab", "parents": [ "01a16b21d6adf992aa863186c3c4e561a57c1714", "b65a0e0c84cf489bfa00d6aa6c48abc5a237100f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 03 21:27:42 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 03 21:27:42 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/bnx2x/bnx2x.h\n" }, { "commit": "d276055c4e90a7278cd5167ba9755c9b214bcff7", "tree": "d99d4e808f880921660dfdf73af8e97e3a6fdba9", "parents": [ "c53fa1ed92cd671a1dfb1e7569e9ab672612ddc6" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Mar 03 11:10:02 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 03 11:10:02 2011 -0800" }, "message": "net_sched: reduce fifo qdisc size\n\nBecause of various alignements [SLUB / qdisc], we use 512 bytes of\nmemory for one {p|b}fifo qdisc, instead of 256 bytes on 64bit arches and\n192 bytes on 32bit ones.\n\nMove the \"u32 limit\" inside \"struct Qdisc\" (no impact on other qdiscs)\n\nChange qdisc_alloc(), first trying a regular allocation before an\noversized one.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "52bc97470e22e67f11b054e51a31eee100ef6867", "tree": "46989e54ccf26090049482996d21af05c0db8aeb", "parents": [ "ddc3731fcb712646e4a0f8e6117af6a153e9d36f" ], "author": { "name": "Hagen Paul Pfeifer", "email": "hagen@jauu.net", "time": "Fri Feb 25 05:45:21 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 25 14:00:23 2011 -0800" }, "message": "sched: protocol only needed when CONFIG_NET_CLS_ACT is enabled\n\nSigned-off-by: Hagen Paul Pfeifer \u003chagen@jauu.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "78776d3f2b2b6d59e32cdaf3f30228a0d9d0b720", "tree": "4fb3ad17ca343c7137a81c54db6e22d0f2998a96", "parents": [ "1b0db64fb7693c1a131b7bcc38f7bc63fb396850" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 24 22:48:13 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 24 22:48:13 2011 -0800" }, "message": "sch_netem: Need to include vmalloc.h\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "26f70e1202b3c66c4f63b8b25e0419dd0b3a91e3", "tree": "1f36ea8036be58a50ec72e264aee7f26afaf0558", "parents": [ "250a65f78265940ac33a2dd2002924e6126efe14" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Feb 24 17:45:41 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 24 22:11:57 2011 -0800" }, "message": "sch_choke: add choke_skb_cb\n\nBetter document choke skb-\u003ecb[] use, like we did in netem and sfb\n\nThis adds a compile time check to make sure we dont exhaust skb-\u003ecb[]\nspace.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nCC: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "250a65f78265940ac33a2dd2002924e6126efe14", "tree": "ff3503e44602e55634bbb60f009be940f2fcc852", "parents": [ "661b79725fea030803a89a16cda506bac8eeca78" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Wed Feb 23 13:04:22 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 24 22:11:56 2011 -0800" }, "message": "netem: update version and cleanup\n\nGet rid of debug message that are not useful, and enable\nthe log messages in case of error.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "661b79725fea030803a89a16cda506bac8eeca78", "tree": "b13a294ecb7696c2c96db88f5b98627f5c4d4ad5", "parents": [ "10f6dfcfde884441db89dc66b945d6c948e1d356" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Wed Feb 23 13:04:21 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 24 22:11:56 2011 -0800" }, "message": "netem: revised correlated loss generator\n\nThis is a patch originated with Stefano Salsano and Fabio Ludovici.\nIt provides several alternative loss models for use with netem.\nThis patch adds two state machine based loss models.\n\nSee: http://netgroup.uniroma2.it/twiki/bin/view.cgi/Main/NetemCLG\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "10f6dfcfde884441db89dc66b945d6c948e1d356", "tree": "e88dbc0763faca774228cf9c2d42faa0cd0c8782", "parents": [ "df173bda2639ac744ccf596ec1f8f7e66fe4c343" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Wed Feb 23 13:04:20 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 24 22:11:55 2011 -0800" }, "message": "Revert \"sch_netem: Remove classful functionality\"\n\nMany users have wanted the old functionality that was lost\nto be able to use pfifo as inner qdisc for netem. The reason that\nnetem could not be classful with the older API was because of the\nlimitations of the old dequeue/requeue interface; now that qdisc API has\na peek function, there is no longer a problem with using any\ninner qdisc\u0027s.\n\nThis reverts commit 02201464119334690fe209849843881b8e9cfa9f.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "df173bda2639ac744ccf596ec1f8f7e66fe4c343", "tree": "bd74a3a10b0503c578eb1ba5dcd6a4bad59c47d1", "parents": [ "6373a9a286bdd955a76924cee88a2f8f784988b1" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Wed Feb 23 13:04:19 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 24 22:11:54 2011 -0800" }, "message": "netem: define NETEM_DIST_MAX\n\nRather than magic constant in code, expose the maximum size of\npacket distribution table in API. In iproute2, q_netem defines\nMAX_DIST as 16K already.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6373a9a286bdd955a76924cee88a2f8f784988b1", "tree": "9d49a02cbb695c1eeaa7867c649e22c901248447", "parents": [ "861d7f745f37506bbd90227e97b95baf2a5fac34" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Wed Feb 23 13:04:18 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 24 22:11:54 2011 -0800" }, "message": "netem: use vmalloc for distribution table\n\nThe netem probability table can be large (up to 64K bytes)\nwhich may be too large to allocate in one contiguous chunk.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "861d7f745f37506bbd90227e97b95baf2a5fac34", "tree": "023daf46baaadcf3f4ca049cb9e548e9410017ab", "parents": [ "290f5e3b594af70ac8f7fab44dba79ccae1531cd" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Wed Feb 23 13:04:17 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 24 22:11:53 2011 -0800" }, "message": "netem: cleanup dump code\n\nUse nla_put_nested to update netlink attribute value.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e0c563101a3f90ce4f4fa3df5ac803f5c50ebcc5", "tree": "f8c26ec822a2dbc4765ea770f6c019c8b11c8ea5", "parents": [ "ea18fd950e3210ec6d616e2e669550dd86f74d94" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Wed Feb 23 09:06:52 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 23 14:11:33 2011 -0800" }, "message": "em_meta: fix sparse warning\n\ngfp_t needs to be cast to integer.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ea18fd950e3210ec6d616e2e669550dd86f74d94", "tree": "a5e348053de016d3474aefa01a04018a79607ab8", "parents": [ "ada440e3b5c3c155c2a4d73c433b3462086dbb4a" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Wed Feb 23 09:06:51 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 23 14:11:32 2011 -0800" }, "message": "mqprio: cleanups\n\n* make qdisc_ops local\n* add sparse annotation about expected unlock/unlock in dump_class_stats\n* fix indentation\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e13e02a3c68d899169c78d9a18689bd73491d59a", "tree": "6e6b40ef37261df391cd445ec0f1b3d538b23a47", "parents": [ "dee9f4bceb5fd9dbfcc1567148fccdbf16d6a38a" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Feb 23 10:56:17 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 23 14:05:11 2011 -0800" }, "message": "net_sched: SFB flow scheduler\n\nThis is the Stochastic Fair Blue scheduler, based on work from :\n\nW. Feng, D. Kandlur, D. Saha, K. Shin. Blue: A New Class of Active Queue\nManagement Algorithms. U. Michigan CSE-TR-387-99, April 1999.\n\nhttp://www.thefengs.com/wuchang/blue/CSE-TR-387-99.pdf\n\nThis implementation is based on work done by Juliusz Chroboczek\n\nGeneral SFB algorithm can be found in figure 14, page 15:\n\nB[l][n] : L x N array of bins (L levels, N bins per level)\nenqueue()\nCalculate hash function values h{0}, h{1}, .. h{L-1}\nUpdate bins at each level\nfor i \u003d 0 to L - 1\n if (B[i][h{i}].qlen \u003e bin_size)\n B[i][h{i}].p_mark +\u003d p_increment;\n else if (B[i][h{i}].qlen \u003d\u003d 0)\n B[i][h{i}].p_mark -\u003d p_decrement;\np_min \u003d min(B[0][h{0}].p_mark ... B[L-1][h{L-1}].p_mark);\nif (p_min \u003d\u003d 1.0)\n ratelimit();\nelse\n mark/drop with probabilty p_min;\n\nI did the adaptation of Juliusz code to meet current kernel standards,\nand various changes to address previous comments :\n\nhttp://thread.gmane.org/gmane.linux.network/90225\nhttp://thread.gmane.org/gmane.linux.network/90375\n\nDefault flow classifier is the rxhash introduced by RPS in 2.6.35, but\nwe can use an external flow classifier if wanted.\n\ntc qdisc add dev $DEV parent 1:11 handle 11: \\\n est 0.5sec 2sec sfb limit 128\n\ntc filter add dev $DEV protocol ip parent 11: handle 3 \\\n flow hash keys dst divisor 1024\n\nNotes:\n\n1) SFB default child qdisc is pfifo_fast. It can be changed by another\nqdisc but a child qdisc MUST not drop a packet previously queued. This\nis because SFB needs to handle a dequeued packet in order to maintain\nits virtual queue states. pfifo_head_drop or CHOKe should not be used.\n\n2) ECN is enabled by default, unlike RED/CHOKe/GRED\n\nWith help from Patrick McHardy \u0026 Andi Kleen\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Juliusz Chroboczek \u003cJuliusz.Chroboczek@pps.jussieu.fr\u003e\nCC: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nCC: Patrick McHardy \u003ckaber@trash.net\u003e\nCC: Andi Kleen \u003candi@firstfloor.org\u003e\nCC: John W. Linville \u003clinville@tuxdriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "86fce3ba1e731cf6d97a4157a192ffa60dc7ec0b", "tree": "fceed07dcb1b16fdeed6d21543d6eff83d8741e0", "parents": [ "db62983a1e4b2af9e79c97af768f0c8b80bd93f0" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Sun Feb 20 16:14:23 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 22 11:22:33 2011 -0800" }, "message": "cls_u32: fix sparse warnings\n\nThe variable _data is used in asm-generic to define sections\nwhich causes sparse warnings, so just rename the variable.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5f04d5068a90602b93a7953e9a47c496705c6976", "tree": "272ea087a13648cb3dd34e0feed08cfc4b1e5e2c", "parents": [ "2205a6ea93fea76f88b43727fea53f3ce3790d6f" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Sun Feb 20 11:49:45 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Feb 20 11:49:45 2011 -0800" }, "message": "net: Fix more stale on-stack list_head objects.\n\nFrom: Eric W. Biederman \u003cebiederm@xmission.com\u003e\n\nIn the beginning with batching unreg_list was a list that was used only\nonce in the lifetime of a network device (I think). Now we have calls\nusing the unreg_list that can happen multiple times in the life of a\nnetwork device like dev_deactivate and dev_close that are also using the\nunreg_list. In addition in unregister_netdevice_queue we also do a\nlist_move because for devices like veth pairs it is possible that\nunregister_netdevice_queue will be called multiple times.\n\nSo I think the change below to fix dev_deactivate which Eric D. missed\nwill fix this problem. Now to go test that.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ac7100ba93428a26cde8e47dfcfcfbfbfcce66de", "tree": "1750fd2e7dc4b48748fe59d7737f460185ad5990", "parents": [ "263fb5b1bf9265d0e4ce59ff6ea92f478b5b61ea" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Mon Feb 14 19:02:23 2011 +0000" }, "committer": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Mon Feb 14 19:07:58 2011 +0000" }, "message": "sch_mqprio: Always set num_tc to 0 in mqprio_destroy()\n\nAll the cleanup code in mqprio_destroy() is currently conditional on\npriv-\u003eqdiscs being non-null, but that condition should only apply to\nthe per-queue qdisc cleanup. We should always set the number of\ntraffic classes back to 0 here.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\n" }, { "commit": "cdfb74d4c2e3bcc9383121af2591d0ae15007ba7", "tree": "585beab2e9f1b0b45bcfabae263e0018baacf2b7", "parents": [ "45e144339ac59971eb44be32e1282760aaabe861" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 02 23:06:31 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 02 23:06:31 2011 -0800" }, "message": "sch_choke: Need linux/vmalloc.h\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "45e144339ac59971eb44be32e1282760aaabe861", "tree": "b9d93acb2c1bb505d3b6facc426d307c59dc63a4", "parents": [ "119b3d386985fcd477b3131190c041516a73f83a" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Wed Feb 02 15:21:10 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 02 20:52:42 2011 -0800" }, "message": "sched: CHOKe flow scheduler\n\nCHOKe (\"CHOose and Kill\" or \"CHOose and Keep\") is an alternative\npacket scheduler based on the Random Exponential Drop (RED) algorithm.\n\nThe core idea is:\n For every packet arrival:\n \tCalculate Qave\n\tif (Qave \u003c minth)\n\t Queue the new packet\n\telse\n\t Select randomly a packet from the queue\n\t if (both packets from same flow)\n\t then Drop both the packets\n\t else if (Qave \u003e maxth)\n\t Drop packet\n\t else\n\t \t Admit packet with proability p (same as RED)\n\nSee also:\n Rong Pan, Balaji Prabhakar, Konstantinos Psounis, \"CHOKe: a stateless active\n queue management scheme for approximating fair bandwidth allocation\",\n Proceeding of INFOCOM\u00272000, March 2000.\n\nHelp from:\n Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\n Patrick McHardy \u003ckaber@trash.net\u003e\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "119b3d386985fcd477b3131190c041516a73f83a", "tree": "5a21a8c6d46efbbc604d5a1d53aa67c19076d4ab", "parents": [ "b299e4f001cfa16205f9121f4630970049652268" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Wed Feb 02 15:19:51 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 02 20:51:20 2011 -0800" }, "message": "sfq: deadlock in error path\n\nThe change to allow divisor to be a parameter (in 2.6.38-rc1)\n commit 817fb15dfd988d8dda916ee04fa506f0c466b9d6\nintroduced a possible deadlock caught by sparse.\n\nThe scheduler tree lock was left locked in the case of an incorrect\ndivisor value. Simplest fix is to move test outside of lock\nwhich also solves problem of partial update.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "144ce879b057c760194d808c90826cd96308f423", "tree": "cb98182f790baedda1e17c37e43b677b1912cac2", "parents": [ "682a1694115ec1c8fcd794c35b80354166978207" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jan 26 07:21:57 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 26 13:15:29 2011 -0800" }, "message": "net_sched: sch_mqprio: dont leak kernel memory\n\nmqprio_dump() should make sure all fields of struct tc_mqprio_qopt are\ninitialized.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: John Fastabend \u003cjohn.r.fastabend@intel.com\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": "23624935e0c4b04730ed8d7d21f0cd25b2c2cda1", "tree": "3fedc885d6bcd72c94fc239ae2ef98937f77c722", "parents": [ "bb134d2298b49f50cf6d9388410fba96272905dc" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri Jan 21 16:26:09 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 21 16:26:09 2011 -0800" }, "message": "net_sched: TCQ_F_CAN_BYPASS generalization\n\nNow qdisc stab is handled before TCQ_F_CAN_BYPASS test in\n__dev_xmit_skb(), we can generalize TCQ_F_CAN_BYPASS to other qdiscs\nthan pfifo_fast : pfifo, bfifo, pfifo_head_drop and sfq\n\nSFQ is special because it can have external classifiers, and in these\ncases, we cannot bypass queue discipline (packet could be dropped by\nclassifier) without admin asking it, or further changes.\n\nIts worth doing this, especially for SFQ, avoiding dirtying memory in\ncase no packets are already waiting in queue.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\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": "817fb15dfd988d8dda916ee04fa506f0c466b9d6", "tree": "9c857324cff66804949994cccb6050ef6b6c2aea", "parents": [ "3fbd8758b027995b677046dae46f9b41ea88c88f" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Jan 20 00:14:58 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 20 16:59:16 2011 -0800" }, "message": "net_sched: sfq: allow divisor to be a parameter\n\nSFQ currently uses a 1024 slots hash table, and its internal structure\n(sfq_sched_data) allocation needs order-1 page on x86_64\n\nAllow tc command to specify a divisor value (hash table size), between 1\nand 65536.\nIf no value is provided, assume the 1024 default size.\n\nThis allows admins to setup smaller (or bigger) SFQ for specific needs.\n\nThis also brings back sfq_sched_data allocations to order-0 ones, saving\n3KB per SFQ qdisc.\n\nJesper uses ~55.000 SFQ in one machine, this patch should free 165 MB of\nmemory.\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": "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": "cc7ec456f82da7f89a5b376e613b3ac4311b3e9a", "tree": "534729db08c10f40c090261cdc191dd2303dfc5c", "parents": [ "7180a03118cac7256fb04f929fe34d0aeee92c40" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jan 19 19:26:56 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 19 23:31:12 2011 -0800" }, "message": "net_sched: cleanups\n\nCleanup net/sched code to current CodingStyle and practices.\n\nReduce inline abuse\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b8970f0bfc78103cb74c66055de7379b15097840", "tree": "a85578cddfd506e049af0c78a56dd0ee342fc93b", "parents": [ "4f57c087de9b46182545676d2c594120a20f2e58" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Mon Jan 17 08:06:09 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 19 23:31:11 2011 -0800" }, "message": "net_sched: implement a root container qdisc sch_mqprio\n\nThis implements a mqprio queueing discipline that by default creates\na pfifo_fast qdisc per tx queue and provides the needed configuration\ninterface.\n\nUsing the mqprio qdisc the number of tcs currently in use along\nwith the range of queues alloted to each class can be configured. By\ndefault skbs are mapped to traffic classes using the skb priority.\nThis mapping is configurable.\n\nConfigurable parameters,\n\nstruct tc_mqprio_qopt {\n\t__u8 num_tc;\n\t__u8 prio_tc_map[TC_BITMASK + 1];\n\t__u8 hw;\n\t__u16 count[TC_MAX_QUEUE];\n\t__u16 offset[TC_MAX_QUEUE];\n};\n\nHere the count/offset pairing give the queue alignment and the\nprio_tc_map gives the mapping from skb-\u003epriority to tc.\n\nThe hw bit determines if the hardware should configure the count\nand offset values. If the hardware bit is set then the operation\nwill fail if the hardware does not implement the ndo_setup_tc\noperation. This is to avoid undetermined states where the hardware\nmay or may not control the queue mapping. Also minimal bounds\nchecking is done on the count/offset to verify a queue does not\nexceed num_tx_queues and that queue ranges do not overlap. Otherwise\nit is left to user policy or hardware configuration to create\nuseful mappings.\n\nIt is expected that hardware QOS schemes can be implemented by\ncreating appropriate mappings of queues in ndo_tc_setup().\n\nOne expected use case is drivers will use the ndo_setup_tc to map\nqueue ranges onto 802.1Q traffic classes. This provides a generic\nmechanism to map network traffic onto these traffic classes and\nremoves the need for lower layer drivers to know specifics about\ntraffic types.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.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": "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": "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": "1ac9ad1394fa542ac7ae0dc943ee3cda678799fa", "tree": "d846be421ed68f4fc612ae7c061783dab73d5fa2", "parents": [ "1949e084bfd143c76e22c0b37f370d6e7bf4bfdd" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jan 12 12:13:14 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 13 21:44:34 2011 -0800" }, "message": "net: remove dev_txq_stats_fold()\n\nAfter recent changes, (percpu stats on vlan/tunnels...), we dont need\nanymore per struct netdev_queue tx_bytes/tx_packets/tx_dropped counters.\n\nOnly remaining users are ixgbe, sch_teql, gianfar \u0026 macvlan :\n\n1) ixgbe can be converted to use existing tx_ring counters.\n\n2) macvlan incremented txq-\u003etx_dropped, it can use the\ndev-\u003estats.tx_dropped counter.\n\n3) sch_teql : almost revert ab35cd4b8f42 (Use net_device internal stats)\n Now we have ndo_get_stats64(), use it, even for \"unsigned long\"\nfields (No need to bring back a struct net_device_stats)\n\n4) gianfar adds a stats structure per tx queue to hold\ntx_bytes/tx_packets\n\nThis removes a lockdep warning (and possible lockup) in rndis gadget,\ncalling dev_get_stats() from hard IRQ context.\n\nRef: http://www.spinics.net/lists/netdev/msg149202.html\n\nReported-by: Neil Jones \u003cneiljay@gmail.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nCC: Alexander Duyck \u003calexander.h.duyck@intel.com\u003e\nCC: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nCC: Sandeep Gopalpet \u003csandeep.kumar@freescale.com\u003e\nCC: Michal Nazarewicz \u003cmina86@mina86.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": "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": "44b8288308ac9da27eab7d7bdbf1375a568805c3", "tree": "47fc194f0ff73d2fdb7d62d3d8d6d268ca660316", "parents": [ "dbbe68bb12b34f3e450da7a73c20e6fa1f85d63a" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jan 05 10:35:02 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 05 13:39:17 2011 -0800" }, "message": "net_sched: pfifo_head_drop problem\n\ncommit 57dbb2d83d100ea (sched: add head drop fifo queue)\nintroduced pfifo_head_drop, and broke the invariant that\nsch-\u003ebstats.bytes and sch-\u003ebstats.packets are COUNTER (increasing\ncounters only)\n\nThis can break estimators because est_timer() handles unsigned deltas\nonly. A decreasing counter can then give a huge unsigned delta.\n\nMy mid term suggestion would be to change things so that\nsch-\u003ebstats.bytes and sch-\u003ebstats.packets are incremented in dequeue()\nonly, not at enqueue() time. We also could add drop_bytes/drop_packets\nand provide estimations of drop rates.\n\nIt would be more sensible anyway for very low speeds, and big bursts.\nRight now, if we drop packets, they still are accounted in byte/packets\nabolute counters and rate estimators.\n\nBefore this mid term change, this patch makes pfifo_head_drop behavior\nsimilar to other qdiscs in case of drops :\nDont decrement sch-\u003ebstats.bytes and sch-\u003ebstats.packets\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: Hagen Paul Pfeifer \u003chagen@jauu.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0dfb33a0d7e2d9316eb4441a065ddd173f87223e", "tree": "7a5d88d43f1fd829070ba97008156bf5eeb37b0b", "parents": [ "7f891cf1fc0d5d5c5b359caec77e5383e1d55986" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Jan 03 08:11:38 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 03 12:13:15 2011 -0800" }, "message": "sch_red: report backlog information\n\nProvide child qdisc backlog (byte count) information so that \"tc -s\nqdisc\" can report it to user.\n\npacket count is already correctly provided.\n\nqdisc red 11: parent 1:11 limit 60Kb min 15Kb max 45Kb ecn\n Sent 3116427684 bytes 1415782 pkt (dropped 8, overlimits 7866 requeues 0)\n rate 242385Kbit 13630pps backlog 13560b 8p requeues 0\n marked 7865 early 1 pdrop 7 other 0\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "18c8d82ae5b802c5d82e0dfbcc08b1b568955f46", "tree": "6a9ff2bc889e63494b5636e9dbe8b8c9a5e296af", "parents": [ "eeaeb068f1393b4db4861481bf594bcd1c3eda7a" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri Dec 31 12:48:55 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 31 12:48:55 2010 -0800" }, "message": "sfq: fix slot_dequeue_head()\n\nslot_dequeue_head() should make sure slot skb chain is correct in both\nways, or we can crash if all possible flows are in use.\n\nJarek pointed out slot_queue_init() can now be done in sfq_init() once,\ninstead each time a flow is setup.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eeaeb068f1393b4db4861481bf594bcd1c3eda7a", "tree": "d3404b80033fa89b83e6e23fd9fbcb0d7dad614f", "parents": [ "0f333d10e3f689640b229c8cf00b16ea51ce4951" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Dec 28 21:53:33 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 31 12:47:37 2010 -0800" }, "message": "sch_sfq: allow big packets and be fair\n\nSFQ is currently \u0027limited\u0027 to small packets, because it uses a 15bit\nallotment number per flow. Introduce a scale by 8, so that we can handle\nfull size TSO/GRO packets.\n\nUse appropriate handling to make sure allot is positive before a new\npacket is dequeued, so that fairness is respected.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nCc: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ee09b3c1cff0335137dc1b146488e4352f640f13", "tree": "4f21be5938205963ab73f8ca2ebdd0f4a65f8b17", "parents": [ "503b1a529a6b62b31904bab4699752c523cf76b2" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Dec 22 11:39:59 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 22 11:39:59 2010 -0800" }, "message": "sfq: fix sfq class stats handling\n\nsfq_walk() runs without qdisc lock. By the time it selects a non empty\nhash slot and sfq_dump_class_stats() is run (with lock held), slot might\nhave been freed : We then access q-\u003eslots[SFQ_EMPTY_SLOT], out of\nbounds, and crash in slot_queue_walk()\n\nOn previous kernels, bug is here but out of bounds qs[SFQ_DEPTH] and\nallot[SFQ_DEPTH] are located in struct sfq_sched_data, so no illegal\nmemory access happens, only possibly wrong data reported to user.\n\nAlso, slot_dequeue_tail() should make sure slot skb chain is correctly\nterminated, or sfq_dump_class_stats() can access freed skbs.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4b7bd364700d9ac8372eff48832062b936d0793b", "tree": "0dbf78c95456a0b02d07fcd473281f04a87e266d", "parents": [ "c0d8768af260e2cbb4bf659ae6094a262c86b085", "90a8a73c06cc32b609a880d48449d7083327e11a" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Dec 22 18:57:02 2010 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Dec 22 18:57:02 2010 +0100" }, "message": "Merge branch \u0027master\u0027 into for-next\n\nConflicts:\n\tMAINTAINERS\n\tarch/arm/mach-omap2/pm24xx.c\n\tdrivers/scsi/bfa/bfa_fcpim.c\n\nNeeded to update to apply fixes for which the old branch was too\noutdated.\n" }, { "commit": "eda83e3b63e88351310c13c99178eb4634f137b2", "tree": "55b9c1f75337a8ca4032e607405e370b437c398e", "parents": [ "d9993be65a77f500ae926176baa264816bfe3816" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Dec 20 12:54:58 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 20 21:32:59 2010 -0800" }, "message": "net_sched: sch_sfq: better struct layouts\n\nHere is a respin of patch.\n\nI\u0027ll send a short patch to make SFQ more fair in presence of large\npackets as well.\n\nThanks\n\n[PATCH v3 net-next-2.6] net_sched: sch_sfq: better struct layouts\n\nThis patch shrinks sizeof(struct sfq_sched_data)\nfrom 0x14f8 (or more if spinlocks are bigger) to 0x1180 bytes, and\nreduce text size as well.\n\n text data bss dec hex filename\n 4821 152 0 4973 136d old/net/sched/sch_sfq.o\n 4627 136 0 4763 129b new/net/sched/sch_sfq.o\n\nAll data for a slot/flow is now grouped in a compact and cache friendly\nstructure, instead of being spreaded in many different points.\n\nstruct sfq_slot {\n struct sk_buff *skblist_next;\n struct sk_buff *skblist_prev;\n sfq_index qlen; /* number of skbs in skblist */\n sfq_index next; /* next slot in sfq chain */\n struct sfq_head dep; /* anchor in dep[] chains */\n unsigned short hash; /* hash value (index in ht[]) */\n short allot; /* credit for this slot */\n};\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nCc: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d9993be65a77f500ae926176baa264816bfe3816", "tree": "bbb8c86114bf86e5ca3d1fbf89de3d98be5519ba", "parents": [ "c4266263249f22479eb1abb1a1709c38240b1597", "aa3e219997e4b949be4199660936099ded0b401f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 20 13:24:14 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 20 13:24:14 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "aa3e219997e4b949be4199660936099ded0b401f", "tree": "e463d695dbf0e92f7fd2c6b3132bbb9c38493829", "parents": [ "914e5cea14b2e4651cdb0707e0936b43246deda0" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Dec 20 13:18:16 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 20 13:18:16 2010 -0800" }, "message": "net_sched: sch_sfq: fix allot handling\n\nWhen deploying SFQ/IFB here at work, I found the allot management was\npretty wrong in sfq, even changing allot from short to int...\n\nWe should init allot for each new flow, not using a previous value found\nin slot.\n\nBefore patch, I saw bursts of several packets per flow, apparently\ndenying the default \"quantum 1514\" limit I had on my SFQ class.\n\nclass sfq 11:1 parent 11: \n (dropped 0, overlimits 0 requeues 0) \n backlog 0b 7p requeues 0 \n allot 11546 \n\nclass sfq 11:46 parent 11: \n (dropped 0, overlimits 0 requeues 0) \n backlog 0b 1p requeues 0 \n allot -23873 \n\nclass sfq 11:78 parent 11: \n (dropped 0, overlimits 0 requeues 0) \n backlog 0b 5p requeues 0 \n allot 11393 \n\nAfter patch, better fairness among each flow, allot limit being\nrespected, allot is positive :\n\nclass sfq 11:e parent 11: \n (dropped 0, overlimits 0 requeues 86) \n backlog 0b 3p requeues 86 \n allot 596 \n\nclass sfq 11:94 parent 11: \n (dropped 0, overlimits 0 requeues 0) \n backlog 0b 3p requeues 0 \n allot 1468 \n\nclass sfq 11:a4 parent 11: \n (dropped 0, overlimits 0 requeues 0) \n backlog 0b 4p requeues 0 \n allot 650 \n\nclass sfq 11:bb parent 11: \n (dropped 0, overlimits 0 requeues 0) \n backlog 0b 3p requeues 0 \n allot 596 \n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c4266263249f22479eb1abb1a1709c38240b1597", "tree": "b9c57e63595f9eca69de0dfc245ba0000359bf90", "parents": [ "f955e1415f381c7fa6ebe8630cd1fe5a694e8f4a" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Dec 15 08:18:36 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 20 13:13:56 2010 -0800" }, "message": "net_sched: sch_sfq: add backlog info in sfq_dump_class_stats()\n\nWe currently return for each active SFQ slot the number of packets in\nqueue. We can also give number of bytes accounted for these packets.\n\ntc -s class show dev ifb0\n\nBefore patch :\n\nclass sfq 11:3d9 parent 11:\n (dropped 0, overlimits 0 requeues 0)\n backlog 0b 3p requeues 0\n allot 1266\n\nAfter patch :\n\nclass sfq 11:3e4 parent 11:\n (dropped 0, overlimits 0 requeues 0)\n backlog 4380b 3p requeues 0\n allot 1212\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "443457242beb6716b43db4d62fe148eab5515505", "tree": "0dbcf7dbaa7c6be6ca84631f3e865cde3d6b59f2", "parents": [ "c6c8fea29769d998d94fcec9b9f14d4b52b349d3" ], "author": { "name": "Octavian Purdila", "email": "opurdila@ixiacom.com", "time": "Mon Dec 13 12:44:07 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 16 14:04:44 2010 -0800" }, "message": "net: factorize sync-rcu call in unregister_netdevice_many\n\nAdd dev_close_many and dev_deactivate_many to factorize another\nsync-rcu operation on the netdevice unregister path.\n\n$ modprobe dummy numdummies\u003d10000\n$ ip link set dev dummy* up\n$ time rmmod dummy\n\nWithout the patch With the patch\n\nreal 0m 24.63s real 0m 5.15s\nuser 0m 0.00s user 0m 0.00s\nsys 0m 6.05s sys 0m 5.14s\n\nSigned-off-by: Octavian Purdila \u003copurdila@ixiacom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f2cd2d3e9b3ef960612e362f0ad129d735452df2", "tree": "bef1868cfc7dc66de7b2430a4b47b12bced05ec1", "parents": [ "0793f83f0ec2142d06abe53570417c8d95e0310a" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Nov 29 08:14:37 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 01 12:47:42 2010 -0800" }, "message": "net sched: use xps information for qdisc NUMA affinity\n\nAllocate qdisc memory according to NUMA properties of cpus included in\nxps map.\n\nTo be effective, qdisc should be (re)setup after changes\nof /sys/class/net/eth\u003cn\u003e/queues/tx-\u003cn\u003e/xps_cpus\n\nI added a numa_node field in struct netdev_queue, containing NUMA node\nif all cpus included in xps_cpus share same node, else -1.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nCc: Tom Herbert \u003ctherbert@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5a0d2268d259886f0c87131639d19eb4a67b4532", "tree": "952e6225fcee027f3a4ae8e1c2b2c889eff3a8b2", "parents": [ "d3c15cab213becc49a6f2ad7f48a59513a5f17dd" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Nov 23 10:42:02 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 28 10:47:18 2010 -0800" }, "message": "net: add netif_tx_queue_frozen_or_stopped\n\nWhen testing struct netdev_queue state against FROZEN bit, we also test\nXOFF bit. We can test both bits at once and save some cycles.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c996d8b9a8f37bd1b4dd7823abc42780b20998f8", "tree": "6f800886bdedd27876fdd3d97f2529558e66a1a9", "parents": [ "e987fa357a4c585e4f43fc3e0ab15ba9e908e233" ], "author": { "name": "Michael Witten", "email": "mfwitten@gmail.com", "time": "Mon Nov 15 19:55:34 2010 +0000" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Nov 15 23:50:13 2010 +0100" }, "message": "Docs/Kconfig: Update: osdl.org -\u003e linuxfoundation.org\n\nSome of the documentation refers to web pages under\nthe domain `osdl.org\u0027. However, `osdl.org\u0027 now\nredirects to `linuxfoundation.org\u0027.\n\nRather than rely on redirections, this patch updates\nthe addresses appropriately; for the most part, only\ndocumentation that is meant to be current has been\nupdated.\n\nThe patch should be pretty quick to scan and check;\neach new web-page url was gotten by trying out the\noriginal URL in a browser and then simply copying the\nthe redirected URL (formatting as necessary).\n\nThere is some conflict as to which one of these domain\nnames is preferred:\n\n linuxfoundation.org\n linux-foundation.org\n\nSo, I wrote:\n\n info@linuxfoundation.org\n\nand got this reply:\n\n Message-ID: \u003c4CE17EE6.9040807@linuxfoundation.org\u003e\n Date: Mon, 15 Nov 2010 10:41:42 -0800\n From: David Ames \u003cdavid@linuxfoundation.org\u003e\n\n ...\n\n linuxfoundation.org is preferred. The canonical name for our web site is\n www.linuxfoundation.org. Our list site is actually\n lists.linux-foundation.org.\n\n Regarding email linuxfoundation.org is preferred there are a few people\n who choose to use linux-foundation.org for their own reasons.\n\nConsequently, I used `linuxfoundation.org\u0027 for web pages and\n`lists.linux-foundation.org\u0027 for mailing-list web pages and email addresses;\nthe only personal email address I updated from `@osdl.org\u0027 was that of\nAndrew Morton, who prefers `linux-foundation.org\u0027 according `git log\u0027.\n\nSigned-off-by: Michael Witten \u003cmfwitten@gmail.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "4c46ee52589a4edd67447214eb489b10fed5c53a", "tree": "e495d87347d8632c7b16b0d537155bd6219ebcc6", "parents": [ "3ce1227c3c374c742ed78484226e24567f09ff99" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Thu Nov 04 11:47:04 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 08 12:17:05 2010 -0800" }, "message": "classifier: report statistics for basic classifier\n\nThe basic classifier keeps statistics but does not report it to user space.\nThis showed up when using basic classifier (with police) as a default catch\nall on ingress; no statistics were reported.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c00b2c9e79466d61979cd21af526cc6d5d0ee04f", "tree": "300e44d04f76b860580cb1ca5f0fc7b37112375a", "parents": [ "a6331d6f9a4298173b413cf99a40cc86a9d92c37" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Wed Nov 03 13:31:05 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 03 18:50:50 2010 -0700" }, "message": "cls_cgroup: Fix crash on module unload\n\nSomewhere along the lines net_cls_subsys_id became a macro when\ncls_cgroup is built as a module. Not only did it make cls_cgroup\ncompletely useless, it also causes it to crash on module unload.\n\nThis patch fixes this by removing that macro.\n\nThanks to Eric Dumazet for diagnosing this problem.\n\nReported-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nReviewed-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5ec1cea057495b8f10bab0c1396a9d8e46b7b0a8", "tree": "2115be233a12ce363f669831f5a2a554bafc8565", "parents": [ "636f8c6f682ee179ff39c94dc4d0be0ddd6c8cdd" ], "author": { "name": "Thomas Graf", "email": "tgraf@infradead.org", "time": "Sun Oct 31 09:37:38 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Oct 31 09:37:38 2010 -0700" }, "message": "text ematch: check for NULL pointer before destroying textsearch config\n\nWhile validating the configuration em_ops is already set, thus the\nindividual destroy functions are called, but the ematch data has\nnot been allocated and associated with the ematch yet.\n\nSigned-off-by: Thomas Graf \u003ctgraf@infradead.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5f05647dd81c11a6a165ccc8f0c1370b16f3bcb0", "tree": "7851ef1c93aa1aba7ef327ca4b75fd35e6d10f29", "parents": [ "02f36038c568111ad4fc433f6fa760ff5e38fab4", "ec37a48d1d16c30b655ac5280209edf52a6775d4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Oct 23 11:47:02 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Oct 23 11:47:02 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1699 commits)\n bnx2/bnx2x: Unsupported Ethtool operations should return -EINVAL.\n vlan: Calling vlan_hwaccel_do_receive() is always valid.\n tproxy: use the interface primary IP address as a default value for --on-ip\n tproxy: added IPv6 support to the socket match\n cxgb3: function namespace cleanup\n tproxy: added IPv6 support to the TPROXY target\n tproxy: added IPv6 socket lookup function to nf_tproxy_core\n be2net: Changes to use only priority codes allowed by f/w\n tproxy: allow non-local binds of IPv6 sockets if IP_TRANSPARENT is enabled\n tproxy: added tproxy sockopt interface in the IPV6 layer\n tproxy: added udp6_lib_lookup function\n tproxy: added const specifiers to udp lookup functions\n tproxy: split off ipv6 defragmentation to a separate module\n l2tp: small cleanup\n nf_nat: restrict ICMP translation for embedded header\n can: mcp251x: fix generation of error frames\n can: mcp251x: fix endless loop in interrupt handler if CANINTF_MERRF is set\n can-raw: add msg_flags to distinguish local traffic\n 9p: client code cleanup\n rds: make local functions/variables static\n ...\n\nFix up conflicts in net/core/dev.c, drivers/net/pcmcia/smc91c92_cs.c and\ndrivers/net/wireless/ath/ath9k/debug.c as per David\n" }, { "commit": "9941fb62762253774cc6177d0b9172ece5133fe1", "tree": "641fc2b376e2f84c7023aa0cd8b9d76f954cc3a1", "parents": [ "a5190b4eea1f1c53ee26b3d1176441cafa8e7f79", "3b1a1ce6f418cb7ab35eb55c8a6575987a524e30" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 21 08:21:34 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 21 08:21:34 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6\n" }, { "commit": "3511c9132f8b1e1b5634e41a3331c44b0c13be70", "tree": "fecff28f3bf8fbfdecd33d9b98253d60f1d45bf7", "parents": [ "26d8ee75e08cfca8b65ade871d68c8cd96e4ea23" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Sat Oct 16 13:04:08 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 21 03:09:47 2010 -0700" }, "message": "net_sched: remove the unused parameter of qdisc_create_dflt()\n\nThe first parameter dev isn\u0027t in use in qdisc_create_dflt().\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nAcked-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7b5edbc4cfe2297b0915adea5aa1eafcafadbf06", "tree": "e73820ca3521eb59d9e85bc6a420213bd1df0d3b", "parents": [ "d827d86b6fe87b420ef3c0685ab580290ae64beb" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri Oct 15 19:22:34 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 21 03:09:40 2010 -0700" }, "message": "net/sched: fix missing spinlock init\n\nUnder network load, doing :\n\ntc qdisc del dev eth0 root\n\ntriggers :\n\n[ 167.193087] BUG: spinlock bad magic on CPU#3, udpflood/4928\n[ 167.193139] lock: c15bc324, .magic: 00000000, .owner:\n\u003cnone\u003e/-1, .owner_cpu: -1\n[ 167.193193] Pid: 4928, comm: udpflood Not tainted\n2.6.36-rc7-11417-g215340c-dirty #323\n[ 167.193245] Call Trace:\n[ 167.193292] [\u003cc13abaa0\u003e] ? printk+0x18/0x20\n[ 167.193342] [\u003cc11afb53\u003e] spin_bug+0xa3/0xf0\n[ 167.193389] [\u003cc11afcdd\u003e] do_raw_spin_lock+0x7d/0x160\n[ 167.193440] [\u003cc1313d4e\u003e] ? __dev_xmit_skb+0x27e/0x2b0\n[ 167.193496] [\u003cc107382b\u003e] ? trace_hardirqs_on+0xb/0x10\n[ 167.193545] [\u003cc13ae99a\u003e] _raw_spin_lock+0x3a/0x40\n[ 167.193593] [\u003cc1313d4e\u003e] ? __dev_xmit_skb+0x27e/0x2b0\n[ 167.193641] [\u003cc1313d4e\u003e] __dev_xmit_skb+0x27e/0x2b0\n\ncommit 79640a4ca695 (add additional lock to qdisc to increase\nthroughput) forgot to initialize noop_qdisc and noqueue_qdisc busylock\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "75e1056f5c57050415b64cb761a3acc35d91f013", "tree": "e7cd483e38f9bf9131a3b212301a009890b8de49", "parents": [ "75dd321d79d495a0ee579e6249ebc38ddbb2667f" ], "author": { "name": "Venkatesh Pallipadi", "email": "venki@google.com", "time": "Mon Oct 04 17:03:16 2010 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Oct 18 20:52:20 2010 +0200" }, "message": "sched: Fix softirq time accounting\n\nPeter Zijlstra found a bug in the way softirq time is accounted in\nVIRT_CPU_ACCOUNTING on this thread:\n\n http://lkml.indiana.edu/hypermail//linux/kernel/1009.2/01366.html\n\nThe problem is, softirq processing uses local_bh_disable internally. There\nis no way, later in the flow, to differentiate between whether softirq is\nbeing processed or is it just that bh has been disabled. So, a hardirq when bh\nis disabled results in time being wrongly accounted as softirq.\n\nLooking at the code a bit more, the problem exists in !VIRT_CPU_ACCOUNTING\nas well. As account_system_time() in normal tick based accouting also uses\nsoftirq_count, which will be set even when not in softirq with bh disabled.\n\nPeter also suggested solution of using 2*SOFTIRQ_OFFSET as irq count\nfor local_bh_{disable,enable} and using just SOFTIRQ_OFFSET while softirq\nprocessing. The patch below does that and adds API in_serving_softirq() which\nreturns whether we are currently processing softirq or not.\n\nAlso changes one of the usages of softirq_count in net/sched/cls_cgroup.c\nto in_serving_softirq.\n\nLooks like many usages of in_softirq really want in_serving_softirq. Those\nchanges can be made individually on a case by case basis.\n\nSigned-off-by: Venkatesh Pallipadi \u003cvenki@google.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLKML-Reference: \u003c1286237003-12406-2-git-send-email-venki@google.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "243bf6e29eef642de0ff62f1ebf58bc2396d6d6e", "tree": "79f4eb37b594d320d4750e04ce6e16a7d62177f0", "parents": [ "87a2e70db62fec7348c6e5545eb7b7650c33d81b" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Wed Oct 13 16:28:00 2010 +0200" }, "committer": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Wed Oct 13 18:00:46 2010 +0200" }, "message": "netfilter: xtables: resolve indirect macros 3/3\n" }, { "commit": "87a2e70db62fec7348c6e5545eb7b7650c33d81b", "tree": "3aa5dcd79bf7d331c4a69a3a9b1c5b01f00233ad", "parents": [ "12b00c2c025b8af697d9a022ea2e928cad889ef1" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Wed Oct 13 16:11:22 2010 +0200" }, "committer": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Wed Oct 13 18:00:41 2010 +0200" }, "message": "netfilter: xtables: resolve indirect macros 2/3\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\n" }, { "commit": "0ed8ddf4045fcfcac36bad753dc4046118c603ec", "tree": "cf1d9eb14668c4d2257b3519ed7deec8c5cb396d", "parents": [ "d122179a3c0fdc71b88cb9e3605f372b1651a9ff" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Oct 07 10:44:07 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 11 12:54:04 2010 -0700" }, "message": "neigh: Protect neigh-\u003eha[] with a seqlock\n\nAdd a seqlock in struct neighbour to protect neigh-\u003eha[], and avoid\ndirtying neighbour in stress situation (many different flows / dsts)\n\nDirtying takes place because of read_lock(\u0026n-\u003elock) and n-\u003eused writes.\n\nSwitching to a seqlock, and writing n-\u003eused only on jiffies changes\npermits less dirtying.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e18434c45765cfc4a74b5c61da9e9fbc6ddd3d5f", "tree": "ebe8785ec3006924e6ae0b773dfed3050a5bbdca", "parents": [ "4315d834c1496ddca977e9e22002b77c85bfec2c" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Thu Sep 30 06:17:44 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Oct 09 09:22:53 2010 -0700" }, "message": "net_sched: use __TCA_HTB_MAX and TCA_HTB_MAX\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "69259abb64d4da77273bf59accfc9fa79e7165f4", "tree": "bd043ab03a788b749c8d5ae4049d8defae9abf34", "parents": [ "dd53df265b1ee7a1fbbc76bb62c3bec2383bbd44", "12e94471b2be5ef9b55b10004a3a2cd819490036" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 06 19:39:31 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 06 19:39:31 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/pcmcia/pcnet_cs.c\n\tnet/caif/caif_socket.c\n" }, { "commit": "4e18b3edf71f5d4ad653e3c2ff6560878e965f96", "tree": "63487292026992afbf5226f44bec12a1264686e9", "parents": [ "51e97a12bef19b7e43199fc153cf9bd5f2140362" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Mon Oct 04 02:28:36 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 05 00:40:39 2010 -0700" }, "message": "cls_u32: signedness bug\n\nskb_headroom() is unsigned so \"skb_headroom(skb) + toff\" is also\nunsigned and can\u0027t be less than zero. This test was added in 66d50d25:\n\"u32: negative offset fix\" It was supposed to fix a regression.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "24824a09e35402b8d58dcc5be803a5ad3937bdba", "tree": "65c5fa4046646623b130702c9abc92c485ec575b", "parents": [ "0bd9e6a964d86a19f54a9ba31168a37d64e451d1" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sat Oct 02 06:11:55 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 05 00:23:44 2010 -0700" }, "message": "net: dynamic ingress_queue allocation\n\ningress being not used very much, and net_device-\u003eingress_queue being\nquite a big object (128 or 256 bytes), use a dynamic allocation if\nneeded (tc qdisc add dev eth0 ingress ...)\n\ndev_ingress_queue(dev) helper should be used only with RTNL taken.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bfa5ae63b823f4ffd3483a05f60a93a4a7b7d680", "tree": "62dc495022ac697d81c3b80f5a262713e6f657a3", "parents": [ "8560f2266b36adb43238f1f9fd13958dd031901c" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Sep 28 05:58:37 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 29 13:25:53 2010 -0700" }, "message": "net: rename netdev rx_queue to ingress_queue\n\nThere is some confusion with rx_queue name after RPS, and net drivers\nprivate rx_queue fields.\n\nI suggest to rename \"struct net_device\"-\u003erx_queue to ingress_queue.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e40051d134f7ee95c8c1f7a3471e84eafc9ab326", "tree": "88eb44e49a75721ae926665a2c42f08badac9d07", "parents": [ "42099d7a3941d4aaf853caac92b3ae76149fc6e7", "2cc6d2bf3d6195fabcf0febc192c01f99519a8f3" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 27 01:03:03 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 27 01:03:03 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/qlcnic/qlcnic_init.c\n\tnet/ipv4/ip_output.c\n" }, { "commit": "a505b3b30fc69904f858822a2aa95990a4bf7958", "tree": "4ea708f794d8cb91f77d42e32fce5324902cc274", "parents": [ "053d8f6622701f849fda2ca2c9ae596c13599ba9" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Sep 12 11:56:44 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Sep 12 11:56:44 2010 -0700" }, "message": "sch_atm: Fix potential NULL deref.\n\nThe list_head conversion unearther an unnecessary flow\ncheck. Since flow is always NULL here we don\u0027t need to\nsee if a matching flow exists already.\n\nReported-by: Jiri Slaby \u003cjirislaby@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e548833df83c3554229eff0672900bfe958b45fd", "tree": "85efc4a76dc356593d6d394776aeb845dc580fb6", "parents": [ "cbd9da7be869f676afc204e1a664163778c770bd", "053d8f6622701f849fda2ca2c9ae596c13599ba9" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 09 22:27:33 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 09 22:27:33 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tnet/mac80211/main.c\n" }, { "commit": "3b2eb6131e2f6ff646abb0fc69648179b8b70216", "tree": "c868e5eadcccb39ad4d2731c21caccd3098eff56", "parents": [ "9c01ae58d4fee39e2af5b1379ee5431dd585cf62" ], "author": { "name": "Michal Soltys", "email": "soltys@ziu.info", "time": "Mon Aug 30 11:34:10 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 01 14:29:35 2010 -0700" }, "message": "net/sched/sch_hfsc.c: initialize parent\u0027s cl_cfmin properly in init_vf()\n\nThis patch fixes init_vf() function, so on each new backlog period parent\u0027s\ncl_cfmin is properly updated (including further propgation towards the root),\neven if the activated leaf has no upperlimit curve defined.\n\nSigned-off-by: Michal Soltys \u003csoltys@ziu.info\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0f04cfd098fb81fded74e78ea1a1b86cc6c6c31e", "tree": "cec4306a238658123aaba429a7cdb679c8deb801", "parents": [ "78b620ce9e168d08ecfac2f4bb056c511b0601ec" ], "author": { "name": "Jeff Mahoney", "email": "jeffm@suse.com", "time": "Tue Aug 31 13:21:42 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 01 14:29:34 2010 -0700" }, "message": "net sched: fix kernel leak in act_police\n\nWhile reviewing commit 1c40be12f7d8ca1d387510d39787b12e512a7ce8, I\n audited other users of tc_action_ops-\u003edump for information leaks.\n\n That commit covered almost all of them but act_police still had a leak.\n\n opt.limit and opt.capab aren\u0027t zeroed out before the structure is\n passed out.\n\n This patch uses the C99 initializers to zero everything unused out.\n\nSigned-off-by: Jeff Mahoney \u003cjeffm@suse.com\u003e\nAcked-by: Jeff Mahoney \u003cjeffm@suse.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c2e3143e3c46ede22336316b3ff4746727c0d93a", "tree": "28fa33bc3ef923614066377e5a954b88cb87148a", "parents": [ "5a46790ca4c40fdb6ed5336d7d6b593c96326b31" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Tue Aug 24 14:48:10 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 24 14:48:10 2010 -0700" }, "message": "tc: add meta match on receive hash\n\nTrivial extension to existing meta data match rules to allow\nmatching on skb receive hash value.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0eec32ff350348e635b3b8d87b989117ce045d25", "tree": "f72ca99d915191d89e3446d599c0937cf6405acf", "parents": [ "7abac686026ec1af38f6e766369dbfe4007949b6" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Mon Aug 23 03:27:58 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 23 20:43:15 2010 -0700" }, "message": "net_sched: act_csum: coding style cleanup\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7abac686026ec1af38f6e766369dbfe4007949b6", "tree": "a29f7c29a4dce09ba5a515020cefdb444a51877e", "parents": [ "ccea790ef033cc890ca4b416a783e9f9dffe556e" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 23 20:42:11 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 23 20:42:11 2010 -0700" }, "message": "pkt_sched: Make act_csum depend upon INET.\n\nIt uses ip_send_check() and stuff like that.\n\nReported-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2436243a39de56f03d38c74139261cc61bea8456", "tree": "5b2426d71f5b0fcc0543a7a3d8d093383faf6afd", "parents": [ "d8287fc864643beaf1623c92aceb1ab38eae0648" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Sun Aug 22 20:31:14 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Aug 22 20:31:14 2010 -0700" }, "message": "net/sched: need to include net/ip6_checksum.h\n\nfor the declararion of csum_ipv6_magic.\n\nFixes this build error on PowerPC (at least):\n\nnet/sched/act_csum.c: In function \u0027tcf_csum_ipv6_icmp\u0027:\nnet/sched/act_csum.c:178: error: implicit declaration of function \u0027csum_ipv6_magic\u0027\n\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "739a91ef0625e0e4a40b835f4f891313c47915df", "tree": "bfcb025c8b446a81e82f0b57ad76168996ce49bc", "parents": [ "81ce790bd75d49a0d119f5d7b27405e1d9b1bd57" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Sat Aug 21 06:23:15 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 21 23:40:14 2010 -0700" }, "message": "net_sched: cls_flow: add key rxhash\n\nWe can use rxhash to classify the traffic into flows. As rxhash maybe\nsupplied by NIC or RPS, it is cheaper.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nAcked-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d3c6e7ad09cebbad1a3dea077668062136626fd2", "tree": "698022508a8d8c76a5d2cf55e50232079d6b1f42", "parents": [ "c3227e546c574172e77616270a16a04eae561b8f", "48d3ff82698cb0094684aed70446e0a5cbb1a4d0" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 21 23:32:24 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 21 23:32:24 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "eb4d40654505e47aa9d2035bb97f631fa61d14b4", "tree": "bed2a1c5026e9797c0ed48c67c48b050e7f07e3c", "parents": [ "49e8ab03ebcacd8e37660ffec20c0c46721a2800" ], "author": { "name": "Grégoire Baron", "email": "baronchon@n7mm.org", "time": "Wed Aug 18 13:10:35 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Aug 20 01:42:59 2010 -0700" }, "message": "net/sched: add ACT_CSUM action to update packets checksums\n\nnet/sched: add ACT_CSUM action to update packets checksums\n\nACT_CSUM can be called just after ACT_PEDIT in order to re-compute some\naltered checksums in IPv4 and IPv6 packets. The following checksums are\nsupported by this patch:\n - IPv4: IPv4 header, ICMP, IGMP, TCP, UDP \u0026 UDPLite\n - IPv6: ICMPv6, TCP, UDP \u0026 UDPLite\nIt\u0027s possible to request in the same action to update different kind of\nchecksums, if the packets flow mix TCP, UDP and UDPLite, ...\n\nAn example of usage is done in the associated iproute2 patch.\n\nVersion 3 changes:\n - remove useless goto instructions\n - improve IPv6 hop options decoding\n\nVersion 2 changes:\n - coding style correction\n - remove useless arguments of some functions\n - use stack in tcf_csum_dump()\n - add tcf_csum_skb_nextlayer() to factor code\n\nSigned-off-by: Gregoire Baron \u003cbaronchon@n7mm.org\u003e\nAcked-by: jamal \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b9959c2e4460b1df1d113d829180398588bb04b4", "tree": "417b3f0564e6df025f272005f971ec859216b815", "parents": [ "aca071c1c1c07bcc0b100b7c58e59790d6be6a69" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Tue Aug 17 19:07:35 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 19 17:16:25 2010 -0700" }, "message": "net_sched: sch_sfq: use proto_ports_offset() to support AH message\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "78d3307eded853f01c5e9aaa8c0768c2f75825a3", "tree": "fe49617979b370786ce7c80b723acbc707ea6012", "parents": [ "12fcdefb3643607c47f39906a49056cf608bb545" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Tue Aug 17 19:05:08 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 19 17:16:24 2010 -0700" }, "message": "net_sched: cls_flow: use proto_ports_offset() to support AH message\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "00093fab980d0a8950a64bdf9e346d0497b9a7e4", "tree": "4f222456af157773cbf32f9f06ea0169fbcf929e", "parents": [ "666be4298bd8f9508b32833b17a686dde630f2a5" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Sat Aug 14 11:09:49 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 18 14:24:51 2010 -0700" }, "message": "net/sched: remove unneeded NULL check\n\nThere is no need to check \"s\". nla_data() doesn\u0027t return NULL. Also we\nalready dereferenced \"s\" at this point so it would have oopsed ealier if\nit were NULL.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1c40be12f7d8ca1d387510d39787b12e512a7ce8", "tree": "f555374eb0af8cf96d0dafb2444335ee352f73b4", "parents": [ "001389b9581c13fe5fc357a0f89234f85af4215d" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Aug 16 20:04:22 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 17 15:12:15 2010 -0700" }, "message": "net sched: fix some kernel memory leaks\n\nWe leak at least 32bits of kernel memory to user land in tc dump,\nbecause we dont init all fields (capab ?) of the dumped structure.\n\nUse C99 initializers so that holes and non explicit fields are zeroed.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3e9e5a5921f4b7dc098a01d01e5972bebb36491e", "tree": "d4b50906ae56ff923e6a4ed4a20081a6da742c47", "parents": [ "41065fba846e795b31b17e4dec01cb904d56c6cd" ], "author": { "name": "Jarek Poplawski", "email": "jarkao2@gmail.com", "time": "Tue Aug 10 22:31:20 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 11 01:37:00 2010 -0700" }, "message": "pkt_sched: Check .walk and .leaf class handlers\n\nRequire qdisc class ops .walk and .leaf for classful qdisc in\nregister_qdisc(). The checks could be done later insted, but these\nops are really needed and used by most of classful qdiscs.\n\nSigned-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "41065fba846e795b31b17e4dec01cb904d56c6cd", "tree": "fbe25b8223c1fe8d2abc1e21cb4eb37fdb5ed7dc", "parents": [ "98a21ef0abb666eeb12cf67e60203befb07e4210" ], "author": { "name": "Jarek Poplawski", "email": "jarkao2@gmail.com", "time": "Tue Aug 10 22:31:02 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 11 01:36:59 2010 -0700" }, "message": "pkt_sched: Fix sch_sfq vs tc_modify_qdisc oops\n\nsch_sfq as a classful qdisc needs the .leaf handler. Otherwise, there\nis an oops possible in tc_modify_qdisc()/check_loop().\n\nFixes commit 7d2681a6ff4f9ab5e48d02550b4c6338f1638998\n\nSigned-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9871e50edd25e2adf69b369817100821cb1e6de8", "tree": "ba44998e2c45d3ff842c42dd7fcc4e2c0e69e4e6", "parents": [ "06d88e4a88cf6a90de6f0744e2cc320eb67aac81" ], "author": { "name": "Ben Greear", "email": "greearb@candelatech.com", "time": "Tue Aug 10 01:45:40 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 10 02:51:11 2010 -0700" }, "message": "net: Use NET_XMIT_SUCCESS where possible.\n\nThis is based on work originally done by Patric McHardy.\n\nSigned-off-by: Ben Greear \u003cgreearb@candelatech.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "68fd26b59856b466edd14d8a90d01255983cd3ee", "tree": "75dc4e5cb9c5af0b8281b278ae408efdf1569ad8", "parents": [ "da7115d94a15f53efa224e47f16c57fd1998355f" ], "author": { "name": "Jarek Poplawski", "email": "jarkao2@gmail.com", "time": "Mon Aug 09 12:18:48 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 10 01:39:14 2010 -0700" }, "message": "pkt_sched: Add some basic qdisc class ops verification. Was: [PATCH] sfq: add dummy bind/unbind handles\n\nVerify in register_qdisc() some basic qdisc class handlers are present.\n\nSigned-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "da7115d94a15f53efa224e47f16c57fd1998355f", "tree": "ac7b43d73deeaed5b525ea0d1fdeb1feb0d01f0d", "parents": [ "e88db3bd46801a9c2cd0ac5e46122d47c285faec" ], "author": { "name": "Jarek Poplawski", "email": "jarkao2@gmail.com", "time": "Mon Aug 09 12:18:17 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 10 01:39:13 2010 -0700" }, "message": "pkt_sched: sch_sfq: Add dummy unbind_tcf and put handles. Was: [PATCH] sfq: add dummy bind/unbind handles\n\nAdd dummy .unbind_tcf and .put qdisc class ops for easier verification.\n(All other schedulers have it like this.)\n\nSigned-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eb4a5527b1f0d581ac217c80ef3278ed5e38693c", "tree": "a7236e97a07c46ab8360532abedde9bd96b72032", "parents": [ "cece1945bffcf1a823cdfa36669beae118419351" ], "author": { "name": "Jarek Poplawski", "email": "jarkao2@gmail.com", "time": "Fri Aug 06 00:22:35 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 07 22:45:41 2010 -0700" }, "message": "pkt_sched: Fix sch_sfq vs tcf_bind_filter oops\n\nSince there was added -\u003etcf_chain() method without -\u003ebind_tcf() to\nsch_sfq class options, there is oops when a filter is added with\nthe classid parameter.\n\nFixes commit 7d2681a6ff4f9ab5e48d02550b4c6338f1638998\nnetdev thread: null pointer at cls_api.c\n\nSigned-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nReported-by: Franchoze Eric \u003cfranchoze@yandex.ru\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f2f009812f1fdcaf40fa547282c1b90d3b702a7d", "tree": "d6738a7481f2ee97cabfa44859a084d957d421c3", "parents": [ "12dc96d1673feabef98eed1b5ff37abaa67fbe64" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Wed Aug 04 04:58:59 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 04 21:53:16 2010 -0700" }, "message": "sch_sfq: add sanity check for the packet length\n\nThe packet length should be checked before the packet data is dereferenced.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "12dc96d1673feabef98eed1b5ff37abaa67fbe64", "tree": "4f92d2b0eac8e5e2ceedfe42ae0182302d28de65", "parents": [ "4b95c3d40d7d9927438ed7b7b49c84c60e27b65b" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Wed Aug 04 04:55:40 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 04 21:53:15 2010 -0700" }, "message": "cls_rsvp: add sanity check for the packet length\n\nThe packet length should be checked before the packet data is dereferenced.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4b95c3d40d7d9927438ed7b7b49c84c60e27b65b", "tree": "322f6e8e9f044accae4eda032b04d1daeec00358", "parents": [ "f9599ce11192f24dbb0f4fdb70121a05edc58342" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Wed Aug 04 04:48:12 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 04 21:53:15 2010 -0700" }, "message": "cls_flow: add sanity check for the packet length\n\nThe packet length should be checked before the packet data is dereferenced.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nAcked-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "36d12690a2e9bcacae5a2a7e0fb6345a3caad625", "tree": "f3e451b268d498af9ec171f6b454538091010f71", "parents": [ "c33788b45f754bd5dd8adc520e37fa38ac1849c7" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Tue Aug 03 17:39:18 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 04 21:53:14 2010 -0700" }, "message": "act_nat: fix on the TX path\n\nOn the TX path, skb-\u003edata points to the ethernet header, not the network\nheader. So when validating the packet length for accessing we should\ntake the ethernet header into account.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nAcked-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "00dad5e479531e379aba7358600cc768725d4f1f", "tree": "652199eacee32c2cf317f5a54da8265973d29978", "parents": [ "c477d0447db08068a497e7beb892b2b2a7bff64b", "3a3dfb062c2e086c202d34f09ce29634515ad256" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 02 22:22:46 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 02 22:22:46 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/e1000e/hw.h\n\tnet/bridge/br_device.c\n\tnet/bridge/br_input.c\n" }, { "commit": "66d50d25502cd9b7d6e3ebbf4e241259c1283eaf", "tree": "a8738a77a087122167a2d881a8d0833255bbadb4", "parents": [ "eabd8ba9060444cac5b89a3306e607c15ec37418" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Mon Aug 02 13:44:13 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 02 22:07:45 2010 -0700" }, "message": "u32: negative offset fix\n\nIt was possible to use a negative offset in a u32 match to reference\nthe ethernet header or other parts of the link layer header.\nThis fixes the regression caused by:\n\ncommit fbc2e7d9cf49e0bf89b9e91fd60a06851a855c5d\nAuthor: Changli Gao \u003cxiaosuo@gmail.com\u003e\nDate: Wed Jun 2 07:32:42 2010 -0700\n\n cls_u32: use skb_header_pointer() to dereference data safely\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3a3dfb062c2e086c202d34f09ce29634515ad256", "tree": "01569a926ed206fa91736eb06def56d000e46791", "parents": [ "072d79a31a3b870b49886f4347e23f81b7eca3ac" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Thu Jul 29 14:04:18 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jul 31 22:04:55 2010 -0700" }, "message": "act_nat: the checksum of ICMP doesn\u0027t have pseudo header\n\nafter updating the value of the ICMP payload, inet_proto_csum_replace4() should\nbe called with zero pseudohdr.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nAcked-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "072d79a31a3b870b49886f4347e23f81b7eca3ac", "tree": "e007177c6d42e63a610ba0a8a811c0b4b1c0841a", "parents": [ "6d1d1d398cb7db7a12c5d652d50f85355345234f" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Thu Jul 29 13:41:46 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jul 31 22:04:54 2010 -0700" }, "message": "act_nat: fix wild pointer\n\npskb_may_pull() may change skb pointers, so adjust icmph after pskb_may_pull().\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nAcked-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" } ], "next": "bb7e95c8fd859922c6cf3ebbb3a8546007df1748" }