)]}' { "log": [ { "commit": "b1109bf085c8dd69537b7876ea83f914dd1fe46a", "tree": "086bd9891a8c92284ea148c93f2242e6c7c02bd2", "parents": [ "889b8f964f2f226b7cd5a0a515109e3d8d9d1613", "44bfce5c3ec91baf8ffcd075c66711740f29a949" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 09 11:44:44 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 09 11:44:44 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "d4ae20b3799e0b6fa0d832a645a422da9f239868", "tree": "6a02e8110b4eb72230ecc985828ef5b6099f37ee", "parents": [ "2d171886b183982feb03446997c65e9e212b948e" ], "author": { "name": "Jan Luebbe", "email": "jluebbe@debian.org", "time": "Mon Feb 08 22:41:44 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Feb 08 22:41:44 2010 -0800" }, "message": "net/sched: Fix module name in Kconfig\n\nThe action modules have been prefixed with \u0027act_\u0027, but the Kconfig\ndescription was not changed.\n\nSigned-off-by: Jan Luebbe \u003cjluebbe@debian.org\u003e\nAcked-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "57dbb2d83d100ea601c54fe129bfde0678db5dee", "tree": "40305bcd986692f512b1b5e848c0b0f612968c6a", "parents": [ "d74340d31bf1dbeb00acadddd8697666528a7846" ], "author": { "name": "Hagen Paul Pfeifer", "email": "hagen@jauu.net", "time": "Sun Jan 24 12:30:59 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 28 21:27:00 2010 -0800" }, "message": "sched: add head drop fifo queue\n\nThis adds an additional queuing strategy, called pfifo_head_drop,\nto remove the oldest skb in the case of an overflow within the queue -\nthe head element - instead of the last skb (tail). To remove the oldest\nskb in congested situations is useful for sensor network environments\nwhere newer packets reflect the superior information.\n\nReviewed-by: Florian Westphal \u003cfw@strlen.de\u003e\nAcked-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: Hagen Paul Pfeifer \u003chagen@jauu.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4ef58d4e2ad1fa2a3e5bbf41af2284671fca8cf8", "tree": "856ba96302a36014736747e8464f80eeb827bbdd", "parents": [ "f6c4c8195b5e7878823caa1181be404d9e86d369", "d014d043869cdc591f3a33243d3481fa4479c2d0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 09 19:43:33 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 09 19:43:33 2009 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits)\n tree-wide: fix misspelling of \"definition\" in comments\n reiserfs: fix misspelling of \"journaled\"\n doc: Fix a typo in slub.txt.\n inotify: remove superfluous return code check\n hdlc: spelling fix in find_pvc() comment\n doc: fix regulator docs cut-and-pasteism\n mtd: Fix comment in Kconfig\n doc: Fix IRQ chip docs\n tree-wide: fix assorted typos all over the place\n drivers/ata/libata-sff.c: comment spelling fixes\n fix typos/grammos in Documentation/edac.txt\n sysctl: add missing comments\n fs/debugfs/inode.c: fix comment typos\n sgivwfb: Make use of ARRAY_SIZE.\n sky2: fix sky2_link_down copy/paste comment error\n tree-wide: fix typos \"couter\" -\u003e \"counter\"\n tree-wide: fix typos \"offest\" -\u003e \"offset\"\n fix kerneldoc for set_irq_msi()\n spidev: fix double \"of of\" in comment\n comment typo fix: sybsystem -\u003e subsystem\n ...\n" }, { "commit": "f64f9e719261a87818dd192a3a2352e5b20fbd0f", "tree": "b2d5cbaef3df615295f6061d8c4d6a912690556c", "parents": [ "152b6a62aea2d43359dd37004e9c218bf7bdeb3b" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sun Nov 29 16:55:45 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 29 16:55:45 2009 -0800" }, "message": "net: Move \u0026\u0026 and || to end of previous line\n\nNot including net/atm/\n\nCompiled tested x86 allyesconfig only\nAdded a \u003e 80 column line or two, which I ignored.\nExisting checkpatch plaints willfully, cheerfully ignored.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "09ad9bc752519cc167d0a573e1acf69b5c707c67", "tree": "0e190a9ffb90d7e0534136c3e9f31dce02f423c3", "parents": [ "4ba3eb034fb6fd1990ccc5a6d71d5abcda37b905" ], "author": { "name": "Octavian Purdila", "email": "opurdila@ixiacom.com", "time": "Wed Nov 25 15:14:13 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 25 15:14:13 2009 -0800" }, "message": "net: use net_eq to compare nets\n\nGenerated with the following semantic patch\n\n@@\nstruct net *n1;\nstruct net *n2;\n@@\n- n1 \u003d\u003d n2\n+ net_eq(n1, n2)\n\n@@\nstruct net *n1;\nstruct net *n2;\n@@\n- n1 !\u003d n2\n+ !net_eq(n1, n2)\n\napplied over {include,net,drivers/net}.\n\nSigned-off-by: Octavian Purdila \u003copurdila@ixiacom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8964be4a9a5ca8cab1219bb046db2f6d1936227c", "tree": "8838c73a03cc69c010b55928fce3725d17bc26a9", "parents": [ "fa9a6fed87df1b50804405e700f8d30251d3aaf1" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri Nov 20 15:35:04 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 20 15:35:04 2009 -0800" }, "message": "net: rename skb-\u003eiif to skb-\u003eskb_iif\n\nTo help grep games, rename iif to skb_iif\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2939e275994977b6c9eb7fd082b7b0caa35b96b0", "tree": "25bb3e0c2b38274b24fd7f808d78f8d083d9e02a", "parents": [ "3505d1a9fd65e2d3e00827857b6795d9d8983658" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Nov 18 23:24:41 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 18 23:24:41 2009 -0800" }, "message": "netsched: Allow var_sk_bound_if meta to work on all namespaces\n\nThis fix can probably wait 2.6.33, or should use another patch\nif needed in 2.6.32 (no get_dev_by_index_rcu() before 2.6.33)\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b76965e02bfdd4164c00bf946ff6ca1818ed9fcd", "tree": "a1c974ef318524ee7c08fbdef19bf038ff91b89c", "parents": [ "feed1f17241d26261e77ddb5f2fc2a91a3c16739" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Tue Nov 17 04:15:16 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 17 04:15:38 2009 -0800" }, "message": "act_mirred: optimization.\n\nmove checking if eaction is valid in tcf_mirred_init()\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "feed1f17241d26261e77ddb5f2fc2a91a3c16739", "tree": "ff9828b498a5e13dd48277c79a3ef28f0ed62efe", "parents": [ "b2a5decddbe295d09c29d4a8078cdc47a55346df" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Tue Nov 17 04:14:00 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 17 04:15:37 2009 -0800" }, "message": "act_mirred: cleanup\n\n1. don\u0027t let go back using goto.\n2. don\u0027t call skb_act_clone() until it is necessary.\n3. one exit of the critical context.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9a1654ba0b50402a6bd03c7b0fe9b0200a5ea7b1", "tree": "3defd37672da2069e6c0ffd86b0b99c694324985", "parents": [ "cb43e23435a66d5ed90f804af9efe9096503979f" ], "author": { "name": "Jarek Poplawski", "email": "jarkao2@gmail.com", "time": "Sun Nov 15 07:20:12 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 15 22:08:33 2009 -0800" }, "message": "net: Optimize hard_start_xmit() return checking\n\nRecent changes in the TX error propagation require additional checking\nand masking of values returned from hard_start_xmit(), mainly to\nseparate cases where skb was consumed. This aim can be simplified by\nchanging the order of NETDEV_TX and NET_XMIT codes, because the latter\nare treated similarly to negative (ERRNO) values.\n\nAfter this change much simpler dev_xmit_complete() is also used in\nsch_direct_xmit(), so it is moved to netdevice.h.\n\nAdditionally NET_RX definitions in netdevice.h are moved up from\nbetween TX codes to avoid confusion while reading the TX comment.\n\nSigned-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "572a9d7b6fc7f20f573664063324c086be310c42", "tree": "0ab3655fdfa923b0b9c6c1ee51a2e31e97e9549f", "parents": [ "9ea2bdab11da97b2ac6f87d79976d25fa6d27295" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Nov 10 06:14:14 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 13 14:07:32 2009 -0800" }, "message": "net: allow to propagate errors through -\u003endo_hard_start_xmit()\n\nCurrently the -\u003endo_hard_start_xmit() callbacks are only permitted to return\none of the NETDEV_TX codes. This prevents any kind of error propagation for\nvirtual devices, like queue congestion of the underlying device in case of\nlayered devices, or unreachability in case of tunnels.\n\nThis patches changes the NET_XMIT codes to avoid clashes with the NETDEV_TX\ncodes and changes the two callers of dev_hard_start_xmit() to expect either\nerrno codes, NET_XMIT codes or NETDEV_TX codes as return value.\n\nIn case of qdisc_restart(), all non NETDEV_TX codes are mapped to NETDEV_TX_OK\nsince no error propagation is possible when using qdiscs. In case of\ndev_queue_xmit(), the error is propagated upwards.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f1e9016da6d0f16551d90085758ae45d26826118", "tree": "c68bd66565e2e78704cfc366ff022adaca75be55", "parents": [ "9e067597ee0e51a07bc158e9e2703ca676920e8b" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Tue Nov 10 07:54:49 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 10 22:26:30 2009 -0800" }, "message": "net: use rcu for network scheduler API\n\nUse RCU to walk list of network devices in qdisc dump.\nThis could be optimized for large number of devices.\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": "06fe9fb4182177fb046e6d934f80254dd90956ea", "tree": "ae394e643ae90641a6358296b9f9a5c13e79c189", "parents": [ "5b73a41c02002ed2ee6b805d0c3691fb9ab9dc4f" ], "author": { "name": "Dirk Hohndel", "email": "hohndel@infradead.org", "time": "Mon Sep 28 21:43:57 2009 -0400" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Nov 09 09:40:54 2009 +0100" }, "message": "tree-wide: fix a very frequent spelling mistake\n\nsomething-bility is spelled as something-blity\nso a grep for \u0027blit\u0027 would find these lines\n\nthis is so trivial that I didn\u0027t split it by subsystem / copy\nadditional maintainers - all changes are to comments\nThe only purpose is to get fewer false positives when grepping\naround the kernel sources.\n\nSigned-off-by: Dirk Hohndel \u003chohndel@infradead.org\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "bd27a8750c9b849068d80e298f99940bb7128b33", "tree": "606acde68192483fe9800b5b7afc3628857a1e60", "parents": [ "40c9c31e388bfd513269df737f874d0cd53c1616" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Nov 05 20:57:26 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 05 22:34:21 2009 -0800" }, "message": "net_cls: Use __dev_get_by_index()\n\nWe hold RTNL in tc_dump_tfilter(), we can avoid dev_hold()/dev_put()\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d0075634cf9d288988f57392a1f132d2053af961", "tree": "be60c4ea0c9fc72d8d644a95be0452262c6e7941", "parents": [ "c7079857cd89cb5bc686df1d441db8ef0137abf1" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Nov 04 05:23:31 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 04 05:23:31 2009 -0800" }, "message": "em_meta: avoid one dev_put()\n\nAnother rcu conversion to avoid one dev_hold()/dev_put() pair\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1c55d62e77fa16cdace417834fc7b8a421a1877f", "tree": "24a9a8775beb7b7b0cc8b9d1fba2406ef9bf0643", "parents": [ "188586b28deda2dd4888a306cb6202cc6f408103" ], "author": { "name": "jamal", "email": "hadi@cyberus.ca", "time": "Thu Oct 15 03:09:18 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 22 21:56:42 2009 -0700" }, "message": "pkt_sched: skbedit add support for setting mark\n\nThis adds support for setting the skb mark.\n\nSigned-off-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "421355de876b9f3fcc7e4cb6026e416fb12a5068", "tree": "fb814456af86c75e1eb9e330994dda461fc5b4f7", "parents": [ "aace495933a981274b6491d71b915165a61defdc", "0fe7463a35aadfaf22d1ca58325ab3851b8d757c" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 13 12:55:20 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 13 12:55:20 2009 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "7fe13c5733790ef582769a54693fa6a5abf3c032", "tree": "567eb4394b642ddc81ff05521329d75d1cf47b88", "parents": [ "8aa0f64ac3835a6daf84d0b0e07c4c01d7d8eddc", "10c435f18b8cb78a5870c08d52955594f5ec9c31" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Oct 11 23:15:47 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Oct 11 23:15:47 2009 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "53f7e35f8b7fc2f5620a863ac613bcf3080cb6ba", "tree": "63e2e7a0b1106fc1eeb3417d1310cd2fb5d01c5c", "parents": [ "d1f6803a58e827fda7b810dcb7cbdb490d32ab9e" ], "author": { "name": "jamal", "email": "hadi@cyberus.ca", "time": "Sun Oct 11 04:21:38 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Oct 11 23:03:47 2009 -0700" }, "message": "pkt_sched: pedit use proper struct\n\nThis probably deserves to go into -stable.\n\nPedit will reject a policy that is large because it\nuses the wrong structure in the policy validation.\nThis fixes it.\n\nSigned-off-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ad61df918c44316940404891d5082c63e79c256a", "tree": "a2d2287677479c1f198dc39fe67506712fe558f8", "parents": [ "879e9304134bb6214fb52377ac1e01e1910f4916" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Thu Oct 08 01:21:46 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 08 01:21:46 2009 -0700" }, "message": "netlink: fix typo in initialization\n\nCommit 9ef1d4c7c7aca1cd436612b6ca785b726ffb8ed8 (\"[NETLINK]: Missing\ninitializations in dumped data\") introduced a typo in\ninitialization. This patch fixes this.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d250a5f90e53f5e150618186230795352d154c88", "tree": "1c95ec673ce613f346db300d3f5539f018066081", "parents": [ "92d326f61b553250780786e9dd8609d4b32f8de7" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri Oct 02 10:32:18 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 07 01:07:42 2009 -0700" }, "message": "pkt_sched: gen_estimator: Dont report fake rate estimators\n\nJarek Poplawski a écrit :\n\u003e\n\u003e\n\u003e Hmm... So you made me to do some \"real\" work here, and guess what?:\n\u003e there is one serious checkpatch warning! ;-) Plus, this new parameter\n\u003e should be added to the function description. Otherwise:\n\u003e Signed-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\n\u003e\n\u003e Thanks,\n\u003e Jarek P.\n\u003e\n\u003e PS: I guess full \"Don\u0027t\" would show we really mean it...\n\nOkay :) Here is the last round, before the night !\n\nThanks again\n\n[RFC] pkt_sched: gen_estimator: Don\u0027t report fake rate estimators\n\nWe currently send TCA_STATS_RATE_EST elements to netlink users, even if no estimator\nis running.\n\n# tc -s -d qdisc\nqdisc pfifo_fast 0: dev eth0 root bands 3 priomap 1 2 2 2 1 2 0 0 1 1 1 1 1 1 1 1\n Sent 112833764978 bytes 1495081739 pkt (dropped 0, overlimits 0 requeues 0)\n rate 0bit 0pps backlog 0b 0p requeues 0\n\nUser has no way to tell if the \"rate 0bit 0pps\" is a real estimation, or a fake\none (because no estimator is active)\n\nAfter this patch, tc command output is :\n$ tc -s -d qdisc\nqdisc pfifo_fast 0: dev eth0 root bands 3 priomap 1 2 2 2 1 2 0 0 1 1 1 1 1 1 1 1\n Sent 561075 bytes 1196 pkt (dropped 0, overlimits 0 requeues 0)\n backlog 0b 0p requeues 0\n\nWe add a parameter to gnet_stats_copy_rate_est() function so that\nit can use gen_estimator_active(bstats, r), as suggested by Jarek.\n\nThis parameter can be NULL if check is not necessary, (htb for\nexample has a mandatory rate estimator)\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fd589a8f0a13f53a2dd580b1fe170633cf6b095f", "tree": "942c50188ca58041b0453189e710eafcfebaea57", "parents": [ "4f37940d64a155c025968118849b596f6aaa8128" ], "author": { "name": "Anand Gadiyar", "email": "gadiyar@ti.com", "time": "Thu Jul 16 17:13:03 2009 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Sep 21 15:14:55 2009 +0200" }, "message": "trivial: fix typo \"to to\" in multiple files\n\nSigned-off-by: Anand Gadiyar \u003cgadiyar@ti.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "a19d2158439d6fba8160d7d2446f233f525f09e7", "tree": "85f54105fb6939efac2c26c3a08db7e543141b6d", "parents": [ "0522fea6505f7b03a82787acdc6ad3066d9b4de3" ], "author": { "name": "Jarek Poplawski", "email": "jarkao2@gmail.com", "time": "Thu Sep 17 10:26:07 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 17 10:26:07 2009 -0700" }, "message": "pkt_sched: Fix qstats.qlen updating in dump_stats\n\nSome classful qdiscs miss qstats.qlen updating with q.qlen of their\nchild qdiscs in dump_stats methods.\n\nSigned-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7c64b9f3f584008000cf3b960f25cd6a68fce191", "tree": "2c19bff73b434b12f50304c97758a01751df9aaa", "parents": [ "926e61b7c44db83013159ac2f74bccd451607b5a" ], "author": { "name": "Jarek Poplawski", "email": "jarkao2@gmail.com", "time": "Tue Sep 15 23:42:05 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Sep 15 23:42:05 2009 -0700" }, "message": "pkt_sched: Fix qdisc_create on stab error handling\n\nIf qdisc_get_stab returns error in qdisc_create there is skipped qdisc\nops-\u003edestroy, which is necessary because it\u0027s after ops-\u003einit at the\nmoment, so memory leaks are quite probable.\n\nSigned-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "926e61b7c44db83013159ac2f74bccd451607b5a", "tree": "512b532e22d4374948e0d149902304edfbef7e25", "parents": [ "ca519274d537706b6fb1e3e91238d34a23320584" ], "author": { "name": "Jarek Poplawski", "email": "jarkao2@gmail.com", "time": "Tue Sep 15 02:53:07 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Sep 15 02:53:07 2009 -0700" }, "message": "pkt_sched: Fix tx queue selection in tc_modify_qdisc\n\nAfter the recent mq change there is the new select_queue qdisc class\nmethod used in tc_modify_qdisc, but it works OK only for direct child\nqdiscs of mq qdisc. Grandchildren always get the first tx queue, which\nwould give wrong qdisc_root etc. results (e.g. for sch_htb as child of\nsch_prio). This patch fixes it by using parent\u0027s dev_queue for such\ngrandchildren qdiscs. The select_queue method\u0027s return type is changed\nBTW.\n\nWith feedback from: Patrick McHardy \u003ckaber@trash.net\u003e\n\nSigned-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "036d6a673fa0a2e2c5b72a3b1d1b86114c1711c0", "tree": "e74fea79b646540d2e766710121459925e3d8922", "parents": [ "d314737ad3bad6b4603b243fd6db572385259690" ], "author": { "name": "Jarek Poplawski", "email": "jarkao2@gmail.com", "time": "Sun Sep 13 22:35:44 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 14 17:03:57 2009 -0700" }, "message": "pkt_sched: Fix qdisc_graft WRT ingress qdisc\n\nAfter the recent mq change using ingress qdisc overwrites dev-\u003eqdisc;\nthere is also a wrong old qdisc pointer passed to notify_and_destroy.\n\nSigned-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d7e9660ad9d5e0845f52848bce31bcf5cdcdea6b", "tree": "c6c67d145771187b194d79d603742b31090a59d6", "parents": [ "b8cb48aae1b8c50b37dcb7710363aa69a7a0d9ca", "13af7a6ea502fcdd4c0e3d7de6e332b102309491" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 14 10:37:28 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 14 10:37:28 2009 -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: (1623 commits)\n netxen: update copyright\n netxen: fix tx timeout recovery\n netxen: fix file firmware leak\n netxen: improve pci memory access\n netxen: change firmware write size\n tg3: Fix return ring size breakage\n netxen: build fix for INET\u003dn\n cdc-phonet: autoconfigure Phonet address\n Phonet: back-end for autoconfigured addresses\n Phonet: fix netlink address dump error handling\n ipv6: Add IFA_F_DADFAILED flag\n net: Add DEVTYPE support for Ethernet based devices\n mv643xx_eth.c: remove unused txq_set_wrr()\n ucc_geth: Fix hangs after switching from full to half duplex\n ucc_geth: Rearrange some code to avoid forward declarations\n phy/marvell: Make non-aneg speed/duplex forcing work for 88E1111 PHYs\n drivers/net/phy: introduce missing kfree\n drivers/net/wan: introduce missing kfree\n net: force bridge module(s) to be GPL\n Subject: [PATCH] appletalk: Fix skb leak when ipddp interface is not loaded\n ...\n\nFixed up trivial conflicts:\n\n - arch/x86/include/asm/socket.h\n\n converted to \u003casm-generic/socket.h\u003e in the x86 tree. The generic\n header has the same new #define\u0027s, so that works out fine.\n\n - drivers/net/tun.c\n\n fix conflict between 89f56d1e9 (\"tun: reuse struct sock fields\") that\n switched over to using \u0027tun-\u003esocket.sk\u0027 instead of the redundantly\n available (and thus removed) \u0027tun-\u003esk\u0027, and 2b980dbd (\"lsm: Add hooks\n to the TUN driver\") which added a new \u0027tun-\u003esk\u0027 use.\n\n Noted in \u0027next\u0027 by Stephen Rothwell.\n" }, { "commit": "9a0da0d19c573e01aded6ac17747d2efc5b1115f", "tree": "76294327bae4b3e45b16c690bda4b24951f237cf", "parents": [ "ec282e9225be924479d4880b51f13524795bd8d3", "8a56df0ae1690f8f42a3c6c4532f4b06f93febea" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 10 18:17:09 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 10 18:17:09 2009 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6\n" }, { "commit": "23bcf634c8bc0d84607a5b863333191d58baee4c", "tree": "bc988ab6230bebf47e1dc22db70f94901ac2eeb5", "parents": [ "ea6a634ef7f0ab1d1f48ba0ad4f50e96d6065312" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Wed Sep 09 18:11:23 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 09 18:11:23 2009 -0700" }, "message": "net_sched: fix estimator lock selection for mq child qdiscs\n\nWhen new child qdiscs are attached to the mq qdisc, they are actually\nattached as root qdiscs to the device queues. The lock selection for\nnew estimators incorrectly picks the root lock of the existing and\nto be replaced qdisc, which results in a use-after-free once the old\nqdisc has been destroyed.\n\nMark mq qdisc instances with a new flag and treat qdiscs attached to\nmq as children similar to regular root qdiscs.\n\nAdditionally prevent estimators from being attached to the mq qdisc\nitself since it only updates its byte and packet counters during dumps.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6ec1c69a8f6492fd25722f4762721921da074c12", "tree": "a78323d1f7f84acbe08c25d7300b935ae4bb7c62", "parents": [ "589983cd21f4a2e4ed74a958805a90fa676845c5" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Sep 06 01:58:51 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Sep 06 02:07:05 2009 -0700" }, "message": "net_sched: add classful multiqueue dummy scheduler\n\nThis patch adds a classful dummy scheduler which can be used as root qdisc\nfor multiqueue devices and exposes each device queue as a child class.\n\nThis allows to address queues individually and graft them similar to regular\nclasses. Additionally it presents an accumulated view of the statistics of\nall real root qdiscs in the dummy root.\n\nTwo new callbacks are added to the qdisc_ops and qdisc_class_ops:\n\n- cl_ops-\u003eselect_queue selects the tx queue number for new child classes.\n\n- qdisc_ops-\u003eattach() overrides root qdisc device grafting to attach\n non-shared qdiscs to the queues.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "589983cd21f4a2e4ed74a958805a90fa676845c5", "tree": "21ce556958da203400d3e9d30911ff330be39e90", "parents": [ "af356afa010f3cd2c8b8fcc3bce90f7a7b7ec02a" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Sep 04 06:41:20 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Sep 06 02:07:05 2009 -0700" }, "message": "net_sched: move dev_graft_qdisc() to sch_generic.c\n\nIt will be used in a following patch by the multiqueue qdisc.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "af356afa010f3cd2c8b8fcc3bce90f7a7b7ec02a", "tree": "302d938363bbaec3e69a58e36dbf8a304b24144c", "parents": [ "5b9a9ccfad8553dbf7a9b17ba78bad70215ed0e2" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Sep 04 06:41:18 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Sep 06 02:07:03 2009 -0700" }, "message": "net_sched: reintroduce dev-\u003eqdisc for use by sch_api\n\nCurrently the multiqueue integration with the qdisc API suffers from\na few problems:\n\n- with multiple queues, all root qdiscs use the same handle. This means\n they can\u0027t be exposed to userspace in a backwards compatible fashion.\n\n- all API operations always refer to queue number 0. Newly created\n qdiscs are automatically shared between all queues, its not possible\n to address individual queues or restore multiqueue behaviour once a\n shared qdisc has been attached.\n\n- Dumps only contain the root qdisc of queue 0, in case of non-shared\n qdiscs this means the statistics are incomplete.\n\nThis patch reintroduces dev-\u003eqdisc, which points to the (single) root qdisc\nfrom userspace\u0027s point of view. Currently it either points to the first\n(non-shared) default qdisc, or a qdisc shared between all queues. The\nfollowing patches will introduce a classful dummy qdisc, which will be used\nas root qdisc and contain the per-queue qdiscs as children.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5b9a9ccfad8553dbf7a9b17ba78bad70215ed0e2", "tree": "1454e8121fef6635a615f6766b3fdbff678ae63d", "parents": [ "de6d5cdf881353f83006d5f3e28ac4fffd42145e" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Sep 04 06:41:17 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Sep 06 02:07:02 2009 -0700" }, "message": "net_sched: remove some unnecessary checks in classful schedulers\n\nThe class argument to the -\u003egraft(), -\u003eleaf(), -\u003edump(), -\u003edump_stats() all\noriginate from either -\u003eget() or -\u003ewalk() and are always valid.\n\nRemove unnecessary checks.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "de6d5cdf881353f83006d5f3e28ac4fffd42145e", "tree": "edc032e4d0a868578780facdd28fb0ee277aadc3", "parents": [ "71ebe5e91947392bc276af713827eab12b6db8e4" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Sep 04 06:41:16 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Sep 06 02:07:02 2009 -0700" }, "message": "net_sched: make cls_ops-\u003echange and cls_ops-\u003edelete optional\n\nSome schedulers don\u0027t support creating, changing or deleting classes.\nMake the respective callbacks optionally and consistently return\n-EOPNOTSUPP for unsupported operations, instead of currently either\n-EOPNOTSUPP, -ENOSYS or no error.\n\nIn case of sch_prio and sch_multiq, the removed operations additionally\nchecked for an invalid class. This is not necessary since the class\nargument can only orginate from -\u003eget() or in case of -\u003echange is 0\nfor creation of new classes, in which case -\u003echange() incorrectly\nreturned -ENOENT.\n\nAs a side-effect, this patch fixes a possible (root-only) NULL pointer\nfunction call in sch_ingress, which didn\u0027t implement a so far mandatory\n-\u003edelete() operation.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "71ebe5e91947392bc276af713827eab12b6db8e4", "tree": "198ff02e23f8606ff2a3bec51c7044ec408e19c4", "parents": [ "c9f1d0389b962521af1e2b699c8ee5e299d77b85" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Sep 04 06:41:15 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Sep 06 02:06:12 2009 -0700" }, "message": "net_sched: make cls_ops-\u003etcf_chain() optional\n\nSome qdiscs don\u0027t support attaching filters. Handle this centrally in\ncls_api and return a proper errno code (EOPNOTSUPP) instead of EINVAL.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c9f1d0389b962521af1e2b699c8ee5e299d77b85", "tree": "e317e8b012be8b31b303bdb3f6ee5e3929de0a7b", "parents": [ "b1f57195585e376d1944c32c046359640b06a669" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Sep 04 06:41:13 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Sep 04 23:10:15 2009 -0700" }, "message": "net_sched: fix class grafting errno codes\n\nIf the parent qdisc doesn\u0027t support classes, use EOPNOTSUPP.\nIf the parent class doesn\u0027t exist, use ENOENT. Currently EINVAL\nis returned in both cases.\n\nAdditionally check whether grafting is supported and remove a now\nunnecessary graft function from sch_ingress.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "16ebb5e0b36ceadc8186f71d68b0c4fa4b6e781b", "tree": "4a89b7591d0f4478d0dda12db649db2d94d16929", "parents": [ "2fbd3da3877ad8d923b055e5996f80b4d4a6daf4" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Sep 02 02:40:09 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 02 22:55:17 2009 -0700" }, "message": "tc: Fix unitialized kernel memory leak\n\nThree bytes of uninitialized kernel memory are currently leaked to user\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nReviewed-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6cdee2f96a97f6da26bd3759c3f8823332fbb438", "tree": "ec79086f05ffc3bdf1aecc37e108ccfc3a95450d", "parents": [ "0625491493d9000e4556bf566d205c28c8e7dc4e", "2fbd3da3877ad8d923b055e5996f80b4d4a6daf4" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 02 00:32:56 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 02 00:32:56 2009 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/yellowfin.c\n" }, { "commit": "2fbd3da3877ad8d923b055e5996f80b4d4a6daf4", "tree": "7caa4ea3f3517d2f6b38142f64527c82b8e57b2e", "parents": [ "d66ee0587c3927aea5178a822976c7c853d815fe" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Sep 01 17:59:25 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Sep 01 17:59:25 2009 -0700" }, "message": "pkt_sched: Revert tasklet_hrtimer changes.\n\nThese are full of unresolved problems, mainly that conversions don\u0027t\nwork 1-1 from hrtimers to tasklet_hrtimers because unlike hrtimers\ntasklets can\u0027t be killed from softirq context.\n\nAnd when a qdisc gets reset, that\u0027s exactly what we need to do here.\n\nWe\u0027ll work this out in the net-next-2.6 tree and if warranted we\u0027ll\nbackport that work to -stable.\n\nThis reverts the following 3 changesets:\n\na2cb6a4dd470d7a64255a10b843b0d188416b78f\n(\"pkt_sched: Fix bogon in tasklet_hrtimer changes.\")\n\n38acce2d7983632100a9ff3fd20295f6e34074a8\n(\"pkt_sched: Convert CBQ to tasklet_hrtimer.\")\n\nee5f9757ea17759e1ce5503bdae2b07e48e32af9\n(\"pkt_sched: Convert qdisc_watchdog to tasklet_hrtimer\")\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6fef4c0c8eeff7de13007a5f56113475444a253d", "tree": "216bafb88ab84c5e0a048598cd6c05f7eb8f438d", "parents": [ "dc1f8bf68b311b1537cb65893430b6796118498a" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Mon Aug 31 19:50:41 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Sep 01 01:13:07 2009 -0700" }, "message": "netdev: convert pseudo-devices to netdev_tx_t\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a453e0689a3ccf85c08cb89753d7685046248c5c", "tree": "a85542ee234e7b9fe4f6a4a1837d4a99139c7e73", "parents": [ "03a9a447d2dab755b22df79b5e205fdbb9b2c851" ], "author": { "name": "Krishna Kumar", "email": "krkumar2@in.ibm.com", "time": "Sun Aug 30 22:20:28 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Aug 30 22:20:28 2009 -0700" }, "message": "pkt_sched: Fix resource limiting in pfifo_fast\n\npfifo_fast_enqueue has this check:\n if (skb_queue_len(list) \u003c qdisc_dev(qdisc)-\u003etx_queue_len) {\n\nwhich allows each band to enqueue upto tx_queue_len skbs for a\ntotal of 3*tx_queue_len skbs. I am not sure if this was the\nintention of limiting in qdisc.\n\nPatch compiled and 32 simultaneous netperf testing ran fine. Also:\n# tc -s qdisc show dev eth2\nqdisc pfifo_fast 0: root bands 3 priomap 1 2 2 2 1 2 0 0 1 1 1 1 1 1 1 1\n Sent 16835026752 bytes 373116 pkt (dropped 0, overlimits 0 requeues 25) \n rate 0bit 0pps backlog 0b 0p requeues 25 \n\nSigned-off-by: Krishna Kumar \u003ckrkumar2@in.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fd3ae5e8fc5e947a9f151e80a65763a24b6368a9", "tree": "2842160866656f5573aea96fc90893ad0f0d3a23", "parents": [ "31ce8c71a3bdab12debb5899b1f6dac13e54c71d" ], "author": { "name": "Krishna Kumar", "email": "krkumar2@in.ibm.com", "time": "Tue Aug 18 21:55:59 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 29 00:19:21 2009 -0700" }, "message": "Speed-up pfifo_fast lookup using a private bitmap\n\nMaintain a per-qdisc bitmap for pfifo_fast giving availability\nof skbs for each band. This allows faster lookup for a skb when\nthere are no high priority skbs. Also, it helps in (rare) cases\nwhen there are no skbs on the list, where an immediate lookup is\nfaster than iterating through the three bands.\n\nSigned-off-by: Krishna Kumar \u003ckrkumar2@in.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3a6c2b419b7768703cfb2cabdb894517c5065e33", "tree": "d8d8dc9ad34ffdd2f0f56876e9d3b6f0e6d5eceb", "parents": [ "74f7a6552c8d76ffc5e11eb8d9d6c07238b9ae77" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Aug 25 16:07:40 2009 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Aug 25 16:07:40 2009 +0200" }, "message": "netlink: constify nlmsghdr arguments\n\nConsitfy nlmsghdr arguments to a couple of functions as preparation\nfor the next patch, which will constify the netlink message data in\nall nfnetlink users.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "a2cb6a4dd470d7a64255a10b843b0d188416b78f", "tree": "33596c7aa4b444e96b112d92173e88dc8ea8a8d7", "parents": [ "8ff499e43c537648399fca8ba39d24c0768b3fab" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 24 19:37:05 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 24 19:37:05 2009 -0700" }, "message": "pkt_sched: Fix bogon in tasklet_hrtimer changes.\n\nReported by Stephen Rothwell, luckily it\u0027s harmless:\n\nnet/sched/sch_api.c: In function \u0027qdisc_watchdog\u0027:\nnet/sched/sch_api.c:460: warning: initialization from incompatible pointer type\nnet/sched/sch_cbq.c: In function \u0027cbq_undelay\u0027:\nnet/sched/sch_cbq.c:595: warning: initialization from incompatible pointer type\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "38acce2d7983632100a9ff3fd20295f6e34074a8", "tree": "9207518005cc12ae5e4642b8220471a0168f8c89", "parents": [ "ee5f9757ea17759e1ce5503bdae2b07e48e32af9" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Aug 21 16:51:38 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Aug 23 18:52:38 2009 -0700" }, "message": "pkt_sched: Convert CBQ to tasklet_hrtimer.\n\nThis code expects to run in softirq context, and bare hrtimers\nrun in hw IRQ context.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "ee5f9757ea17759e1ce5503bdae2b07e48e32af9", "tree": "0625fdaf307890a0875981d28ecb77e7ddd96143", "parents": [ "649bf17829d087f83754e2a8161e094a167ce3d3" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Aug 21 16:33:34 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 22 18:09:17 2009 -0700" }, "message": "pkt_sched: Convert qdisc_watchdog to tasklet_hrtimer\n\nNone of this stuff should execute in hw IRQ context, therefore\nuse a tasklet_hrtimer so that it runs in softirq context.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "c1a8f1f1c8e01eab5862c8db39b49ace814e6c66", "tree": "0679f709f70d9a91850888636a28adb79940c402", "parents": [ "c6ba973b8fa97422aab4204f7d79f1d413cde925" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sun Aug 16 09:36:49 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 17 21:33:49 2009 -0700" }, "message": "net: restore gnet_stats_basic to previous definition\n\nIn 5e140dfc1fe87eae27846f193086724806b33c7d \"net: reorder struct Qdisc\nfor better SMP performance\" the definition of struct gnet_stats_basic\nchanged incompatibly, as copies of this struct are shipped to\nuserland via netlink.\n\nRestoring old behavior is not welcome, for performance reason.\n\nFix is to use a private structure for kernel, and\nteach gnet_stats_copy_basic() to convert from kernel to user land,\nusing legacy structure (struct gnet_stats_basic)\n\nBased on a report and initial patch from Michael Spang.\n\nReported-by: Michael Spang \u003cmspang@csclub.uwaterloo.ca\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bbd8a0d3a3b65d341437f8b99c828fa5cc29c739", "tree": "a4055c65be5ce3f8fd4987a32a38dfab1642ec95", "parents": [ "9f519f68cfffba022978634f724944a0b971fec1" ], "author": { "name": "Krishna Kumar", "email": "krkumar2@in.ibm.com", "time": "Thu Aug 06 01:44:21 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 06 20:10:18 2009 -0700" }, "message": "net: Avoid enqueuing skb for default qdiscs\n\ndev_queue_xmit enqueue\u0027s a skb and calls qdisc_run which\ndequeue\u0027s the skb and xmits it. In most cases, the skb that\nis enqueue\u0027d is the same one that is dequeue\u0027d (unless the\nqueue gets stopped or multiple cpu\u0027s write to the same queue\nand ends in a race with qdisc_run). For default qdiscs, we\ncan remove the redundant enqueue/dequeue and simply xmit the\nskb since the default qdisc is work-conserving.\n\nThe patch uses a new flag - TCQ_F_CAN_BYPASS to identify the\ndefault fast queue. The controversial part of the patch is\nincrementing qlen when a skb is requeued - this is to avoid\nchecks like the second line below:\n\n+ } else if ((q-\u003eflags \u0026 TCQ_F_CAN_BYPASS) \u0026\u0026 !qdisc_qlen(q) \u0026\u0026\n\u003e\u003e !q-\u003egso_skb \u0026\u0026\n+ !test_and_set_bit(__QDISC_STATE_RUNNING, \u0026q-\u003estate)) {\n\nResults of a 2 hour testing for multiple netperf sessions (1,\n2, 4, 8, 12 sessions on a 4 cpu system-X). The BW numbers are\naggregate Mb/s across iterations tested with this version on\nSystem-X boxes with Chelsio 10gbps cards:\n\n----------------------------------\nSize | ORG BW NEW BW |\n----------------------------------\n128K | 156964 159381 |\n256K | 158650 162042 |\n----------------------------------\n\nChanges from ver1:\n\n1. Move sch_direct_xmit declaration from sch_generic.h to\n pkt_sched.h\n2. Update qdisc basic statistics for direct xmit path.\n3. Set qlen to zero in qdisc_reset.\n4. Changed some function names to more meaningful ones.\n\nSigned-off-by: Krishna Kumar \u003ckrkumar2@in.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6ed106549d17474ca17a16057f4c0ed4eba5a7ca", "tree": "b98c09081509b3a9757339b6b66779e4126dfa29", "parents": [ "0e8635a8e1f2d4a9e1bfc6c3b21419a5921e674f" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Jun 23 06:03:08 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 05 19:16:04 2009 -0700" }, "message": "net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions\n\nThis patch is the result of an automatic spatch transformation to convert\nall ndo_start_xmit() return values of 0 to NETDEV_TX_OK.\n\nSome occurences are missed by the automatic conversion, those will be\nhandled in a seperate patch.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "31e6d363abcd0d05766c82f1a9c905a4c974a199", "tree": "f2b5c46354d95f91e743ae748b8add0de8bffd17", "parents": [ "d3b238a03efd6d644ff93c8b10a1d38a596f2e34" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jun 17 19:05:41 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 18 00:29:12 2009 -0700" }, "message": "net: correct off-by-one write allocations reports\n\ncommit 2b85a34e911bf483c27cfdd124aeb1605145dc80\n(net: No more expensive sock_hold()/sock_put() on each tx)\nchanged initial sk_wmem_alloc value.\n\nWe need to take into account this offset when reporting\nsk_wmem_alloc to user, in PROC_FS files or various\nioctls (SIOCOUTQ/TIOCOUTQ)\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b964758050f856e44f5fe645d03bea8a1b0b66bd", "tree": "086f12ef757a245a410e00fb46e410495c456b3d", "parents": [ "e4f1482e686212e6d1dd6df93888bb26344981c6" ], "author": { "name": "Jarek Poplawski", "email": "jarkao2@gmail.com", "time": "Tue Jun 16 08:33:55 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 17 18:56:45 2009 -0700" }, "message": "pkt_sched: Update drops stats in act_police\n\nAction police statistics could be misleading because drops are not\nshown when expected.\n\nWith feedback from: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\n\nReported-by: Pawel Staszewski \u003cpstaszewski@itcare.pl\u003e\nSigned-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nAcked-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb", "tree": "8d104ec2a459346b99413b0b77421ca7b9936c1a", "parents": [ "ca44d6e60f9de26281fda203f58b570e1748c015", "45e3e1935e2857c54783291107d33323b3ef33c8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 15 03:02:23 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 15 03:02:23 2009 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6\n\nConflicts:\n\tDocumentation/feature-removal-schedule.txt\n\tdrivers/scsi/fcoe/fcoe.c\n\tnet/core/drop_monitor.c\n\tnet/core/net-traces.c\n" }, { "commit": "ca44d6e60f9de26281fda203f58b570e1748c015", "tree": "9620f3f91836f608a084acb78d1a178135cfd3b0", "parents": [ "e0f7cb8c8cc6cccce28d2ce39ad8c60d23c3799f" ], "author": { "name": "Jarek Poplawski", "email": "jarkao2@gmail.com", "time": "Mon Jun 15 02:31:47 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 15 02:31:47 2009 -0700" }, "message": "pkt_sched: Rename PSCHED_US2NS and PSCHED_NS2US\n\nLet\u0027s use TICKS instead of US, so PSCHED_TICKS2NS and PSCHED_NS2TICKS\n(like in PSCHED_TICKS_PER_SEC already) to avoid misleading.\n\nSigned-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5b548140225c6bbbbd560551dd1048b2c0ce58be", "tree": "9306a37dbca0095ca6d88e0b0ab297bcb2dc5ae8", "parents": [ "5b2c4b972c0226406361f83b747eb5cdab51e68e" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jun 12 06:22:29 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 13 01:18:50 2009 -0700" }, "message": "net: use symbolic values for ndo_start_xmit() return codes\n\nConvert magic values 1 and -1 to NETDEV_TX_BUSY and NETDEV_TX_LOCKED respectively.\n\n0 (NETDEV_TX_OK) is not changed to keep the noise down, except in very few cases\nwhere its in direct proximity to one of the other values.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "728bf09827d350cdaa1f093170e745e8dac49b7a", "tree": "2a493b68ce1414ff9ae91d759d2ffe2f4fb4560a", "parents": [ "0c27922e4933ceb86644f4a9b1af212ffe5aad75" ], "author": { "name": "Jarek Poplawski", "email": "jarkao2@gmail.com", "time": "Mon Jun 08 22:05:00 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 09 05:25:29 2009 -0700" }, "message": "pkt_sched: Use PSCHED_SHIFT in PSCHED time conversion\n\nUse PSCHED_SHIFT constant instead of \u002710\u0027 in PSCHED_US2NS() and\nPSCHED_NS2US() macros to enable changing this value later.\n\nAdditionally use PSCHED_SHIFT in sch_hfsc SM_SHIFT and ISM_SHIFT\ndefinitions. This part of the patch is based on feedback from\nPatrick McHardy \u003ckaber@trash.net\u003e.\n\nReported-by: Antonio Almeida \u003cvexwek@gmail.com\u003e\nTested-by: Antonio Almeida \u003cvexwek@gmail.com\u003e\nSigned-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "52ea3a56a3268bc2a5a7c75e98c81463004e38ef", "tree": "4f99bbf8015d252c1a145a1b610db9eddb192f98", "parents": [ "fdd7b4c3302c93f6833e338903ea77245eb510b4" ], "author": { "name": "Minoru Usui", "email": "usui@mxm.nes.nec.co.jp", "time": "Tue Jun 09 04:03:09 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 09 04:03:09 2009 -0700" }, "message": "cls_cgroup: Fix oops when user send improperly \u0027tc filter add\u0027 request\n\nI found a bug in cls_cgroup_change() in cls_cgroup.c.\ncls_cgroup_change() expected tca[TCA_OPTIONS] was set from user space properly,\nbut tc in iproute2-2.6.29-1 (which I used) didn\u0027t set it.\n\nIn the current source code of tc in git, it set tca[TCA_OPTIONS].\n\n git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git\n\nIf we always use a newest iproute2 in git when we use cls_cgroup, \nwe don\u0027t face this oops probably.\nBut I think, kernel shouldn\u0027t panic regardless of use program\u0027s behaviour. \n\nSigned-off-by: Minoru Usui \u003cusui@mxm.nes.nec.co.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "adf30907d63893e4208dfe3f5c88ae12bc2f25d5", "tree": "0f07542bb95de2ad537540868aba6cf87a86e17d", "parents": [ "511c3f92ad5b6d9f8f6464be1b4f85f0422be91a" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Jun 02 05:19:30 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 03 02:51:04 2009 -0700" }, "message": "net: skb-\u003edst accessors\n\nDefine three accessors to get/set dst attached to a skb\n\nstruct dst_entry *skb_dst(const struct sk_buff *skb)\n\nvoid skb_dst_set(struct sk_buff *skb, struct dst_entry *dst)\n\nvoid skb_dst_drop(struct sk_buff *skb)\nThis one should replace occurrences of :\ndst_release(skb-\u003edst)\nskb-\u003edst \u003d NULL;\n\nDelete skb-\u003edst field\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "511c3f92ad5b6d9f8f6464be1b4f85f0422be91a", "tree": "3e368d9a78f87eb9dd7ff9e57f4aab3f4a96e3b1", "parents": [ "dfbf97f3ac980b69dfbc41c83a208211a38443e8" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Jun 02 05:14:27 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 03 02:51:02 2009 -0700" }, "message": "net: skb-\u003ertable accessor\n\nDefine skb_rtable(const struct sk_buff *skb) accessor to get rtable from skb\n\nDelete skb-\u003ertable field\n\nSetting rtable is not allowed, just set dst instead as rtable is an alias.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b2f8f7525c8aa1fdd8ad8c72c832dfb571d5f768", "tree": "71ae1801d264bca62efa0d22376b49de7f206e9a", "parents": [ "d455e5b165a367a628110ec2d18807ea10052cd1", "12186be7d2e1106cede1cc728526e3d7998cbe94" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 03 02:43:41 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 03 02:43:41 2009 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/forcedeth.c\n" }, { "commit": "12186be7d2e1106cede1cc728526e3d7998cbe94", "tree": "a27e9c1cf720fbd31d67c27ea1426a0ae891733b", "parents": [ "ea30e11970a96cfe5e32c03a29332554573b4a10" ], "author": { "name": "Minoru Usui", "email": "usui@mxm.nes.nec.co.jp", "time": "Tue Jun 02 02:17:34 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 02 02:17:34 2009 -0700" }, "message": "net_cls: fix unconfigured struct tcf_proto keeps chaining and avoid kernel panic when we use cls_cgroup\n\nThis patch fixes a bug which unconfigured struct tcf_proto keeps\nchaining in tc_ctl_tfilter(), and avoids kernel panic in\ncls_cgroup_classify() when we use cls_cgroup.\n\nWhen we execute \u0027tc filter add\u0027, tcf_proto is allocated, initialized\nby classifier\u0027s init(), and chained. After it\u0027s chained,\ntc_ctl_tfilter() calls classifier\u0027s change(). When classifier\u0027s\nchange() fails, tc_ctl_tfilter() does not free and keeps tcf_proto.\n\nIn addition, cls_cgroup is initialized in change() not in init(). It\naccesses unconfigured struct tcf_proto which is chained before\nchange(), then hits Oops.\n\nSigned-off-by: Minoru Usui \u003cusui@mxm.nes.nec.co.jp\u003e\nSigned-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nSigned-off-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nTested-by: Minoru Usui \u003cusui@mxm.nes.nec.co.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e65fcfd63a9a62baa5708484ff8edbe56eb3e7ec", "tree": "0d21a21c2b87ef1c8db600d6abed3ba3e22cdaef", "parents": [ "7682455ec36fce70bdbad9f739de05060dedfa27" ], "author": { "name": "Paul Menage", "email": "menage@google.com", "time": "Tue May 26 20:47:02 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 26 20:47:02 2009 -0700" }, "message": "cls_cgroup: read classid atomically in classifier\n\nAvoid reading the unsynchronized value cs-\u003eclassid multiple times,\nsince it could change concurrently from non-zero to zero; this would\nresult in the classifier returning a positive result with a bogus\n(zero) classid.\n\nSigned-off-by: Paul Menage \u003cmenage@google.com\u003e\nReviewed-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "08baf561083bc27a953aa087dd8a664bb2b88e8e", "tree": "979d92224e21b69368a27bb684b74b3d4d744183", "parents": [ "65ac8851490ec97a96759af729132c96f925a795" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon May 25 22:58:01 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 25 22:58:01 2009 -0700" }, "message": "net: txq_trans_update() helper\n\nWe would like to get rid of netdev-\u003etrans_start \u003d jiffies; that about all net\ndrivers have to use in their start_xmit() function, and use txq-\u003etrans_start\ninstead.\n\nThis can be done generically in core network, as suggested by David.\n\nSome devices, (particularly loopback) dont need trans_start update, because\nthey dont have transmit watchdog. We could add a new device flag, or rely\non fact that txq-\u003etran_start can be updated is txq-\u003exmit_lock_owner is\ndifferent than -1. Use a helper function to hide our choice.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ab35cd4b8f42b5e4a9338949581a510e98503b28", "tree": "06b66cc8e2696f88e3ecf101863d8ed667eb4c1d", "parents": [ "0cefafadbbe3947fd97b7560a214eb486069faac" ], "author": { "name": "Eric Dumazet", "email": "dada1@cosmosbay.com", "time": "Tue May 19 15:16:34 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 19 15:36:15 2009 -0700" }, "message": "sch_teql: Use net_device internal stats\n\nWe can slightly reduce size of teqlN structure, not duplicating stats\nstructure in teql_master but using stats field from net_device.stats\nfor tx_errors and from netdev_queue for tx_bytes/tx_packets/tx_dropped\nvalues.\n\nSigned-off-by: Eric Dumazet \u003cdada1@cosmosbay.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bb803cfbecb03a0cf8dc7e1864f18dda6631af00", "tree": "6c0989693bea6f50cfa5c6bb14f52ec19668def3", "parents": [ "3878fb6fdbceecca20b15748f807340854220f06", "511e11e396dc596825ce04d53d7f6d579404bc01" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 18 21:08:20 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 18 21:08:20 2009 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/scsi/fcoe/fcoe.c\n" }, { "commit": "c0f84d0d4be3f7d818b4ffb04d27f9bae64397f0", "tree": "e36a3f3e2d5cdbc9dfdbd2c5dd4857d93d8776b9", "parents": [ "775273131810caa41dfc7f9e552ea5d8508caf40" ], "author": { "name": "Eric Dumazet", "email": "dada1@cosmosbay.com", "time": "Mon May 18 15:12:31 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 18 15:12:31 2009 -0700" }, "message": "sch_teql: should not dereference skb after ndo_start_xmit()\n\nIt is illegal to dereference a skb after a successful ndo_start_xmit()\ncall. We must store skb length in a local variable instead.\n\nBug was introduced in 2.6.27 by commit 0abf77e55a2459aa9905be4b226e4729d5b4f0cb\n(net_sched: Add accessor function for packet length for qdiscs)\n\nSigned-off-by: Eric Dumazet \u003cdada1@cosmosbay.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9d21493b4beb8f918ba248032fefa393074a5e2b", "tree": "653590f3e325da5c4c1fc7d2c00bc196a3167f9d", "parents": [ "0a305720ee597aad41af61e6b6844321d3e24251" ], "author": { "name": "Eric Dumazet", "email": "dada1@cosmosbay.com", "time": "Sun May 17 20:55:16 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 17 20:55:16 2009 -0700" }, "message": "net: tx scalability works : trans_start\n\nstruct net_device trans_start field is a hot spot on SMP and high performance\ndevices, particularly multi queues ones, because every transmitter dirties\nit. Is main use is tx watchdog and bonding alive checks.\n\nBut as most devices dont use NETIF_F_LLTX, we have to lock\na netdev_queue before calling their ndo_start_xmit(). So it makes\nsense to move trans_start from net_device to netdev_queue. Its update\nwill occur on a already present (and in exclusive state) cache line, for\nfree.\n\nWe can do this transition smoothly. An old driver continue to\nupdate dev-\u003etrans_start, while an updated one updates txq-\u003etrans_start.\n\nFurther patches could also put tx_bytes/tx_packets counters in \nnetdev_queue to avoid dirtying dev-\u003estats (vlan device comes to mind)\n\nSigned-off-by: Eric Dumazet \u003cdada1@cosmosbay.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cb1c4b71f6da18fa98bab4af055f391d01bee8ba", "tree": "930bdf761d1dfa6a6ef4732866378f3fb37ad5bd", "parents": [ "3a6d54c56326c29c5357655779cfe6cf36481b17" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Tue May 12 10:47:33 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 17 11:59:48 2009 -0700" }, "message": "cls_cgroup: remove unneeded cgroup_lock\n\nWe can remove this lock here, since we are in cgroup write handler and\nthus the cgrp is guaranteed to be valid, and no lock is needed when\nwriting a u32 variable.\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsuc.com\u003e\nAcked-by: Paul Menage \u003cmenage@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6473990c7f0565fca2007f8662395d122e30f0d8", "tree": "07ffb4657f49dc3fc6e53167da5053e15c2492ef", "parents": [ "77a22941f9ed052a0fdaa92753b1a1ab8072ee76" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Wed May 06 16:45:07 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 06 16:45:07 2009 -0700" }, "message": "net-sched: fix bfifo default limit\n\nWhen no limit is given, the bfifo uses a default of tx_queue_len * mtu.\nPackets handled by qdiscs include the link layer header, so this should\nbe taken into account, similar to what other qdiscs do.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d0ab8ff81bf1b01bae7d6b92ca067badbbb02cc9", "tree": "872f9521e3f51018be9afd9492e7509e42478621", "parents": [ "1824a9897473fda5e5e42f991ddc674c175e3a09" ], "author": { "name": "Robert Love", "email": "robert.w.love@intel.com", "time": "Sat May 02 13:48:32 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat May 02 13:48:32 2009 -0700" }, "message": "net: Only store high 16 bits of kernel generated filter priorities\n\nThe kernel should only be using the high 16 bits of a kernel\ngenerated priority. Filter priorities in all other cases only\nuse the upper 16 bits of the u32 \u0027prio\u0027 field of \u0027struct tcf_proto\u0027,\nbut when the kernel generates the priority of a filter is saves all\n32 bits which can result in incorrect lookup failures when a filter\nneeds to be deleted or modified.\n\nSigned-off-by: Robert Love \u003crobert.w.love@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8caf153974f2274301e583fda732cc8e5b80331f", "tree": "d7f52b67e74b4bb4c81f2a4c34dae912a608f6fc", "parents": [ "c7c1a0f60b90955855ba8cd9cfc480167bf6c3da" ], "author": { "name": "Jarek Poplawski", "email": "jarkao2@gmail.com", "time": "Fri Apr 17 10:08:49 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 20 02:14:59 2009 -0700" }, "message": "net: sch_netem: Fix an inconsistency in ingress netem timestamps.\n\nAlex Sidorenko reported:\n\n\"while experimenting with \u0027netem\u0027 we have found some strange behaviour. It\nseemed that ingress delay as measured by \u0027ping\u0027 command shows up on some\nhosts but not on others.\n\nAfter some investigation I have found that the problem is that skbuff-\u003etstamp\nfield value depends on whether there are any packet sniffers enabled. That\nis:\n\n- if any ptype_all handler is registered, the tstamp field is as expected\n- if there are no ptype_all handlers, the tstamp field does not show the delay\"\n\nThis patch prevents unnecessary update of tstamp in dev_queue_xmit_nit()\non ingress path (with act_mirred) adding a check, so minimal overhead on\nthe fast path, but only when sniffers etc. are active.\n\nSince netem at ingress seems to logically emulate a network before a host,\ntstamp is zeroed to trigger the update and pretend delays are from the\noutside.\n\nReported-by: Alex Sidorenko \u003calexandre.sidorenko@hp.com\u003e\nTested-by: Alex Sidorenko \u003calexandre.sidorenko@hp.com\u003e\nSigned-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1a31f2042e938f1b467aa3d807cc5666352bf8a3", "tree": "77460f7f79be0579b5686b629fe218750da261b9", "parents": [ "1db9e29bb0ff3c9366e8a50fb09ca8dbc364bfd6" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Mon Apr 13 18:12:57 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 13 18:12:57 2009 -0700" }, "message": "netsched: Allow meta match on vlan tag on receive\n\nWhen vlan acceleration is used on receive, the vlan tag is maintained\noutside of the skb data. The existing vlan tag match only works on TX\npath because it uses vlan_get_tag which tests for VLAN_HW_TX_ACCEL.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a0bffffc148cd8e75a48a89ad2ddb74e4081a20a", "tree": "3a4d350d65d88bb1df8906b4822af2350ceb1cfc", "parents": [ "a3ac80a130300573de351083cf4a5b46d233e8bf" ], "author": { "name": "Ilpo Järvinen", "email": "ilpo.jarvinen@helsinki.fi", "time": "Sat Mar 21 13:36:17 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 21 13:36:17 2009 -0700" }, "message": "net/*: use linux/kernel.h swap()\n\ntcp_sack_swap seems unnecessary so I pushed swap to the caller.\nAlso removed comment that seemed then pointless, and added include\nwhen not already there. Compile tested.\n\nSigned-off-by: Ilpo Järvinen \u003cilpo.jarvinen@helsinki.fi\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7cd0a63872ac6ef97265f07adc367ca4f984468e", "tree": "44265aa422b3133b07eee87280cca3c89225437a", "parents": [ "8bdd663aba341c15cd2fa9dbd7061b8b387964dc" ], "author": { "name": "Jarek Poplawski", "email": "jarkao2@gmail.com", "time": "Sun Mar 15 20:00:19 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Mar 15 20:00:19 2009 -0700" }, "message": "pkt_sched: Change misleading code in class delete.\n\nWhile looking for a possible reason of bugzilla report on HTB oops:\nhttp://bugzilla.kernel.org/show_bug.cgi?id\u003d12858\nI found the code in htb_delete calling htb_destroy_class on zero\nrefcount is very misleading: it can suggest this is a common path, and\ndestroy is called under sch_tree_lock. Actually, this can never happen\nlike this because before deletion cops-\u003eget() is done, and after\ndelete a class is still used by tclass_notify. The class destroy is\nalways called from cops-\u003eput(), so without sch_tree_lock.\n\nThis doesn\u0027t mean much now (since 2.6.27) because all vulnerable calls\nwere moved from htb_destroy_class to htb_delete, but there was a bug\nin older kernels. The same change is done for other classful scheds,\nwhich, it seems, didn\u0027t have similar locking problems here.\n\nReported-by: m0sia \u003cm0sia@m0sia.ru\u003e\nSigned-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "508827ff0ac3981d420edac64a70de7f4e304d38", "tree": "b0cee8ddef9f0ceab68c388e4ae46b7295eb2cb5", "parents": [ "2c3c3d02f28801d7ad2da4952b2c7ca6621ef221", "72e2240f181871675d3a979766330c91d48a1673" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 05 02:06:47 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 05 02:06:47 2009 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/tokenring/tmspci.c\n\tdrivers/net/ucc_geth_mii.c\n" }, { "commit": "a883bf564ea555447a76682bb2d8d4bc92e23e0e", "tree": "211994ddc25999320fe47d2a58ba8105e00dfee7", "parents": [ "9f8ac0b7b063be77f0de7a27fe5e6a0aa2cce58d" ], "author": { "name": "Jarek Poplawski", "email": "jarkao2@gmail.com", "time": "Wed Mar 04 17:38:10 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 04 17:38:10 2009 -0800" }, "message": "pkt_sched: act_police: Fix a rate estimator test.\n\nA commit c1b56878fb68e9c14070939ea4537ad4db79ffae \"tc: policing requires\na rate estimator\" introduced a test which invalidates previously working\nconfigs, based on examples from iproute2: doc/actions/actions-general.\nThis is too rigorous: a rate estimator is needed only when police\u0027s\n\"avrate\" option is used.\n\nReported-by: Joao Correia \u003cjoaomiguelcorreia@gmail.com\u003e\nDiagnosed-by: John Dykstra \u003cjohn.dykstra1@gmail.com\u003e\nSigned-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "aa4abc9bcce0d2a7ec189e897f8f8c58ca04643b", "tree": "22ef88d84a2e06380bb6a853c3ba28657e4e5f92", "parents": [ "814c01dc7c533033b4e99981a2e24a6195bfb43c", "52c0326beaa3cb0049d0f1c51c6ad5d4a04e4430" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Mar 01 21:35:16 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Mar 01 21:35:16 2009 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/wireless/iwlwifi/iwl-tx.c\n\tnet/8021q/vlan_core.c\n\tnet/core/dev.c\n" }, { "commit": "1844f747947bb89d7f12cd3034548805113f764b", "tree": "3d2cb21cf6a9aec7bfd1c0ad9f6320f7b2a8c1f6", "parents": [ "e92aa634a33739478958f4109d6bd35b36d13532" ], "author": { "name": "Jarek Poplawski", "email": "jarkao2@gmail.com", "time": "Fri Feb 27 02:42:38 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 27 02:42:38 2009 -0800" }, "message": "pkt_sched: sch_drr: Fix oops in drr_change_class.\n\ndrr_change_class lacks a check for NULL of tca[TCA_OPTIONS], so oops\nis possible.\n\nReported-by: Denys Fedoryschenko \u003cdenys@visp.net.lb\u003e\nSigned-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "149490f131ab532a3b9e8806249a0e730994cdf6", "tree": "e8b0e3313c554547704b3b0444579a2fbbeeb431", "parents": [ "d54e6d872767ae6512978f86a35d623a8ed948c5" ], "author": { "name": "Jarek Poplawski", "email": "jarkao2@gmail.com", "time": "Tue Feb 10 00:11:21 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 10 00:11:21 2009 -0800" }, "message": "pkt_sched: sch_multiq: Change errno on non-multiqueue devices use.\n\nCurrent \"RTNETLINK answers: Invalid argument\" warning, while trying to\nadd multiq qdisc to non-multiqueue device, isn\u0027t very helpful and some\nof these devs can be changed btw., so let\u0027s use a better errno.\n\nWith feedback from Stephen Hemminger \u003cshemminger@vyatta.com\u003e\n\nReported-by: Badalian Vyacheslav \u003cslavon@bigtelecom.ru\u003e\nSigned-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1224736d97e83367bb66e29c2bee0f570f09db3e", "tree": "540dcc52f54a0a440826cd66d1f43c558e5013a7", "parents": [ "e82181de5ef4648074765912d2d82d6bd60115eb" ], "author": { "name": "Jarek Poplawski", "email": "jarkao2@gmail.com", "time": "Sun Feb 01 01:13:22 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Feb 01 01:13:22 2009 -0800" }, "message": "pkt_sched: sch_htb: Use workqueue to schedule after too many events.\n\nPatrick McHardy \u003ckaber@trash.net\u003e suggested using a workqueue instead\nof hrtimers to trigger netif_schedule() when there is a problem with\nsetting exact time of this event: \u0027The differnce - yeah, it shouldn\u0027t\nmake much, mainly wake up the qdisc earlier (but not too early) after\n\"too many events\" occured _and_ no further enqueue events wake up the\nqdisc anyways.\u0027\n\nSigned-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e82181de5ef4648074765912d2d82d6bd60115eb", "tree": "f977e4d099c2df0ba78da1fa6d47d13ba70cfb09", "parents": [ "b00355db3f88d96810a60011a30cfb2c3469409d" ], "author": { "name": "Jarek Poplawski", "email": "jarkao2@gmail.com", "time": "Sun Feb 01 01:13:05 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Feb 01 01:13:05 2009 -0800" }, "message": "pkt_sched: sch_htb: Warn on too many events.\n\nLet\u0027s get some info on possible config problems. This patch brings\nback an old warning, but is printed only once now.\n\nWith feedback from Patrick McHardy \u003ckaber@trash.net\u003e\n\nSigned-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b00355db3f88d96810a60011a30cfb2c3469409d", "tree": "43331c769665e619892d8f97a38ce1d12b3a6363", "parents": [ "eefef1cf7653cd4e0aaf743c00ae8345086cdc01" ], "author": { "name": "Jarek Poplawski", "email": "jarkao2@gmail.com", "time": "Sun Feb 01 01:12:42 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Feb 01 01:12:42 2009 -0800" }, "message": "pkt_sched: sch_hfsc: sch_htb: Add non-work-conserving warning handler.\n\nPatrick McHardy \u003ckaber@trash.net\u003e suggested:\n\u003e How about making this flag and the warning message (in a out-of-line\n\u003e function) globally available? Other qdiscs (f.i. HFSC) can\u0027t deal with\n\u003e inner non-work-conserving qdiscs as well.\n\nThis patch uses qdisc-\u003eflags field of \"suspected\" child qdisc.\n\nSigned-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a73be040650463eacb95f83d2e6673ac57b4fc59", "tree": "ae3958ba9830448e18a0dedc82c8d7c031af2476", "parents": [ "c08513471911cf33cb50249a7ff12848374f7263" ], "author": { "name": "Jarek Poplawski", "email": "jarkao2@gmail.com", "time": "Mon Jan 12 21:54:40 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 12 21:54:40 2009 -0800" }, "message": "pkt_sched: sch_htb: Break all htb_do_events() after 2 jiffies\n\nCurrently htb_do_events() breaks events recounting for a level after 2\njiffies, but there is no reason to repeat this for next levels and\nincrease delays even more (with softirqs disabled). htb_dequeue_tree()\ncan add to this too, btw. In such a case q-\u003enow time is invalid anyway.\n\nThanks to Patrick McHardy for spotting an error around earlier version\nof this patch.\n\nSigned-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c08513471911cf33cb50249a7ff12848374f7263", "tree": "9310f25b012fd7ecb8eb58ec0b0caa8dc834438e", "parents": [ "daaf83d2b9277928739f3eb7ea64f49c1254fd62" ], "author": { "name": "Jarek Poplawski", "email": "jarkao2@gmail.com", "time": "Mon Jan 12 21:54:16 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 12 21:54:16 2009 -0800" }, "message": "pkt_sched: sch_htb: Consider used jiffies in htb_do_events()\n\nNext event time should consider jiffies used for recounting. Otherwise\nqdisc_watchdog_schedule() triggers hrtimer immediately with the event\nin the past, and may cause very high ksoftirqd cpu usage (if highres\nis on).\n\nThere is also removed checking \"event\" for zero in htb_dequeue(): it\u0027s\nalways true in this place.\n\nSigned-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5fbbf5f648a9c4ef99276854f05b2255d1b004d3", "tree": "59c9ae762c3df2800e894001b3de58c5f1972486", "parents": [ "ce279e6ec91c49f2c5f59f7492e19d39edbf8bbd", "56cf391a9462a4897ea660a6af3662dda5ae8c84" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 08 14:25:41 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 08 14:25:41 2009 -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: (84 commits)\n wimax: fix kernel-doc for debufs_dentry member of struct wimax_dev\n net: convert pegasus driver to net_device_ops\n bnx2x: Prevent eeprom set when driver is down\n net: switch kaweth driver to netdevops\n pcnet32: round off carrier watch timer\n i2400m/usb: wrap USB power saving in #ifdef CONFIG_PM\n wimax: testing for rfkill support should also test for CONFIG_RFKILL_MODULE\n wimax: fix kconfig interactions with rfkill and input layers\n wimax: fix \u0027#ifndef CONFIG_BUG\u0027 layout to avoid warning\n r6040: bump release number to 0.20\n r6040: warn about MAC address being unset\n r6040: check PHY status when bringing interface up\n r6040: make printks consistent with DRV_NAME\n gianfar: Fixup use of BUS_ID_SIZE\n mlx4_en: Returning real Max in get_ringparam\n mlx4_en: Consider inline packets on completion\n netdev: bfin_mac: enable bfin_mac net dev driver for BF51x\n qeth: convert to net_device_ops\n vlan: add neigh_setup\n dm9601: warn on invalid mac address\n ...\n" }, { "commit": "c19a28e1193a6c854738d609ae9b2fe2f6e6bea4", "tree": "79a354f827a5d3656be3f55d18d31265750d9d06", "parents": [ "f15659628b43b27c20447c731456c39cbec973e9" ], "author": { "name": "Fernando Carrijo", "email": "fcarrijo@yahoo.com.br", "time": "Wed Jan 07 18:09:08 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 08 08:31:14 2009 -0800" }, "message": "remove lots of double-semicolons\n\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: Theodore Ts\u0027o \u003ctytso@mit.edu\u003e\nAcked-by: Mark Fasheh \u003cmfasheh@suse.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: James Morris \u003cjmorris@namei.org\u003e\nAcked-by: Casey Schaufler \u003ccasey@schaufler-ca.com\u003e\nAcked-by: Takashi Iwai \u003ctiwai@suse.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "61294e2e2730f24b833d9a713add5f4f6672c2a4", "tree": "958a658c4f8e91882263554f5d78fd9203062424", "parents": [ "0a0b9d2edc3d7b56386dd980f7d17eaaad15cf6a" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Tue Jan 06 10:45:57 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 06 10:45:57 2009 -0800" }, "message": "sch_teql: convert to net_device_ops\n\nConvert this driver to net_device_ops.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6f57321422e0d359e83c978c2b03db77b967b7d5", "tree": "80d92a8fff5b5ae27ca618f34acf9d696289d6ba", "parents": [ "f1d3e4dca3f8d4f55656477e83d0afe0ea7cbaed" ], "author": { "name": "Jarek Poplawski", "email": "jarkao2@gmail.com", "time": "Mon Jan 05 18:14:19 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 05 18:14:19 2009 -0800" }, "message": "pkt_sched: cls_u32: Fix locking in u32_change()\n\nNew nodes are inserted in u32_change() under rtnl_lock() with wmb(),\nso without tcf_tree_lock() like in other classifiers (e.g. cls_fw).\nThis isn\u0027t enough without rmb() on the read side, but on the other\nhand adding such barriers doesn\u0027t give any savings, so the lock is\nadded instead.\n\nReported-by: m0sia \u003cm0sia@plotinka.ru\u003e\nSigned-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c276e098d3ee33059b4a1c747354226cec58487c", "tree": "df833d2e6719dd83f219a846520a581b152d5332", "parents": [ "7945cc6464a4db0caf6dfacdfe05806051c4cb7b" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 05 16:01:51 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 05 16:01:51 2009 -0800" }, "message": "Revert \"net: Fix for initial link state in 2.6.28\"\n\nThis reverts commit 22604c866889c4b2e12b73cbf1683bda1b72a313.\n\nWe can\u0027t fix this issue in this way, because we now can try\nto take the dev_base_lock rwlock as a writer in software interrupt\ncontext and that is not allowed without major surgery elsewhere.\n\nThis initial link state problem needs to be solved in some other\nway.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "22604c866889c4b2e12b73cbf1683bda1b72a313", "tree": "4ed1c7cb6cc022b599b8eb3e8bc274dc9df92362", "parents": [ "745417e20684e4951afcabfe74583a3884e54980" ], "author": { "name": "Michael Marineau", "email": "mike@marineau.org", "time": "Sun Jan 04 17:18:51 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 04 17:18:51 2009 -0800" }, "message": "net: Fix for initial link state in 2.6.28\n\nFrom: Michael Marineau \u003cmike@marineau.org\u003e\n\nCommit b47300168e770b60ab96c8924854c3b0eb4260eb \"Do not fire linkwatch\nevents until the device is registered.\" was made as a workaround for\ndrivers that call netif_carrier_off before registering the device.\nUnfortunately this causes these drivers to incorrectly report their\nlink status as IF_OPER_UNKNOWN which can falsely set the IFF_RUNNING\nflag when the interface is first brought up. This issues was\npreviously pointed out[1] but was dismissed saying that IFF_RUNNING is\nnot related to the link status. From my digging IFF_RUNNING, as\nreported to userspace, is based on the link state. It is set based on\n__LINK_STATE_START and IF_OPER_UP or IF_OPER_UNKNOWN. See [2], [3],\nand [4]. (Whether or not the kernel has IFF_RUNNING set in flags is\nnot reported to user space so it may well be independent of the link,\nI don\u0027t know if and when it may get set.)\n\nThe end result depends slightly depending on the driver. The the two I\ntested were e1000e and b44. With e1000e if the system is booted\nwithout a network cable attached the interface will falsely report\nRUNNING when it is brought up causing NetworkManager to attempt to\nstart it and eventually time out. With b44 when the system is booted\nwith a network cable attached and brought up with dhcpcd it will time\nout the first time.\n\nThe attached patch that will still set the operstate variable\ncorrectly to IF_OPER_UP/DOWN/etc when linkwatch_fire_event is called\nbut then return rather than skipping the linkwatch_fire_event call\nentirely as the previous fix did. (sorry it isn\u0027t inline, I don\u0027t have\na patch friendly email client at the moment)\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "68ce9c0e3411b430b9800015e318af9f96933aa0", "tree": "784b1d4f4e25990b5eb13a4ce11105daf8657841", "parents": [ "8e8ba85417366afd2361e315c6ba5949d3eff56f" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Sun Dec 28 17:57:25 2008 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 29 19:40:46 2008 -0800" }, "message": "cls_cgroup: clean up Kconfig\n\ncls_cgroup can\u0027t be compiled as a module, since it\u0027s not supported by\ncgroup.\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8e8ba85417366afd2361e315c6ba5949d3eff56f", "tree": "f093eb8aedd4ca4a888ae9f867cb1b1277a12073", "parents": [ "2f068bf8711c35b98bf9a0172555b8390a762fc0" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Mon Dec 29 19:39:03 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 29 19:40:45 2008 -0800" }, "message": "cls_cgroup: clean up for cgroup part\n\n- It\u0027s better to use container_of() instead of casting cgroup_subsys_state *\n to cgroup_cls_state *.\n- Add helper function task_cls_state().\n- Rename net_cls_state() to cgrp_cls_state().\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2f068bf8711c35b98bf9a0172555b8390a762fc0", "tree": "270fc6c0a3df7ccbf9a77b4060dd3bc115c1b0b5", "parents": [ "684f4a4c4a69f7226d8c7559c0cdfc7bd388335a" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Sun Dec 28 17:57:19 2008 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 29 19:40:44 2008 -0800" }, "message": "cls_cgroup: fix an oops when removing a cgroup\n\nWhen removing a cgroup, an oops was triggered immediately. The cause\nis wrong kfree() in cgrp_destroy().\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0191b625ca5a46206d2fb862bb08f36f2fcb3b31", "tree": "454d1842b1833d976da62abcbd5c47521ebe9bd7", "parents": [ "54a696bd07c14d3b1192d03ce7269bc59b45209a", "eb56092fc168bf5af199d47af50c0d84a96db898" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 28 12:49:40 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 28 12:49:40 2008 -0800" }, "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: (1429 commits)\n net: Allow dependancies of FDDI \u0026 Tokenring to be modular.\n igb: Fix build warning when DCA is disabled.\n net: Fix warning fallout from recent NAPI interface changes.\n gro: Fix potential use after free\n sfc: If AN is enabled, always read speed/duplex from the AN advertising bits\n sfc: When disabling the NIC, close the device rather than unregistering it\n sfc: SFT9001: Add cable diagnostics\n sfc: Add support for multiple PHY self-tests\n sfc: Merge top-level functions for self-tests\n sfc: Clean up PHY mode management in loopback self-test\n sfc: Fix unreliable link detection in some loopback modes\n sfc: Generate unique names for per-NIC workqueues\n 802.3ad: use standard ethhdr instead of ad_header\n 802.3ad: generalize out mac address initializer\n 802.3ad: initialize ports LACPDU from const initializer\n 802.3ad: remove typedef around ad_system\n 802.3ad: turn ports is_individual into a bool\n 802.3ad: turn ports is_enabled into a bool\n 802.3ad: make ntt bool\n ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.\n ...\n\nFixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due\nto the conversion to %pI (in this networking merge) and the addition of\ndoing IPv6 addresses (from the earlier merge of CIFS).\n" }, { "commit": "cbacc2c7f066a1e01b33b0e27ae5efbf534bc2db", "tree": "90d1093131d2a3543a8b3b1f3364e7c6f4081a93", "parents": [ "4a6908a3a050aacc9c3a2f36b276b46c0629ad91", "74192246910ff4fb95309ba1a683215644beeb62" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Dec 25 11:40:09 2008 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Dec 25 11:40:09 2008 +1100" }, "message": "Merge branch \u0027next\u0027 into for-linus\n" }, { "commit": "05a8c1cbfe368df8c0d4eff710c370d2aa10245a", "tree": "fb1ed1dda4f25f0c7ee6facb9e3d10a45b324201", "parents": [ "4707470ae7441733822efcd680b0ef3971921c4d" ], "author": { "name": "Jarek Poplawski", "email": "jarkao2@gmail.com", "time": "Mon Dec 22 19:44:13 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 22 19:44:13 2008 -0800" }, "message": "pkt_sched: Remove smp_wmb() in qdisc_watchdog()\n\nWhile implementing a TCQ_F_THROTTLED flag there was used an smp_wmb()\nin qdisc_watchdog(), but since this flag is practically used only in\nsch_netem(), and since it\u0027s not even clear what reordering is avoided\nhere (TCQ_F_THROTTLED vs. __QDISC_STATE_SCHED?) it seems the barrier\ncould be safely removed.\n\nSigned-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7f3ff4f63f76c2702da6041d2da5eb30fac407f6", "tree": "0be86d18da3a4c4f123b38dcdc9c25b606cabbb1", "parents": [ "bfb8cc31b11ccaf7cd55fd9e0f4794f82527948f" ], "author": { "name": "Jarek Poplawski", "email": "jarkao2@gmail.com", "time": "Sun Dec 21 20:14:48 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Dec 21 20:14:48 2008 -0800" }, "message": "pkt_sched: Annotate uninitialized var in sfq_enqueue()\n\nSome gcc versions warn that ret may be used uninitialized in\nsfq_enqueue(). It\u0027s a false positive, so let\u0027s annotate this.\n\nSigned-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eb14f019597cd86c21a6c601d7e900f40030c2e7", "tree": "36fb2f36a1747f98988f87215db1eef3a71d45eb", "parents": [ "9a4a84294b0d60b8c287131478f743ba2bc68949", "a3dd15444baa9c7522c8457ab564c41219dfb44c" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 15 20:03:50 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 15 20:03:50 2008 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\n\tdrivers/net/e1000e/ich8lan.c\n" }, { "commit": "eb9b851b980e20ba5f6bdfd6ec24f4bc77623ce6", "tree": "7d417a6a8a2020810597c5dcac4b59213f7c269c", "parents": [ "be70ed189bc0d16e1609a1c6c04ec9418b4dd11a" ], "author": { "name": "Jesper Dangaard Brouer", "email": "hawk@comx.dk", "time": "Mon Dec 15 00:39:17 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 15 00:39:17 2008 -0800" }, "message": "SCHED: netem: Correct documentation comment in code.\n\nThe netem simulator is no longer limited by Linux timer resolution HZ.\nNot since Patrick McHardy changed the QoS system to use hrtimer.\n\nSigned-off-by: Jesper Dangaard Brouer \u003chawk@comx.dk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "512bb43eb5422ee69a1be05ea0d89dc074fac9a2", "tree": "8d38219eff87fbf684fb168cc0d32647e8037f98", "parents": [ "1b5c0077e1615bb16e777a10ec1fc1195ba059ac" ], "author": { "name": "Jarek Poplawski", "email": "jarkao2@gmail.com", "time": "Tue Dec 09 22:35:02 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 09 22:35:02 2008 -0800" }, "message": "pkt_sched: sch_htb: Optimize WARN_ONs in htb_dequeue_tree() etc.\n\nWe can skip WARN_ON() in htb_dequeue_tree() because there should be\nalways a similar warning from htb_lookup_leaf() earlier.\n\nThe first WARN_ON() in in htb_lookup_leaf() is changed to BUG_ON()\nbecause most likly this should end with oops anyway.\n\nSigned-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" } ], "next": "1b5c0077e1615bb16e777a10ec1fc1195ba059ac" }