)]}' { "log": [ { "commit": "9292d8f20ff3c034c99c2adfe27496957b3defe3", "tree": "b5d2df5bfdbf9aabf3ebcc4396c118306d1d3768", "parents": [ "3f326d40994f922e0a3e468dd7fd9999eaf71574" ], "author": { "name": "Krzysztof Hałasa", "email": "khc@pm.waw.pl", "time": "Mon Aug 02 16:03:29 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 02 16:03:29 2010 -0700" }, "message": "Tulip: don\u0027t initialize SBE xT3E3 WAN ports.\n\nSBE 2T3E3 cards use DECchips 21143 but they need a different driver.\nDon\u0027t even try to use a normal tulip driver with them.\n\nSigned-off-by: Krzysztof Hałasa \u003ckhc@pm.waw.pl\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4fc6eb7d35a28d808ff6c77fa36e637e334dceac", "tree": "e69b4b7e5a5d050ce4d8837eda9c7e33cb5c3d7d", "parents": [ "9ed6eda4fad9ea95e99f1e3cc546bcde049695cf", "8dd014adfea6f173c1ef6378f7e5e7924866c923" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 02 15:54:07 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 02 15:54:07 2010 -0700" }, "message": "Merge branch \u0027vhost-net-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost\n" }, { "commit": "67b284d476bcb3d100e946da23d6cf9acfd0465c", "tree": "2a152eae5cf2b13e97088ab1453036bc64e752b4", "parents": [ "ecc796486f0a7f4958f8dc7550267570dcacb608" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Mon Aug 02 11:26:02 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 02 15:46:30 2010 -0700" }, "message": "tg3: Remove 5720, 5750, and 5750M\n\nThese devices were never released to the public.\n\nReviewed-by: Benjamin Li \u003cbenli@broadcom.com\u003e\nReviewed-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "83bf2e4089bebc2c7fd14a79de5954b26fe8d4af", "tree": "ab2cb1f229ba4c2d7236406c997e41a223daf74d", "parents": [ "de38483010bae523f533bb6bf9f7b7353772f6eb", "6661481d5a8975657742c7ed40ae16bdaa7d0a6e" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 02 15:07:58 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 02 15:07:58 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6\n" }, { "commit": "f43dc98b3be36551143e3bbaf1bb3067835c24f4", "tree": "65d157024f399f49f8798ab9f905d66dc4f11a52", "parents": [ "794dbc1d712e181a9eb8d1ae799ed7c526963a7c" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Mon Aug 02 17:20:54 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon Aug 02 17:20:54 2010 +0200" }, "message": "netfilter: nf_nat: make unique_tuple return void\n\nThe only user of unique_tuple() get_unique_tuple() doesn\u0027t care about the\nreturn value of unique_tuple(), so make unique_tuple() return void (nothing).\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "5c0d2374a16fcb52096df914ee57720987677be5", "tree": "fe69482186b9a4fe208c18fffbf2c791718d0557", "parents": [ "2890a1573d1ae859a4d77e2fdbecacf21f96c0db" ], "author": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Mon Aug 02 17:12:44 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon Aug 02 17:12:44 2010 +0200" }, "message": "ipvs: provide default ip_vs_conn_{in,out}_get_proto\n\nThis removes duplicate code by providing a default implementation\nwhich is used by 3 of the 4 modules that provide these call.\n\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "ee92d37861a90b8f14fa621ae5abcfb29a89aaa9", "tree": "ead832fad372e9802d51914ebd6a8f3ce8edd4ce", "parents": [ "24b36f0193467fa727b85b4c004016a8dae999b9" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Mon Aug 02 17:06:19 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon Aug 02 17:06:19 2010 +0200" }, "message": "netfilter: nf_conntrack_extend: introduce __nf_ct_ext_exist()\n\nsome users of nf_ct_ext_exist() know ct-\u003eext isn\u0027t NULL. For these users, the\ncheck for ct-\u003eext isn\u0027t necessary, the function __nf_ct_ext_exist() can be\nused instead.\n\nthe type of the return value of nf_ct_ext_exist() is changed to bool.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "ae3568adf42d5d3bb3cfa505b94351c5d1ce4924", "tree": "112865a6e6b1e4ddf70362f3efb295c495ec85b9", "parents": [ "7f3e01fee41a322747db2d7574516d9fbd3785c0", "b7753c8cd51dce67a0b152efb456a21ff1cc241b" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Jul 29 14:47:07 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Jul 29 14:47:07 2010 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem\n" }, { "commit": "b7753c8cd51dce67a0b152efb456a21ff1cc241b", "tree": "b322f9c97317be44435d4ffe798e9550f2d9f0e6", "parents": [ "e5b900d228b76d445a4240d9aeb3cd8f79205a91" ], "author": { "name": "Christian Lamparter", "email": "chunkeey@googlemail.com", "time": "Thu Jul 29 01:28:46 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Jul 29 12:55:00 2010 -0400" }, "message": "cfg80211: fix dev \u003c-\u003e wiphy typo\n\nCc: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Christian Lamparter \u003cchunkeey@googlemail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "e5b900d228b76d445a4240d9aeb3cd8f79205a91", "tree": "dffa32e827e2d6e5388430ae5ec732f0ca023b11", "parents": [ "d28232b461b8d54b09e59325dbac8b0913ce2049" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu Jul 29 16:08:55 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Jul 29 12:55:00 2010 -0400" }, "message": "mac80211: allow drivers to request DTIM period\n\nSome features require knowing the DTIM period\nbefore associating. This implements the ability\nto wait for a beacon in mac80211 before assoc\nto provide this value. It is optional since\nmost likely not all drivers will need this.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "4552124543141debf40a94b67155e57aa6bb34d6", "tree": "c2080f8be1a08c92a40bb05464800c05d4806152", "parents": [ "a0daa0e7592ada797d6835f11529097aabc27ad2" ], "author": { "name": "Felix Fietkau", "email": "nbd@openwrt.org", "time": "Wed Jul 28 02:40:49 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jul 28 16:24:02 2010 -0400" }, "message": "mac80211: inform drivers about the off-channel status on channel changes\n\nFor some drivers it can be useful to know whether the channel they\u0027re\nsupposed to switch to is going to be used for short off-channel work or\nscanning, or whether the hardware is expected to stay on it for a while\nlonger. This is important for various kinds of calibration work, which\ntakes longer to complete and should keep some persistent state, even if\nthe channel temporarily changes.\n\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "099284bdecf6e0af78662371ed3f45b71d796aad", "tree": "90c336885d8dd6daf46ea4b94f71bb8f986b5ba9", "parents": [ "073730d771d97bb5bbef080bd5d6d0a5af7cba7d", "4ebaa4edf8799cab19d5a0642dc95f04fd284e06" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jul 28 16:17:49 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jul 28 16:17:49 2010 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6\n" }, { "commit": "d7926ee38f5c6e0bbebe712304f99a4c67e40f84", "tree": "2feae78726dae032741f81fc9590d61693a182f5", "parents": [ "c23f3445e68e1db0e74099f264bc5ff5d55ebdeb" ], "author": { "name": "Sridhar Samudrala", "email": "samudrala.sridhar@gmail.com", "time": "Sun May 30 22:24:39 2010 +0200" }, "committer": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Wed Jul 28 15:45:12 2010 +0300" }, "message": "cgroups: Add an API to attach a task to current task\u0027s cgroup\n\nAdd a new kernel API to attach a task to current task\u0027s cgroup\nin all the active hierarchies.\n\nSigned-off-by: Sridhar Samudrala \u003csri@us.ibm.com\u003e\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nReviewed-by: Paul Menage \u003cmenage@google.com\u003e\nAcked-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\n" }, { "commit": "bb7e95c8fd859922c6cf3ebbb3a8546007df1748", "tree": "58b54c6306ba168b76f25cc6dc9a2d1d2eb830a7", "parents": [ "b8bc0421ab7f83712a0a8ef7eb05fa73ec53c027", "5447080cfa3c77154498dfbf225367ac85b4c2b5" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jul 27 21:01:35 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jul 27 21:01:35 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/bnx2x_main.c\n\nMerge bnx2x bug fixes in by hand... :-/\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "94fe8c683cea97fe2c59a5f0dc206aa329c5763c", "tree": "79349dba5fc518f8795cfea4c1b70217f36d2c6f", "parents": [ "3eeb29972b1139f733f7269def527900729f4cc7" ], "author": { "name": "Richard Röjfors", "email": "richard.rojfors@pelagicore.com", "time": "Tue Jul 27 12:57:01 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jul 27 20:48:19 2010 -0700" }, "message": "ks8842: Support DMA when accessed via timberdale\n\nThis patch adds support for RX and TX DMA via the DMA API,\nthis is only supported when the KS8842 is accessed via timberdale.\n\nThere is no support for DMA on the generic bus interface it self,\na state machine inside the FPGA is handling RX and TX transfers to/from\nbuffers in the FPGA. The host CPU can do DMA to and from these buffers.\n\nThe FPGA has to handle the RX interrupts, so these must be enabled in\nthe ks8842 but not in the FPGA. The driver must not disable the RX interrupt\nthat would mean that the data transfers into the FPGA buffers would stop.\n\nThe host shall not enable TX interrupts since TX is handled by the FPGA,\nthe host is notified by DMA callbacks when transfers are finished.\n\nWhich DMA channels to use are added as parameters in the platform data struct.\n\nSigned-off-by: Richard Röjfors \u003crichard.rojfors@pelagicore.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e73439d8c0e4c522c843b8bb98c0eb5700da6b05", "tree": "0ca070acc02700061380bd40315e39684b3e59fa", "parents": [ "800f65bba8d2030b3fef62850e203f9f176625a8" ], "author": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Mon Jul 26 10:06:00 2010 -0400" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Tue Jul 27 12:29:04 2010 -0700" }, "message": "Bluetooth: Defer SCO setup if mode change is pending\n\nCertain headsets such as the Motorola H350 will reject SCO and eSCO\nconnection requests while the ACL is transitioning from sniff mode\nto active mode. Add synchronization so that SCO and eSCO connection\nrequests will wait until the ACL has fully transitioned to active mode.\n\n\u003c HCI Command: Exit Sniff Mode (0x02|0x0004) plen 2\n handle 12\n\u003e HCI Event: Command Status (0x0f) plen 4\n Exit Sniff Mode (0x02|0x0004) status 0x00 ncmd 1\n\u003c HCI Command: Setup Synchronous Connection (0x01|0x0028) plen 17\n handle 12 voice setting 0x0040\n\u003e HCI Event: Command Status (0x0f) plen 4\n Setup Synchronous Connection (0x01|0x0028) status 0x00 ncmd 1\n\u003e HCI Event: Number of Completed Packets (0x13) plen 5\n handle 12 packets 1\n\u003e HCI Event: Mode Change (0x14) plen 6\n status 0x00 handle 12 mode 0x00 interval 0\n Mode: Active\n\u003e HCI Event: Synchronous Connect Complete (0x2c) plen 17\n status 0x10 handle 14 bdaddr 00:1A:0E:50:28:A4 type SCO\n Error: Connection Accept Timeout Exceeded\n\nSigned-off-by: Ron Shaffer \u003crshaffer@codeaurora.org\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "073730d771d97bb5bbef080bd5d6d0a5af7cba7d", "tree": "711dc85fa6253408de4fe0766ea1b8219fd6c034", "parents": [ "903c99d8d6d055c56e7fdfba4602c05e357fa186" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Mon Jul 26 14:40:00 2010 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jul 27 15:14:13 2010 -0400" }, "message": "wireless: Convert wiphy_debug macro to function\n\nSave a few bytes of text\n\n(allyesconfig)\n$ size drivers/net/wireless/built-in.o*\n text\t data\t bss\t dec\t hex\tfilename\n3924568\t 100548\t 871056\t4896172\t 4ab5ac\tdrivers/net/wireless/built-in.o.new\n3926520\t 100548\t 871464\t4898532\t 4abee4\tdrivers/net/wireless/built-in.o.old\n\n$ size net/wireless/core.o*\n text\t data\t bss\t dec\t hex\tfilename\n 12843\t 216\t 3768\t 16827\t 41bb\tnet/wireless/core.o.new\n 12328\t 216\t 3656\t 16200\t 3f48\tnet/wireless/core.o\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "e1db74fcc3d95c8a051ec457241b5aa65a01a603", "tree": "4165af9c4cb369a806fc34e50a24a6378f5a123f", "parents": [ "97c5e2756e3f0711877c5b6f2323151964229260" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Mon Jul 26 14:39:57 2010 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jul 27 15:14:13 2010 -0400" }, "message": "include/net/cfg80211.h: Add wiphy_\u003clevel\u003e printk equivalents\n\nSimplify logging messages for wiphy devices\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "800f65bba8d2030b3fef62850e203f9f176625a8", "tree": "6507c4fe7a0826c253b4afb29375ab306a0fd9c8", "parents": [ "06b3cda0c12986f5bba578b918b188d731c4e191", "b3190df628617c7a4f188a9465aeabe1f5761933" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jul 27 11:59:19 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jul 27 11:59:19 2010 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6\n\nConflicts:\n\tdrivers/net/wireless/iwlwifi/iwl-commands.h\n" }, { "commit": "3289a8368c294726659588d044e354dd3bcf44b3", "tree": "e7e534dbbeb1f4c8e73c329cbd0956d65f3147d4", "parents": [ "ea65145da88e9fa04cb15c7a2a550ad1d3fde02a" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Jul 22 16:31:48 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jul 26 15:09:04 2010 -0400" }, "message": "lib80211: remove unused host_build_iv option\n\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "fed66381d65a35198639f564365e61a7f256bf79", "tree": "e4d4c83f135f58c32a85454e28e33407711f7718", "parents": [ "c1f79426e2df5ef96fe3e76de6c7606d15bf390b" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Jul 22 19:09:08 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jul 24 21:05:57 2010 -0700" }, "message": "net: pskb_expand_head() optimization\n\nMove frags[] at the end of struct skb_shared_info, and make\npskb_expand_head() copy only the used part of it instead of whole array.\n\nThis should avoid kmemcheck warnings and speedup pskb_expand_head() as\nwell, avoiding a lot of cache misses.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3b87956ea645fb4de7e59c7d0aa94de04be72615", "tree": "0dde04e6dfad7cd76afbb31eff72a8f08a574a9c", "parents": [ "76ac21f5ef30e46397e405695eb1240ff0955209" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Thu Jul 22 18:45:04 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jul 24 21:04:20 2010 -0700" }, "message": "net sched: fix race in mirred device removal\n\nThis fixes hang when target device of mirred packet classifier\naction is removed.\n\nIf a mirror or redirection action is configured to cause packets\nto go to another device, the classifier holds a ref count, but was assuming\nthe adminstrator cleaned up all redirections before removing. The fix\nis to add a notifier and cleanup during unregister.\n\nThe new list is implicitly protected by RTNL mutex because\nit is held during filter add/delete as well as notifier.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nAcked-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c1f79426e2df5ef96fe3e76de6c7606d15bf390b", "tree": "645ca8ec803a110ce07dc873b7e99392efbf25eb", "parents": [ "55bad82385f036a844429ff8989732f0ea3bfff9" ], "author": { "name": "Stefan Assmann", "email": "sassmann@redhat.com", "time": "Thu Jul 22 02:50:21 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jul 24 20:49:29 2010 -0700" }, "message": "sysfs: add attribute to indicate hw address assignment type\n\nAdd addr_assign_type to struct net_device and expose it via sysfs.\nThis new attribute has the purpose of giving user-space the ability to\ndistinguish between different assignment types of MAC addresses.\n\nFor example user-space can treat NICs with randomly generated MAC\naddresses differently than NICs that have permanent (locally assigned)\nMAC addresses.\nFor the former udev could write a persistent net rule by matching the\ndevice path instead of the MAC address.\nThere\u0027s also the case of devices that \u0027steal\u0027 MAC addresses from slave\ndevices. In which it is also be beneficial for user-space to be aware\nof the fact.\n\nThis patch also introduces a helper function to assist adoption of\ndrivers that generate MAC addresses randomly.\n\nSigned-off-by: Stefan Assmann \u003csassmann@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2a88e7e559f2358f4e1422d0b0c0278a74136581", "tree": "b4e9e56dbde79fe7185cba511a1ffd85f5d2018e", "parents": [ "344e0f623cec5eba273db06fe57db080988d6b26", "7a17a33c0da37f8d24222c967550d19dabf13617" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 23 14:03:38 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 23 14:03:38 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6\n\nConflicts:\n\tdrivers/net/wireless/iwlwifi/iwl-commands.h\n" }, { "commit": "49daf6a22622d4e1619aeaad5f9f0472bf89daff", "tree": "a86af0b0f846fc187eaa45ffdad96976bfd38331", "parents": [ "b0c81aa566cccbe26bd99237873fb8428827d82f" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Fri Jul 23 14:07:47 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jul 23 14:07:47 2010 +0200" }, "message": "xt_quota: report initial quota value instead of current value to userspace\n\nWe should copy the initial value to userspace for iptables-save and\nto allow removal of specific quota rules.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "e8648a1fdb54da1f683784b36a17aa65ea56e931", "tree": "66fd69f1987e4aba0025429b581d394e6db28af0", "parents": [ "7f1c407579519e71a0dcadc05614fd98acec585e" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri Jul 23 12:59:36 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jul 23 12:59:36 2010 +0200" }, "message": "netfilter: add xt_cpu match\n\nIn some situations a CPU match permits a better spreading of\nconnections, or select targets only for a given cpu.\n\nWith Remote Packet Steering or multiqueue NIC and appropriate IRQ\naffinities, we can distribute trafic on available cpus, per session.\n(all RX packets for a given flow is handled by a given cpu)\n\nSome legacy applications being not SMP friendly, one way to scale a\nserver is to run multiple copies of them.\n\nInstead of randomly choosing an instance, we can use the cpu number as a\nkey so that softirq handler for a whole instance is running on a single\ncpu, maximizing cache effects in TCP/UDP stacks.\n\nUsing NAT for example, a four ways machine might run four copies of\nserver application, using a separate listening port for each instance,\nbut still presenting an unique external port :\n\niptables -t nat -A PREROUTING -p tcp --dport 80 -m cpu --cpu 0 \\\n -j REDIRECT --to-port 8080\n\niptables -t nat -A PREROUTING -p tcp --dport 80 -m cpu --cpu 1 \\\n -j REDIRECT --to-port 8081\n\niptables -t nat -A PREROUTING -p tcp --dport 80 -m cpu --cpu 2 \\\n -j REDIRECT --to-port 8082\n\niptables -t nat -A PREROUTING -p tcp --dport 80 -m cpu --cpu 3 \\\n -j REDIRECT --to-port 8083\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "7f1c407579519e71a0dcadc05614fd98acec585e", "tree": "623a63992113a539a3cd43031e58aad83f04bf34", "parents": [ "7b215ffc3885a38182d3d49ceb41d0a81c3e041a" ], "author": { "name": "Hannes Eder", "email": "heder@google.com", "time": "Fri Jul 23 12:48:52 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jul 23 12:48:52 2010 +0200" }, "message": "IPVS: make FTP work with full NAT support\n\nUse nf_conntrack/nf_nat code to do the packet mangling and the TCP\nsequence adjusting. The function \u0027ip_vs_skb_replace\u0027 is now dead\ncode, so it is removed.\n\nTo SNAT FTP, use something like:\n\n% iptables -t nat -A POSTROUTING -m ipvs --vaddr 192.168.100.30/32 \\\n --vport 21 -j SNAT --to-source 192.168.10.10\nand for the data connections in passive mode:\n\n% iptables -t nat -A POSTROUTING -m ipvs --vaddr 192.168.100.30/32 \\\n --vportctl 21 -j SNAT --to-source 192.168.10.10\nusing \u0027-m state --state RELATED\u0027 would also works.\n\nMake sure the kernel modules ip_vs_ftp, nf_conntrack_ftp, and\nnf_nat_ftp are loaded.\n\n[ up-port and minor fixes by Simon Horman \u003chorms@verge.net.au\u003e ]\nSigned-off-by: Hannes Eder \u003cheder@google.com\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "9c3e1c39679144c250dda95098333ecb5f1f407a", "tree": "3a734fdf60ff07d46a14cbc0a67c134e6cfe0e80", "parents": [ "22cb516696304a9b85892b18c483a27d97cfa51b" ], "author": { "name": "Hannes Eder", "email": "heder@google.com", "time": "Fri Jul 23 12:42:58 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jul 23 12:42:58 2010 +0200" }, "message": "netfilter: xt_ipvs (netfilter matcher for IPVS)\n\nThis implements the kernel-space side of the netfilter matcher xt_ipvs.\n\n[ minor fixes by Simon Horman \u003chorms@verge.net.au\u003e ]\nSigned-off-by: Hannes Eder \u003cheder@google.com\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n[ Patrick: added xt_ipvs.h to Kbuild ]\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "963bfeeeec913d135c15dc400f2f86cb62655d81", "tree": "73a5117b91580637df8c5c7e21ff40656eb93904", "parents": [ "e955cead031177b083fbf18d04a03c06e330a439" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Jul 20 22:03:14 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 22 13:46:21 2010 -0700" }, "message": "net: RTA_MARK addition\n\nAdd a new rt attribute, RTA_MARK, and use it in\nrt_fill_info()/inet_rtm_getroute() to support following commands :\n\nip route get 192.168.20.110 mark NUMBER\nip route get 192.168.20.108 from 192.168.20.110 iif eth1 mark NUMBER\nip route list cache [192.168.20.110] mark NUMBER\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8a35747a5d13b99e076b0222729e0caa48cb69b6", "tree": "387e2840fe46edd9cc36027cf188778f2c5ab1ff", "parents": [ "bded64a7ff82f6af56426a4ff2483888e5ad5fe9" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Wed Jul 21 21:44:31 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 22 13:08:56 2010 -0700" }, "message": "macvtap: Limit packet queue length\n\nMark Wagner reported OOM symptoms when sending UDP traffic over\na macvtap link to a kvm receiver.\n\nThis appears to be caused by the fact that macvtap packet queues\nare unlimited in length. This means that if the receiver can\u0027t\nkeep up with the rate of flow, then we will hit OOM. Of course\nit gets worse if the OOM killer then decides to kill the receiver.\n\nThis patch imposes a cap on the packet queue length, in the same\nway as the tuntap driver, using the device TX queue length.\n\nPlease note that macvtap currently has no way of giving congestion\nnotification, that means the software device TX queue cannot be\nused and packets will always be dropped once the macvtap driver\nqueue fills up.\n\nThis shouldn\u0027t be a great problem for the scenario where macvtap\nis used to feed a kvm receiver, as the traffic is most likely\nexternal in origin so congestion notification can\u0027t be applied\nanyway.\n\nOf course, if anybody decides to complain about guest-to-guest\nUDP packet loss down the track, then we may have to revisit this.\n\nIncidentally, this patch also fixes a real memory leak when\nmacvtap_get_queue fails.\n\nChris Wright noticed that for this patch to work, we need a\nnon-zero TX queue length. This patch includes his work to change\nthe default macvtap TX queue length to 500.\n\nReported-by: Mark Wagner \u003cmwagner@redhat.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nAcked-by: Chris Wright \u003cchrisw@sous-sol.org\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e955cead031177b083fbf18d04a03c06e330a439", "tree": "f0507320407f63913a806eabe7230760e6b661ab", "parents": [ "4cfa580e7eebb8694b875d2caff3b989ada2efac" ], "author": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Wed Jul 29 10:20:10 2009 +0200" }, "committer": { "name": "Marc Kleine-Budde", "email": "mkl@pengutronix.de", "time": "Thu Jul 22 18:06:25 2010 +0200" }, "message": "CAN: Add Flexcan CAN controller driver\n\nThis core is found on some Freescale SoCs and also some Coldfire\nSoCs. Support for Coldfire is missing though at the moment as\nthey have an older revision of the core which does not have RX FIFO\nsupport.\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\nAcked-by: Wolfgang Grandegger \u003cwg@grandegger.com\u003e\nSigned-off-by: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\n" }, { "commit": "3f30fc1570626f11e8f3efe5ebd41fe96e847ed1", "tree": "3a626c1887597942cd21202124b5e293dee226d5", "parents": [ "942875ffc102a6b9992120808e4990eda7a618f6" ], "author": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Wed Jul 21 10:59:58 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 21 14:44:29 2010 -0700" }, "message": "net: remove last uses of __attribute__((packed))\n\nNetwork code uses the __packed macro instead of __attribute__((packed)).\n\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "942875ffc102a6b9992120808e4990eda7a618f6", "tree": "df529424969f797e016fc6b34f22f5993be31673", "parents": [ "2e4e7a97edcd58ce6e5be7cbb65fc4263f65e0bf" ], "author": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Wed Jul 21 10:59:57 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 21 14:44:29 2010 -0700" }, "message": "irda: Use __packed annotation instead IRDA_PACKED macro\n\nRemove IRDA_PACKED macro, which maps to __attribute__((packed)). IRDA is\none of the last users of __attribute__((packet)). Networking code uses\n__packed now.\n\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "66c853cc21bd387a9a2109dcf3b3d53cc9ee9edf", "tree": "7cff1a1c452f0cdd3420523b0f5f966900c2336a", "parents": [ "d1c4a17d58a6dfacb48935aa430aa986559a885f" ], "author": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Mon Jul 19 02:00:13 2010 -0300" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Wed Jul 21 10:39:13 2010 -0700" }, "message": "Bluetooth: Use __packed annotation\n\nTo make net/ and include/net/ code consistent use __packed instead of\n__attribute__ ((packed)). Bluetooth subsystem was one of the last net\nsubsys still using __attribute__ ((packed)).\n\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "5d8868ff3d11e3fc5a5c07477f281a16c71714a3", "tree": "60f6080cb5201bfcc59d32e189b9d10575fb04d3", "parents": [ "9981151086385eecc2febf4ba95a14593f834b3d" ], "author": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Fri Jul 16 16:18:39 2010 -0300" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Wed Jul 21 10:39:12 2010 -0700" }, "message": "Bluetooth: Add Google\u0027s copyright to L2CAP\n\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "9981151086385eecc2febf4ba95a14593f834b3d", "tree": "3cdda7fe4c3d5d3bf05e9ca6fb8f9f1b6ab1c226", "parents": [ "f39a3c06404d01ef2ce47e821bc778dfb1836df9" ], "author": { "name": "Suraj Sumangala", "email": "suraj@atheros.com", "time": "Wed Jul 14 13:02:19 2010 +0530" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Wed Jul 21 10:39:12 2010 -0700" }, "message": "Bluetooth: Implemented HCI frame reassembly for RX from stream\n\nImplemented frame reassembly implementation for reassembling fragments\nreceived from stream.\n\nSigned-off-by: Suraj Sumangala \u003csuraj@atheros.com\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "33e882a5f2301a23a85ef2994e30fd9f48d39d9b", "tree": "4048a954d11698581e123b25389a9f8f72125f90", "parents": [ "cd4c53919ed50b0d532f106aeb76e79077bece98" ], "author": { "name": "Suraj Sumangala", "email": "suraj@atheros.com", "time": "Wed Jul 14 13:02:17 2010 +0530" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Wed Jul 21 10:39:12 2010 -0700" }, "message": "Bluetooth: Implement hci_reassembly helper to reassemble RX packets\n\nImplements feature to reassemble received HCI frames from any input stream\n\nSigned-off-by: Suraj Sumangala \u003csuraj@atheros.com\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "cd4c53919ed50b0d532f106aeb76e79077bece98", "tree": "db669259c941d543a12014fc0d69103a4e368cea", "parents": [ "0a79f67445de50ca0a8dc1d34f3cc406d89c28b2" ], "author": { "name": "Suraj Sumangala", "email": "suraj@atheros.com", "time": "Wed Jul 14 13:02:16 2010 +0530" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Wed Jul 21 10:39:12 2010 -0700" }, "message": "Bluetooth: Add one more buffer for HCI stream reassembly\n\nAdditional reassembly buffer to keep track of stream reasembly\n\nSigned-off-by: Suraj Sumangala \u003csuraj@atheros.com\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "ce5706bd69be6b25715ed6cd48a210b5080032bc", "tree": "c542ca5952c691905f922869426be8d2a79f82fe", "parents": [ "be60b94030339b89c2bcff18c76882f0a4c01ce6" ], "author": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Tue Jul 13 11:57:11 2010 -0300" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Wed Jul 21 10:39:11 2010 -0700" }, "message": "Bluetooth: Add Copyright notice to L2CAP\n\nCopyright for the time I worked on L2CAP during the Google Summer of Code\nprogram.\n\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "e0f66218b3a7d0bcf37ca95186123c257fda0ba5", "tree": "3b7972c417686f3bddbe69af5fdb8c6984c513ee", "parents": [ "8cb8e6f1684be13b51f8429b15f39c140326b327" ], "author": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Mon Jun 21 18:50:49 2010 -0300" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Wed Jul 21 10:39:09 2010 -0700" }, "message": "Bluetooth: Remove the send_lock spinlock from ERTM\n\nUsing a lock to deal with the ERTM race condition - interruption with\nnew data from the hci layer - is wrong. We should use the native skb\nbacklog queue.\n\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "cf6c2c0b9f47ee3cd12684b905725c8376d52135", "tree": "0564fbf6b00891c810d8b91dbdb33c3e97ce1ce4", "parents": [ "2ba13ed678775195e8255b4e503c59d48b615bd8" ], "author": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Mon Jun 07 20:54:45 2010 -0300" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Wed Jul 21 10:39:09 2010 -0700" }, "message": "Bluetooth: Disconnect early if mode is not supported\n\nWhen mode is mandatory we shall not send connect request and report this\nto the userspace as well.\n\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "2d0a03460a8a0c611843500735096ff799aa8510", "tree": "7de71ec848af910d0075a1175381015ded556fe6", "parents": [ "04fafe4ed76f5547856f4c464bec5bf948afb498" ], "author": { "name": "Ron Shaffer", "email": "rshaffer@codeaurora.org", "time": "Fri May 28 11:53:46 2010 -0400" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Wed Jul 21 10:39:06 2010 -0700" }, "message": "Bluetooth: Reassigned copyright to Code Aurora Forum\n\nQualcomm, Inc. has reassigned rights to Code Aurora Forum. Accordingly,\nas files are modified by Code Aurora Forum members, the copyright\nstatement will be updated.\n\nSigned-off-by: Ron Shaffer \u003crshaffer@codeaurora.org\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "04fafe4ed76f5547856f4c464bec5bf948afb498", "tree": "6e16cc046b1686048efb36cb278b33ad7842f4dd", "parents": [ "7452d24cfb91e84f9be61beda5ad68d2a56d0938" ], "author": { "name": "Ron Shaffer", "email": "rshaffer@codeaurora.org", "time": "Fri May 28 11:53:45 2010 -0400" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Wed Jul 21 10:39:05 2010 -0700" }, "message": "Bluetooth: Remove extraneous white space\n\nDeleted extraneous white space from the end of several lines\n\nSigned-off-by: Ron Shaffer \u003crshaffer@codeaurora.org\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "f03585689fdff4ae256edd45a35bc2dd83d3684a", "tree": "be1516aa354aa742f2d5b69a91de0561febaffc4", "parents": [ "95ffa97827371ede501615d9bd048eb5b49e8fe1" ], "author": { "name": "Johan Hedberg", "email": "johan.hedberg@nokia.com", "time": "Tue May 18 13:20:32 2010 +0200" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Wed Jul 21 10:39:05 2010 -0700" }, "message": "Bluetooth: Add blacklist support for incoming connections\n\nIn some circumstances it could be desirable to reject incoming\nconnections on the baseband level. This patch adds this feature through\ntwo new ioctl\u0027s: HCIBLOCKADDR and HCIUNBLOCKADDR. Both take a simple\nBluetooth address as a parameter. BDADDR_ANY can be used with\nHCIUNBLOCKADDR to remove all devices from the blacklist.\n\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@nokia.com\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "11fe883936980fe242869d671092a466cf1db3e3", "tree": "14ff24e81eb4326e94eb5aa6432a1dd55cef5ece", "parents": [ "70d4bf6d467a330ccc947df9b2608e329d9e7708", "573201f36fd9c7c6d5218cdcd9948cee700b277d" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jul 20 18:25:24 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jul 20 18:25:24 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/vhost/net.c\n\tnet/bridge/br_device.c\n\nFix merge conflict in drivers/vhost/net.c with guidance from\nStephen Rothwell.\n\nRevert the effects of net-2.6 commit 573201f36fd9c7c6d5218cdcd9948cee700b277d\nsince net-next-2.6 has fixes that make bridge netpoll work properly thus\nwe don\u0027t need it disabled.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c28991a02caec1f3bfe4638ccf4e494c3e9418a3", "tree": "9cf993d74d59723673963877fc80379684e5e7ad", "parents": [ "3f6ff6bacdec217c98a60910c4804d11ce859820" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jul 20 12:22:40 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jul 20 16:49:37 2010 -0400" }, "message": "wireless: correct sparse warning in wext-compat.c\n\n CHECK net/wireless/wext-compat.c\nnet/wireless/wext-compat.c:1434:5: warning: symbol \u0027cfg80211_wext_siwpmksa\u0027 was not declared. Should it be static?\n\nAdd declaration in cfg80211.h. Also add an EXPORT_SYMBOL_GPL, since all\nthe peer functions have it.\n\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "4f366c5dabcb936dd5754a35188bd699181fe1ce", "tree": "1a35b5e9936554634fb36f3adb1bcbffef4a5375", "parents": [ "53e9b1de6840d9047f768878adcbd1d116f72aca" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Jul 15 14:57:33 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jul 20 16:44:35 2010 -0400" }, "message": "wireless: only use alpha2 regulatory information from country IE\n\nThe meaning and/or usage of the country IE is somewhat poorly defined.\nIn practice, this means that regulatory rulesets in a country IE are\noften incomplete and might be untrustworthy. This removes the code\nassociated with interpreting those rulesets while preserving respect\nfor country \"alpha2\" codes also contained in the country IE.\n\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "4ced3f74dae18715920cb680098ec7ff4345d0a3", "tree": "4a1b35285921fb25e01363af48a8c7db7423098d", "parents": [ "875ae5f68883c75aad826e715df8ec0619551a07" ], "author": { "name": "Johannes Berg", "email": "johannes@sipsolutions.net", "time": "Mon Jul 19 16:39:04 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jul 20 16:02:58 2010 -0400" }, "message": "mac80211: move QoS-enable to BSS info\n\nEver since\n\ncommit e1b3ec1a2a336c328c336cfa5485a5f0484cc90d\nAuthor: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nDate: Mon Mar 29 12:18:34 2010 +0200\n\n mac80211: explicitly disable/enable QoS\n\nmac80211 is telling drivers, in particular\niwlwifi, whether QoS is enabled or not.\n\nHowever, this is only relevant for station mode,\nsince only then will any device send nullfunc\nframes and need to know whether they should be\nQoS frames or not. In other modes, there are\n(currently) no frames the device is supposed to\nsend.\n\nWhen you now consider virtual interfaces, it\nbecomes apparent that the current mechanism is\ninadequate since it enables/disables QoS on a\nglobal scale, where for nullfunc frames it has\nto be on a per-interface scale.\n\nDue to the above considerations, we can change\nthe way mac80211 advertises the QoS state to\ndrivers to only ever advertise it as \"off\" in\nstation mode, and make it a per-BSS setting.\n\nTested-by: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "e7c38157c61649e66f853d7b9f109119b8361448", "tree": "177568b25a74f50fbc876d983a4fae1dae7ea468", "parents": [ "5ae482e01d60bd4e8fc181f78355047e52999ce8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 19 22:01:26 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 19 22:01:26 2010 -0700" }, "message": "ipv6: Make IP6CB(skb)-\u003enhoff 16-bit.\n\nEven with jumbograms I cannot see any way in which we would need\nto records a larger than 65535 valued next-header offset.\n\nThe maximum extension header length is (256 \u003c\u003c 3) \u003d\u003d 2048.\nThere are only a handful of extension headers specified which\nwe\u0027d even accept (say 5 or 6), therefore the largest next-header\noffset we\u0027d ever have to contend with is something less than\nsay 16k.\n\nTherefore make it a u16 instead of a u32.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bd27290a593f80cb99e95287cb29c72c0d57608b", "tree": "c12dfb1cb4cfd7f7d65e34fcf53797685ec66670", "parents": [ "db5dda905759c931ceb8f3f2fcfd7719009acc98" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Jul 19 09:35:40 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 19 09:35:40 2010 -0700" }, "message": "net: 64bit stats for netdev_queue\n\nSince struct netdev_queue tx_bytes/tx_packets/tx_dropped are already\nprotected by _xmit_lock, its easy to convert these fields to u64 instead\nof unsigned long.\nThis completes 64bit stats for devices using them (vlan, macvlan, ...)\n\nStrictly, we could avoid the locking in dev_txq_stats_fold() on 64bit\narches, but its slow path and we prefer keep it simple.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c1f19b51d1d87f3e3bb7e6648f43f7d57ed2da6b", "tree": "d9525359409e3493b48e8676717cc11ed69b640a", "parents": [ "15f0127d1d189fda3294b7823e3e654afca54055" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Sat Jul 17 08:49:36 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 18 19:15:26 2010 -0700" }, "message": "net: support time stamping in phy devices.\n\nThis patch adds a new networking option to allow hardware time stamps\nfrom PHY devices. When enabled, likely candidates among incoming and\noutgoing network packets are offered to the PHY driver for possible\ntime stamping. When accepted by the PHY driver, incoming packets are\ndeferred for later delivery by the driver.\n\nThe patch also adds phylib driver methods for the SIOCSHWTSTAMP ioctl\nand callbacks for transmit and receive time stamping. Drivers may\noptionally implement these functions.\n\nSigned-off-by: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "15f0127d1d189fda3294b7823e3e654afca54055", "tree": "adc92669c93feabf1fe2264797700de36980467f", "parents": [ "28b041139e344ecd0f144d6205b004ae354cfa1e" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Sat Jul 17 08:49:17 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 18 19:15:26 2010 -0700" }, "message": "net: added a BPF to help drivers detect PTP packets.\n\nCertain kinds of hardware time stamping units in both MACs and PHYs have\nthe limitation that they can only time stamp PTP packets. Drivers for such\nhardware are left with the task of correctly matching skbs to time stamps.\nThis patch adds a BPF that drivers can use to classify PTP packets when\nneeded.\n\nSigned-off-by: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "28b041139e344ecd0f144d6205b004ae354cfa1e", "tree": "7fc0e05d01717da0410a7b3252b0cac3fc8db81d", "parents": [ "4507a71507d4ff37e9a499c4241b7701ed1feab4" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Sat Jul 17 08:48:55 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 18 19:15:25 2010 -0700" }, "message": "net: preserve ifreq parameter when calling generic phy_mii_ioctl().\n\nThe phy_mii_ioctl() function unnecessarily throws away the original ifreq.\nWe need access to the ifreq in order to support PHYs that can perform\nhardware time stamping.\n\nTwo maverick drivers filter the ioctl commands passed to phy_mii_ioctl().\nThis is unnecessary since phylib will check the command in any case.\n\nSigned-off-by: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4507a71507d4ff37e9a499c4241b7701ed1feab4", "tree": "775ff8a11852f37ebc78363cf41729221cd92718", "parents": [ "ad1afb00393915a51c21b1ae8704562bf036855f" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Sat Jul 17 08:48:28 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 18 19:15:25 2010 -0700" }, "message": "net: add driver hook for tx time stamping.\n\nThis patch adds a hook for transmit time stamps. The transmit hook\nallows a software fallback for transmit time stamps, for MACs\nlacking time stamping hardware. Using the hook will still require\nadding an inline function call to each MAC driver.\n\nSigned-off-by: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "22cb516696304a9b85892b18c483a27d97cfa51b", "tree": "aed4918de3f3efbaef2262c991ccd3a9d2a0402e", "parents": [ "edf0e1fb0d0910880881523cfaaabcec06a2c0d5" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Fri Jul 16 14:08:20 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jul 16 14:08:20 2010 +0200" }, "message": "netfilter: correct CHECKSUM header and export it\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "f86586fa48a94c7a9c7f36650a2e0e4a947881c9", "tree": "d977100a3c72dcaeaeb90c0b776b36c2e8a57b90", "parents": [ "6ce28c6f55fe636c322ea909794cf19b20ef4b6b" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Jul 15 21:41:00 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 15 21:41:00 2010 -0700" }, "message": "tcp: sizeof struct tcp_skb_cb is 44\n\nCorrect comment stating sizeof(struct tcp_skb_cb) is 36 or 40, since its\n44 bytes, since commit 951dbc8ac714b04 ([IPV6]: Move nextheader offset\nto the IP6CB).\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "edf0e1fb0d0910880881523cfaaabcec06a2c0d5", "tree": "9b113e0d86d8119a35b2af076a789b92fa341913", "parents": [ "fac42a9a922fe5eb87cac0b597010afb81e7ffe9" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Thu Jul 15 17:20:46 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Jul 15 17:20:46 2010 +0200" }, "message": "netfilter: add CHECKSUM target\n\nThis adds a `CHECKSUM\u0027 target, which can be used in the iptables mangle\ntable.\n\nYou can use this target to compute and fill in the checksum in\na packet that lacks a checksum. This is particularly useful,\nif you need to work around old applications such as dhcp clients,\nthat do not work well with checksum offloads, but don\u0027t want to\ndisable checksum offload in your device.\n\nThe problem happens in the field with virtualized applications.\nFor reference, see Red Hat bz 605555, as well as\nhttp://www.spinics.net/lists/kvm/msg37660.html\n\nTypical expected use (helps old dhclient binary running in a VM):\niptables -A POSTROUTING -t mangle -p udp --dport bootpc \\\n\t-j CHECKSUM --checksum-fill\n\nIncludes fixes by Jan Engelhardt \u003cjengelh@medozas.de\u003e\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "cca5cf91c789f3301cc2541a79c323c53be5a8e1", "tree": "dde344cf091b4ee2c5fd8ab238af5a0b18cb5918", "parents": [ "116e1f1b09dffe0ff8ebab73501324dca7bbbe5e" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Thu Jul 15 11:27:41 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Jul 15 11:27:41 2010 +0200" }, "message": "nfnetlink_log: do not expose NFULNL_COPY_DISABLED to user-space\n\nThis patch moves NFULNL_COPY_PACKET definition from\nlinux/netfilter/nfnetlink_log.h to net/netfilter/nfnetlink_log.h\nsince this copy mode is only for internal use.\n\nI have also changed the value from 0x03 to 0xff. Thus, we avoid\na gap from user-space that may confuse users if we add new\ncopy modes in the future.\n\nThis change was introduced in:\nhttp://www.spinics.net/lists/netfilter-devel/msg13535.html\n\nSince this change is not included in any stable Linux kernel,\nI think it\u0027s safe to make this change now. Anyway, this copy\nmode does not make any sense from user-space, so this patch\nshould not break any existing setup.\n\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "b0f77d0eae0c58a5a9691a067ada112ceeae2d00", "tree": "2bab159a95f51e32dbb4eb2d554328de3190c678", "parents": [ "91a72a70594e5212c97705ca6a694bd307f7a26b" ], "author": { "name": "Tom Herbert", "email": "therbert@google.com", "time": "Wed Jul 14 20:50:29 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 14 20:50:29 2010 -0700" }, "message": "net: fix problem in reading sock TX queue\n\nFix problem in reading the tx_queue recorded in a socket. In\ndev_pick_tx, the TX queue is read by doing a check with\nsk_tx_queue_recorded on the socket, followed by a sk_tx_queue_get.\nThe problem is that there is not mutual exclusion across these\ncalls in the socket so it it is possible that the queue in the\nsock can be invalidated after sk_tx_queue_recorded is called so\nthat sk_tx_queue get returns -1, which sets 65535 in queue_index\nand thus dev_pick_tx returns 65536 which is a bogus queue and\ncan cause crash in dev_queue_xmit.\n\nWe fix this by only calling sk_tx_queue_get which does the proper\nchecks. The interface is that sk_tx_queue_get returns the TX queue\nif the sock argument is non-NULL and TX queue is recorded, else it\nreturns -1. sk_tx_queue_recorded is no longer used so it can be\ncompletely removed.\n\nSigned-off-by: Tom Herbert \u003ctherbert@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7ba42910073f8432934d61a6c08b1023c408fb62", "tree": "4f74648133eaf6cbea26d59c43d34e7153648f5d", "parents": [ "53d3176b282cc105493babb0fef36c8b873f6201" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Sat Jul 10 20:41:55 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 12 20:21:46 2010 -0700" }, "message": "inet, inet6: make tcp_sendmsg() and tcp_sendpage() through inet_sendmsg() and inet_sendpage()\n\na new boolean flag no_autobind is added to structure proto to avoid the autobind\ncalls when the protocol is TCP. Then sock_rps_record_flow() is called int the\nTCP\u0027s sendmsg() and sendpage() pathes.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\n----\n include/net/inet_common.h | 4 ++++\n include/net/sock.h | 1 +\n include/net/tcp.h | 8 ++++----\n net/ipv4/af_inet.c | 15 +++++++++------\n net/ipv4/tcp.c | 11 +++++------\n net/ipv4/tcp_ipv4.c | 3 +++\n net/ipv6/af_inet6.c | 8 ++++----\n net/ipv6/tcp_ipv6.c | 3 +++\n 8 files changed, 33 insertions(+), 20 deletions(-)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "53d3176b282cc105493babb0fef36c8b873f6201", "tree": "2571bb37b0e292b7b2fbbd6b056661584260c9bf", "parents": [ "dbe000ed3f3033e8e6321d79023c827faf649c4d" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Sat Jul 10 20:41:06 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 12 20:21:45 2010 -0700" }, "message": "net: cleanups\n\nremove useless blanks.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\n----\n include/net/inet_common.h | 55 ++++-------\n include/net/tcp.h | 222 +++++++++++++++++-----------------------------\n include/net/udp.h | 38 +++----\n 3 files changed, 123 insertions(+), 192 deletions(-)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d77535162e736c47978d5c01469c56e1781dc91b", "tree": "7210d55197b283c72bb8c74a0aeb8cd386b21a74", "parents": [ "3cfde79c6c7c8002375c4a8e5be7f602fbb9675d" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Fri Jul 09 09:12:41 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 09 17:41:57 2010 -0700" }, "message": "net: Document that dev_get_stats() returns the given pointer\n\nDocument that dev_get_stats() returns the same stats pointer it was\ngiven. Remove const qualification from the returned pointer since the\ncaller may do what it likes with that structure.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3cfde79c6c7c8002375c4a8e5be7f602fbb9675d", "tree": "53fe969e9f8bb45531c1e84c82e822ff47ea015c", "parents": [ "cc7b86c1a8f207c8aa77aad6941475d8294a83c4" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Fri Jul 09 09:11:52 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 09 17:41:56 2010 -0700" }, "message": "net: Get rid of rtnl_link_stats64 / net_device_stats union\n\nIn commit be1f3c2c027cc5ad735df6a45a542ed1db7ec48b \"net: Enable 64-bit\nnet device statistics on 32-bit architectures\" I redefined struct\nnet_device_stats so that it could be used in a union with struct\nrtnl_link_stats64, avoiding the need for explicit copying or\nconversion between the two. However, this is unsafe because there is\nno locking required and no lock consistently held around calls to\ndev_get_stats() and use of the statistics structure it returns.\n\nIn commit 28172739f0a276eb8d6ca917b3974c2edb036da3 \"net: fix 64 bit\ncounters on 32 bit arches\" Eric Dumazet dealt with that problem by\nrequiring callers of dev_get_stats() to provide storage for the\nresult. This means that the net_device::stats64 field and the padding\nin struct net_device_stats are now redundant, so remove them.\n\nUpdate the comment on net_device_ops::ndo_get_stats64 to reflect its\nnew usage.\n\nChange dev_txq_stats_fold() to use struct rtnl_link_stats64, since\nthat is what all its callers are really using and it is no longer\ngoing to be compatible with struct net_device_stats.\n\nEric Dumazet suggested the separate function for the structure\nconversion.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7313bb8f3dd6e28bcf9c42adfd54a5cf9a4949e0", "tree": "65d8486a2ff4aabc23e0b021f068dd3788081923", "parents": [ "68dc9d36c19aa1fd1633427b419d5e1f44753e8a" ], "author": { "name": "Karl Hiramoto", "email": "karl@hiramoto.org", "time": "Thu Jul 08 20:55:30 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 09 00:09:20 2010 -0700" }, "message": "atm: propagate signal changes via notifier\n\nAdd notifier chain for changes in atm_dev.\n\nClients like br2684 will call register_atmdevice_notifier() to be notified of\nchanges. Drivers will call atm_dev_signal_change() to notify clients like\nbr2684 of the change.\n\nOn DSL and ATM devices it\u0027s usefull to have a know if you have a carrier\nsignal. netdevice LOWER_UP changes can be propagated to userspace via netlink\nmonitor.\n\nSigned-off-by: Karl Hiramoto \u003ckarl@hiramoto.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "597e608a8492d662736c9bc6aa507dbf1cadc17d", "tree": "6c330cdd0a4809f67dd191b37e34f5b4318cef78", "parents": [ "acbc0f039ff4b93da737c91937b7c70018ded39f", "33b665eeeb85956ccbdf31c4c31a4e2a31133c44" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 07 15:59:38 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 07 15:59:38 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "28172739f0a276eb8d6ca917b3974c2edb036da3", "tree": "b1dc00cfa20c209992e247c6f73601f609f9ca3b", "parents": [ "217d32dc5f299c483ca0d3c8cc6811c72c0339c4" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jul 07 14:58:56 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 07 14:58:56 2010 -0700" }, "message": "net: fix 64 bit counters on 32 bit arches\n\nThere is a small possibility that a reader gets incorrect values on 32\nbit arches. SNMP applications could catch incorrect counters when a\n32bit high part is changed by another stats consumer/provider.\n\nOne way to solve this is to add a rtnl_link_stats64 param to all\nndo_get_stats64() methods, and also add such a parameter to\ndev_get_stats().\n\nRule is that we are not allowed to use dev-\u003estats64 as a temporary\nstorage for 64bit stats, but a caller provided area (usually on stack)\n\nOld drivers (only providing get_stats() method) need no changes.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bcfcc450baaaa44afc1d3c51ef96a53338ff0eb2", "tree": "123a988524aec67145c9b6becfdd6d5993525e87", "parents": [ "3390712a474abdcd3de10024dd1062e5928d381c" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Fri Jul 02 07:08:44 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 05 20:08:05 2010 -0700" }, "message": "net: Fix definition of netif_vdbg() when VERBOSE_DEBUG is defined\n\nnetif_vdbg() was originally defined as entirely equivalent to\nnetdev_vdbg(), but I assume that it was intended to take the same\nparameters as netif_dbg() etc. (Currently it is only used by the\nsfc driver, in which I worked on that assumption.)\n\nIn commit a4ed89c I changed the definition used when VERBOSE_DEBUG is\nnot defined, but I failed to notice that the definition used when\nVERBOSE_DEBUG is defined was also not as I expected. Change that to\nmatch netif_dbg() as well.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f45f4321d2c977c9eff77e5a5225f3cd2140eb20", "tree": "20cae33624bd063d5b0298f66353ef509ee60d52", "parents": [ "256df2f3879efdb2e9808bdb1b54b16fbb11fa38" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sun Jun 27 01:02:36 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 04 10:40:19 2010 -0700" }, "message": "netdevice.h: Change netif_\u003clevel\u003e macros to call netdev_\u003clevel\u003e functions\n\nReduces text ~300 bytes of text (woohoo!) in an x86 defconfig\n\n$ size vmlinux*\n text\t data\t bss\t dec\t hex\tfilename\n7198526\t 720112\t1366288\t9284926\t 8dad3e\tvmlinux\n7198862\t 720112\t1366288\t9285262\t 8dae8e\tvmlinux.netdev\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "256df2f3879efdb2e9808bdb1b54b16fbb11fa38", "tree": "ec7bd8e1e6d7d7066542420641ccd68e98e42bfa", "parents": [ "99bcf217183e02ebae46373896fba7f12d588001" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sun Jun 27 01:02:35 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 04 10:40:18 2010 -0700" }, "message": "netdevice.h net/core/dev.c: Convert netdev_\u003clevel\u003e logging macros to functions\n\nReduces an x86 defconfig text and data ~2k.\ntext is smaller, data is larger.\n\n$ size vmlinux*\n text\t data\t bss\t dec\t hex\tfilename\n7198862\t 720112\t1366288\t9285262\t 8dae8e\tvmlinux\n7205273\t 716016\t1366288\t9287577\t 8db799\tvmlinux.device_h\n\nUses %pV and struct va_format\nFormat arguments are verified before printk\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "99bcf217183e02ebae46373896fba7f12d588001", "tree": "03210a8c57e33b2b5073f80f9a7f818c84f4c83a", "parents": [ "7db6f5fb65a82af03229eef104dc9899c5eecf33" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sun Jun 27 01:02:34 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 04 10:40:17 2010 -0700" }, "message": "device.h drivers/base/core.c Convert dev_\u003clevel\u003e logging macros to functions\n\nReduces an x86 defconfig text and data ~55k, .6% smaller.\n\n$ size vmlinux*\n text\t data\t bss\t dec\t hex\tfilename\n7205273\t 716016\t1366288\t9287577\t 8db799\tvmlinux\n7258890\t 719768\t1366288\t9344946\t 8e97b2\tvmlinux.master\n\nUses %pV and struct va_format\nFormat arguments are verified before printk\n\nThe dev_info macro is converted to _dev_info because there are\nexisting uses of variables named dev_info in the kernel tree\nlike drivers/net/pcmcia/pcnet_cs.c\n\nA dev_info macro is created to call _dev_info\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7db6f5fb65a82af03229eef104dc9899c5eecf33", "tree": "fb7a83297d8bf2680df9616ebf58bec89229ff3b", "parents": [ "e490c1defec4236a6a131fe2d13bf7ba787c02f8" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sun Jun 27 01:02:33 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 04 10:40:17 2010 -0700" }, "message": "vsprintf: Recursive vsnprintf: Add \"%pV\", struct va_format\n\nAdd the ability to print a format and va_list from a structure pointer\n\nAllows __dev_printk to be implemented as a single printk while\nminimizing string space duplication.\n\n%pV should not be used without some mechanism to verify the\nformat and argument use ala __attribute__(format (printf(...))).\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e490c1defec4236a6a131fe2d13bf7ba787c02f8", "tree": "132325ca88cc86a74345a93b2774c5ca284b038a", "parents": [ "0a17d8c744e44617a3c22e7af68b4c5c9c1c5dba", "4df53d8bab65cf2c18daebd51a5a4847e03f1943" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 22:42:06 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 22:42:06 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6\n" }, { "commit": "e2aec372ff4b7e78e79c308104a860ae0ed20950", "tree": "0a399810f9a506121bc7effb0a9127792527ea36", "parents": [ "f0796d5c73e59786d09a1e617689d1d415f2db44" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Thu Jul 01 13:18:58 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 21:59:08 2010 -0700" }, "message": "linux/net.h: fix kernel-doc warnings\n\nFix kernel-doc warnings in linux/net.h:\n\nWarning(include/linux/net.h:151): No description found for parameter \u0027wq\u0027\nWarning(include/linux/net.h:151): Excess struct/union/enum/typedef member \u0027fasync_list\u0027 description in \u0027socket\u0027\nWarning(include/linux/net.h:151): Excess struct/union/enum/typedef member \u0027wait\u0027 description in \u0027socket\u0027\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f0796d5c73e59786d09a1e617689d1d415f2db44", "tree": "ecb17c65c5b6a162824a1e11fee24364852837f8", "parents": [ "4ef6acff83222f4496ceef7d1f0ee9e50a5bb403" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Thu Jul 01 13:21:57 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 21:59:07 2010 -0700" }, "message": "net: decreasing real_num_tx_queues needs to flush qdisc\n\nReducing real_num_queues needs to flush the qdisc otherwise\nskbs with queue_mappings greater then real_num_tx_queues can\nbe sent to the underlying driver.\n\nThe flow for this is,\n\ndev_queue_xmit()\n\tdev_pick_tx()\n\t\tskb_tx_hash() \u003d\u003e hash using real_num_tx_queues\n\t\tskb_set_queue_mapping()\n\t...\n\tqdisc_enqueue_root() \u003d\u003e enqueue skb on txq from hash\n...\ndev-\u003ereal_num_tx_queues -\u003d n\n...\nsch_direct_xmit()\n\tdev_hard_start_xmit()\n\t\tndo_start_xmit(skb,dev) \u003d\u003e skb queue set with old hash\n\nskbs are enqueued on the qdisc with skb-\u003equeue_mapping set\n0 \u003c queue_mappings \u003c real_num_tx_queues. When the driver\ndecreases real_num_tx_queues skb\u0027s may be dequeued from the\nqdisc with a queue_mapping greater then real_num_tx_queues.\n\nThis fixes a case in ixgbe where this was occurring with DCB\nand FCoE. Because the driver is using queue_mapping to map\nskbs to tx descriptor rings we can potentially map skbs to\nrings that no longer exist.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4ef6acff83222f4496ceef7d1f0ee9e50a5bb403", "tree": "0982d46258047f208c26068252457179f5f13bdf", "parents": [ "7ae80abdba0644e12ac17da567a2db1efc1bf8a8" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Thu Jul 01 13:21:35 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 21:59:07 2010 -0700" }, "message": "sched: qdisc_reset_all_tx is calling qdisc_reset without qdisc_lock\n\nWhen calling qdisc_reset() the qdisc lock needs to be held. In\nthis case there is at least one driver i4l which is using this\nwithout holding the lock. Add the locking here.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "05318bc905467237d4aa68a701f6e92a2b332218", "tree": "3b7577383bca50aeb442568aa16cf8f2167b8694", "parents": [ "ea812ca1b06113597adcd8e70c0f84a413d97544", "88c1f4f6dffe66e2fed8e7e3276e091ee850bed0" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 01 17:34:14 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 01 17:34:14 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6\n\nConflicts:\n\tdrivers/net/wireless/libertas/host.h\n" }, { "commit": "a5b6ee291e39e285e021cf251dbcf770c83cd74e", "tree": "4fa96af8095cda9949fff3e79e2c5e8ef7328dbd", "parents": [ "cbf2d604a1cd77944a795bb8dbe844eaa38b44c8" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Wed Jun 30 05:05:23 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 30 14:09:37 2010 -0700" }, "message": "ethtool: Add support for control of RX flow hash indirection\n\nMany NICs use an indirection table to map an RX flow hash value to one\nof an arbitrary number of queues (not necessarily a power of 2). It\ncan be useful to remove some queues from this indirection table so\nthat they are only used for flows that are specifically filtered\nthere. It may also be useful to weight the mapping to account for\nuser processes with the same CPU-affinity as the RX interrupts.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1437ce3983bcbc0447a0dedcd644c14fe833d266", "tree": "073ba0dc60127b08b65fbcca4d0d7c15318c08f8", "parents": [ "b3003be36a3c9215cd17182349981581de269048" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Wed Jun 30 02:44:32 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 30 14:09:35 2010 -0700" }, "message": "ethtool: Change ethtool_op_set_flags to validate flags\n\nethtool_op_set_flags() does not check for unsupported flags, and has\nno way of doing so. This means it is not suitable for use as a\ndefault implementation of ethtool_ops::set_flags.\n\nAdd a \u0027supported\u0027 parameter specifying the flags that the driver and\nhardware support, validate the requested flags against this, and\nchange all current callers to pass this parameter.\n\nChange some other trivial implementations of ethtool_ops::set_flags to\ncall ethtool_op_set_flags().\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nReviewed-by: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nAcked-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d6bebca92c663fb216c072193945946f3807ca7f", "tree": "fd797f062fa19d2ee470cf33c9b475bff08e2545", "parents": [ "4ce3c183fcade7f4b30a33dae90cd774c3d9e094" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Tue Jun 29 04:39:37 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 30 13:44:29 2010 -0700" }, "message": "fragment: add fast path for in-order fragments\n\nadd fast path for in-order fragments\n\nAs the fragments are sent in order in most of OSes, such as Windows, Darwin and\nFreeBSD, it is likely the new fragments are at the end of the inet_frag_queue.\nIn the fast path, we check if the skb at the end of the inet_frag_queue is the\nprev we expect.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\n----\n include/net/inet_frag.h | 1 +\n net/ipv4/ip_fragment.c | 12 ++++++++++++\n net/ipv6/reassembly.c | 11 +++++++++++\n 3 files changed, 24 insertions(+)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4ce3c183fcade7f4b30a33dae90cd774c3d9e094", "tree": "84d5a130da50096fdbeb7fffea596dffe2cebd80", "parents": [ "f3eb62d2cc7da7bea4b394dd06f6bc738aa284e7" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jun 30 13:31:19 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 30 13:31:19 2010 -0700" }, "message": "snmp: 64bit ipstats_mib for all arches\n\n/proc/net/snmp and /proc/net/netstat expose SNMP counters.\n\nWidth of these counters is either 32 or 64 bits, depending on the size\nof \"unsigned long\" in kernel.\n\nThis means user program parsing these files must already be prepared to\ndeal with 64bit values, regardless of user program being 32 or 64 bit.\n\nThis patch introduces 64bit snmp values for IPSTAT mib, where some\ncounters can wrap pretty fast if they are 32bit wide.\n\n# netstat -s|egrep \"InOctets|OutOctets\"\n InOctets: 244068329096\n OutOctets: 244069348848\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9b2c2ff7a1c04e69842254dd4afe0f8ad4efa439", "tree": "705bd91dafd562a38d3833edb30297abf0516459", "parents": [ "08e554b17bfdc2682599c8c2770b088a0187a405" ], "author": { "name": "Saeed Bishara", "email": "saeed@marvell.com", "time": "Sun Jun 27 00:26:43 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 30 13:01:11 2010 -0700" }, "message": "mv643xx_eth: use sw csum for big packets\n\nSome controllers (KW, Dove) limits the TX IP/layer4 checksum offloading to a max size.\n\nSigned-off-by: Saeed Bishara \u003csaeed@marvell.com\u003e\nAcked-by: Lennert Buytenhek \u003cbuytenh@wantstofly.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "787a34456dc34bdd75b29cebb53cb09c727674d6", "tree": "370e65e5ea2536072c4067d600cdb6c4f3b7106a", "parents": [ "511d934f4496076898e45aaa09e0c85376eb16ee" ], "author": { "name": "Kulikov Vasiliy", "email": "segooon@gmail.com", "time": "Wed Jun 30 06:08:15 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 30 12:06:52 2010 -0700" }, "message": "net/neighbour.h: fix typo\n\n\u0027Shoul\u0027 must be \u0027should\u0027.\n\nSigned-off-by: Kulikov Vasiliy \u003csegooon@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "afd2a5ca1ef6ffe1f9fd0846ae39795527ead555", "tree": "9a9cecf9faa5b39a9ec575a6dc34df371cf698e9", "parents": [ "9cf4cb05c9634eda4b51db1f55fecdec4a145a57" ], "author": { "name": "Gertjan van Wingerde", "email": "gwingerde@gmail.com", "time": "Tue Jun 29 21:43:44 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jun 30 15:00:50 2010 -0400" }, "message": "eeprom_93cx6: Add support for 93c86 EEPROMs.\n\nSigned-off-by: Gertjan van Wingerde \u003cgwingerde@gmail.com\u003e\nSigned-off-by: Ivo van Doorn \u003cIvDoorn@gmail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "4efd7e833591721bec21cc4730a7f6261417840f", "tree": "9982ea86ad73f1142842070f4d9d1bf83ba318a0", "parents": [ "d3ead2413cb99d3e6265577b12537434e229d8c2" ], "author": { "name": "Andreas Steffen", "email": "andreas.steffen@strongswan.org", "time": "Wed Jun 30 10:41:15 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 30 10:43:31 2010 -0700" }, "message": "xfrm: fix XFRMA_MARK extraction in xfrm_mark_get\n\nDetermine the size of the xfrm_mark struct, not of its pointer.\n\nSigned-off-by: Andreas Steffen \u003candreas.steffen@strongswan.org\u003e\nAcked-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bf988435bd5b53529f4408a8efb1f433f6ddfda9", "tree": "7805f577d019f587146b4fd1cf642faacfec2f14", "parents": [ "db048b69037e7fa6a7d9e95a1271a50dc08ae233" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Mon Jun 28 08:45:58 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 29 01:00:29 2010 -0700" }, "message": "ethtool: Fix potential user buffer overflow for ETHTOOL_{G, S}RXFH\n\nstruct ethtool_rxnfc was originally defined in 2.6.27 for the\nETHTOOL_{G,S}RXFH command with only the cmd, flow_type and data\nfields. It was then extended in 2.6.30 to support various additional\ncommands. These commands should have been defined to use a new\nstructure, but it is too late to change that now.\n\nSince user-space may still be using the old structure definition\nfor the ETHTOOL_{G,S}RXFH commands, and since they do not need the\nadditional fields, only copy the originally defined fields to and\nfrom user-space.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nCc: stable@kernel.org\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "529d6dad5bc69de14cdd24831e2a14264e93daa4", "tree": "a89d7b8cdd3692e96a64c5d7196bcefc9f1e7f24", "parents": [ "01eebb53a65996dfbfb892bf5eb21ae831fbe3a6" ], "author": { "name": "Sjur Braendeland", "email": "sjur.brandeland@stericsson.com", "time": "Tue Jun 29 00:08:21 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 29 00:08:21 2010 -0700" }, "message": "caif-driver: Add CAIF-SPI Protocol driver.\n\nThis patch introduces the CAIF SPI Protocol Driver for\nCAIF Link Layer.\n\nThis driver implements a platform driver to accommodate for a\nplatform specific SPI device. A general platform driver is not\npossible as there are no SPI Slave side Kernel API defined.\nA sample CAIF SPI Platform device can be found in\n.../Documentation/networking/caif/spi_porting.txt\n\nSigned-off-by: Sjur Braendeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "210d6de78c5d7c785fc532556cea340e517955e1", "tree": "e4bbac89a8bc16154f51ad61e140be1b7bd2b92d", "parents": [ "c4ead4c595cd54cf7b1a184d4f888ce0d7cce7d4" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Thu Jun 24 16:25:12 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 28 23:24:32 2010 -0700" }, "message": "act_mirred: don\u0027t clone skb when skb isn\u0027t shared\n\ndon\u0027t clone skb when skb isn\u0027t shared\n\nWhen the tcf_action is TC_ACT_STOLEN, and the skb isn\u0027t shared, we don\u0027t need\nto clone a new skb. As the skb will be freed after this function returns, we\ncan use it freely once we get a reference to it.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\n----\n include/net/sch_generic.h | 11 +++++++++--\n net/sched/act_mirred.c | 6 +++---\n 2 files changed, 12 insertions(+), 5 deletions(-)\nSigned-off-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bc66154efe163a80f269d448572f7906756e9338", "tree": "89c9996c9790a84958a756eed77b9780a785ff19", "parents": [ "33d91f00c73ba0012bce18c1690cb8313ca7adaa" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Jun 24 00:54:21 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 28 23:24:30 2010 -0700" }, "message": "macvlan: 64 bit rx counters\n\nUse u64_stats_sync infrastructure to implement 64bit stats.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "33d91f00c73ba0012bce18c1690cb8313ca7adaa", "tree": "71a927098b248685af4dede30d443ef73c344d16", "parents": [ "7a9b2d59507d85569b8a456688ef40cf2ac73e48" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Jun 24 00:54:06 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 28 23:24:30 2010 -0700" }, "message": "net: u64_stats_fetch_begin_bh() and u64_stats_fetch_retry_bh()\n\n- Must disable preemption in case of 32bit UP in u64_stats_fetch_begin()\nand u64_stats_fetch_retry()\n\n- Add new u64_stats_fetch_begin_bh() and u64_stats_fetch_retry_bh() for\nnetwork usage, disabling BH on 32bit UP only.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b6b3ecc71a0664d44ed8d087d583aee98fbf492a", "tree": "078e92d78578d3a8833dd225f71a6b2a982ea5be", "parents": [ "a095cfc40ec7ebe63e9532383c5b5c2a27b14075" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Jun 24 00:04:38 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 28 23:24:29 2010 -0700" }, "message": "net: u64_stats_sync improvements\n\n- Add a comment about interrupts:\n\n6) If counter might be written by an interrupt, readers should block\ninterrupts.\n\n- Fix a typo in sample of use.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7eb9282cd0efac08b8377cbd5037ba297c77e3f7", "tree": "7dcb6e149c96e27da69a75ff828de9681c6636f8", "parents": [ "cf377eb4aeded926375d4d0fe0b66ba95f0521e1" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon Jun 28 14:16:08 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon Jun 28 14:16:08 2010 +0200" }, "message": "netfilter: ipt_LOG/ip6t_LOG: add option to print decoded MAC header\n\nThe LOG targets print the entire MAC header as one long string, which is not\nreadable very well:\n\nIN\u003deth0 OUT\u003d MAC\u003d00:15:f2:24:91:f8:00:1b:24:dc:61:e6:08:00 ...\n\nAdd an option to decode known header formats (currently just ARPHRD_ETHER devices)\nin their individual fields:\n\nIN\u003deth0 OUT\u003d MACSRC\u003d00:1b:24:dc:61:e6 MACDST\u003d00:15:f2:24:91:f8 MACPROTO\u003d0800 ...\nIN\u003deth0 OUT\u003d MACSRC\u003d00:1b:24:dc:61:e6 MACDST\u003d00:15:f2:24:91:f8 MACPROTO\u003d86dd ...\n\nThe option needs to be explicitly enabled by userspace to avoid breaking\nexisting parsers.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "172d69e63c7f1e8300d0e1c1bbd8eb0f630faa15", "tree": "c71118ddc86186e235a920b9529c457db5e9aae5", "parents": [ "734f614bc1e7c6bf075d201f6bd9a555b8b4a984" ], "author": { "name": "Florian Westphal", "email": "fw@strlen.de", "time": "Mon Jun 21 11:48:45 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 26 22:00:03 2010 -0700" }, "message": "syncookies: add support for ECN\n\nAllows use of ECN when syncookies are in effect by encoding ecn_ok\ninto the syn-ack tcp timestamp.\n\nWhile at it, remove a uneeded #ifdef CONFIG_SYN_COOKIES.\nWith CONFIG_SYN_COOKIES\u003dnm want_cookie is ifdef\u0027d to 0 and gcc\nremoves the \"if (0)\".\n\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1823e4c80eeae2a774c75569ce3035070e5ee009", "tree": "bdc1bdf4a67027193312ad584924ca8a986a064c", "parents": [ "5eaa0bd81f93225b6d1972b373ed00ca763052b2" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Jun 22 20:58:41 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 25 21:33:17 2010 -0700" }, "message": "snmp: add align parameter to snmp_mib_init()\n\nIn preparation for 64bit snmp counters for some mibs,\nadd an \u0027align\u0027 parameter to snmp_mib_init(), instead\nof assuming mibs only contain \u0027unsigned long\u0027 fields.\n\nCallers can use __alignof__(type) to provide correct\nalignment.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nCC: Arnaldo Carvalho de Melo \u003cacme@ghostprotocols.net\u003e\nCC: Hideaki YOSHIFUJI \u003cyoshfuji@linux-ipv6.org\u003e\nCC: Vlad Yasevich \u003cvladislav.yasevich@hp.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "01f2f3f6ef4d076c0c10a8a7b42624416d56b523", "tree": "188ee181f2fe21e42f402c4a955cb6ea2e70f118", "parents": [ "bd97a63f7d9892b4536f331d263c2695cc52d08c" ], "author": { "name": "Hagen Paul Pfeifer", "email": "hagen@jauu.net", "time": "Sat Jun 19 17:05:36 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 25 21:33:12 2010 -0700" }, "message": "net: optimize Berkeley Packet Filter (BPF) processing\n\nGcc is currenlty not in the ability to optimize the switch statement in\nsk_run_filter() because of dense case labels. This patch replace the\nOR\u0027d labels with ordered sequenced case labels. The sk_chk_filter()\nfunction is modified to patch/replace the original OPCODES in a\nordered but equivalent form. gcc is now in the ability to transform the\nswitch statement in sk_run_filter into a jump table of complexity O(1).\n\nUntil this patch gcc generates a sequence of conditional branches (O(n) of 567\nbyte .text segment size (arch x86_64):\n\n7ff: 8b 06 mov (%rsi),%eax\n801: 66 83 f8 35 cmp $0x35,%ax\n805: 0f 84 d0 02 00 00 je adb \u003csk_run_filter+0x31d\u003e\n80b: 0f 87 07 01 00 00 ja 918 \u003csk_run_filter+0x15a\u003e\n811: 66 83 f8 15 cmp $0x15,%ax\n815: 0f 84 c5 02 00 00 je ae0 \u003csk_run_filter+0x322\u003e\n81b: 77 73 ja 890 \u003csk_run_filter+0xd2\u003e\n81d: 66 83 f8 04 cmp $0x4,%ax\n821: 0f 84 17 02 00 00 je a3e \u003csk_run_filter+0x280\u003e\n827: 77 29 ja 852 \u003csk_run_filter+0x94\u003e\n829: 66 83 f8 01 cmp $0x1,%ax\n[...]\n\nWith the modification the compiler translate the switch statement into\nthe following jump table fragment:\n\n7ff: 66 83 3e 2c cmpw $0x2c,(%rsi)\n803: 0f 87 1f 02 00 00 ja a28 \u003csk_run_filter+0x26a\u003e\n809: 0f b7 06 movzwl (%rsi),%eax\n80c: ff 24 c5 00 00 00 00 jmpq *0x0(,%rax,8)\n813: 44 89 e3 mov %r12d,%ebx\n816: e9 43 03 00 00 jmpq b5e \u003csk_run_filter+0x3a0\u003e\n81b: 41 89 dc mov %ebx,%r12d\n81e: e9 3b 03 00 00 jmpq b5e \u003csk_run_filter+0x3a0\u003e\n\nFurthermore, I reordered the instructions to reduce cache line misses by\norder the most common instruction to the start.\n\nSigned-off-by: Hagen Paul Pfeifer \u003chagen@jauu.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a8756201ba4189bca3ee1a6ec4e290f467ee09ab", "tree": "309d40a10f68ffc971de4f16d26d16a0dccc0693", "parents": [ "fe6fb552858f686f39e33d7b0a33fe56dacea0bf" ], "author": { "name": "Tim Gardner", "email": "tim.gardner@canonical.com", "time": "Fri Jun 25 14:44:07 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jun 25 14:44:07 2010 +0200" }, "message": "netfilter: xt_connbytes: Force CT accounting to be enabled\n\nCheck at rule install time that CT accounting is enabled. Force it\nto be enabled if not while also emitting a warning since this is not\nthe default state.\n\nThis is in preparation for deprecating CONFIG_NF_CT_ACCT upon which\nCONFIG_NETFILTER_XT_MATCH_CONNBYTES depended being set.\n\nAdded 2 CT accounting support functions:\n\nnf_ct_acct_enabled() - Get CT accounting state.\nnf_ct_set_acct() - Enable/disable CT accountuing.\n\nSigned-off-by: Tim Gardner \u003ctim.gardner@canonical.com\u003e\nAcked-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "7a938f80264f2cbfb0c0841b450eab42a8093281", "tree": "ae883f1c9a1170efc64b7f33db96f7989ad422a3", "parents": [ "fcb26ec5b18d88bb22366799d056dc3630d0e895" ], "author": { "name": "Dmitry Baryshkov", "email": "dbaryshkov@gmail.com", "time": "Wed Jun 16 23:02:24 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 24 21:30:09 2010 -0700" }, "message": "broadcom: Add 5241 support\n\nThis patch adds the 5241 PHY ID to the broadcom module.\n\nSigned-off-by: Dmitry Eremin-Solenikov \u003cdbaryshkov@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fcb26ec5b18d88bb22366799d056dc3630d0e895", "tree": "ba164d38c89938e4f39d4d41dacddd1f2fd144c2", "parents": [ "deb0d7c740a008a4e26806317497549b0e8907eb" ], "author": { "name": "Dmitry Baryshkov", "email": "dbaryshkov@gmail.com", "time": "Wed Jun 16 23:02:23 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 24 21:30:09 2010 -0700" }, "message": "broadcom: move all PHY_ID\u0027s to header\n\nMove all PHY IDs to brcmphy.h header for completeness and unification of code.\n\nSigned-off-by: Dmitry Eremin-Solenikov \u003cdbaryshkov@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "98d2ff8bec82fc35fe2008a187a5fef9241dab10", "tree": "5a443d79168c325aad8af755a88eca2a76342816", "parents": [ "fa61cf70a6ae1089e459e4b59b2e8d8e90d8535e" ], "author": { "name": "Juuso Oikarinen", "email": "juuso.oikarinen@nokia.com", "time": "Wed Jun 23 12:12:38 2010 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Jun 24 15:42:37 2010 -0400" }, "message": "nl80211: Add option to adjust transmit power\n\nThis patch adds transmit power setting type and transmit power level attributes\nto NL80211_CMD_SET_WIPHY in order to facilitate adjusting of the transmit power\nlevel of the device.\n\nThe added attributes allow selection of automatic, limited or fixed transmit\npower level, with the level definable in signed mBm format.\n\nSigned-off-by: Juuso Oikarinen \u003cjuuso.oikarinen@nokia.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "fa61cf70a6ae1089e459e4b59b2e8d8e90d8535e", "tree": "1bd81709faaa15fb207de7db4df1ceed96374208", "parents": [ "a185045c8da1ec6627236b4ade0d949b15da43b3" ], "author": { "name": "Juuso Oikarinen", "email": "juuso.oikarinen@nokia.com", "time": "Wed Jun 23 12:12:37 2010 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Jun 24 15:42:33 2010 -0400" }, "message": "cfg80211/mac80211: Update set_tx_power to use mBm instead of dBm units\n\nIn preparation for a TX power setting interface in the nl80211, change the\n.set_tx_power function to use mBm units instead of dBm for greater accuracy and\nsmaller power levels.\n\nAlso, already in advance move the tx_power_setting enumeration to nl80211.\n\nThis change affects the .tx_set_power function prototype. As a result, the\ncorresponding changes are needed to modules using it. These are mac80211,\niwmc3200wifi and rndis_wlan.\n\nCc: Samuel Ortiz \u003csamuel.ortiz@intel.com\u003e\nCc: Jussi Kivilinna \u003cjussi.kivilinna@mbnet.fi\u003e\nSigned-off-by: Juuso Oikarinen \u003cjuuso.oikarinen@nokia.com\u003e\nAcked-by: Samuel Ortiz \u003csamuel.ortiz@intel.com\u003e\nAcked-by: Jussi Kivilinna \u003cjussi.kivilinna@mbnet.fi\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "8244132ea89cdd128003f5b9980fab50d8d36d72", "tree": "c6cf9327cf9b6bab5bb830bbf389a514f4d7bb95", "parents": [ "7b2ff18ee7b0ec4bc3162f821e221781aaca48bd", "38000a94a902e94ca8b5498f7871c6316de8957a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 23 18:26:27 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 23 18:26:27 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tnet/ipv4/ip_output.c\n" } ], "next": "7b2ff18ee7b0ec4bc3162f821e221781aaca48bd" }