)]}' { "log": [ { "commit": "26ec037f9841e49cc5c615deb8e1e73e5beab2ca", "tree": "a7c4a77d173dd8759ed413a60b2941cbb1fca899", "parents": [ "c68cd6cc21eb329c47ff020ff7412bf58176984e" ], "author": { "name": "Nick Chalk", "email": "nick@loadbalancer.org", "time": "Tue Jun 22 08:07:01 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Jun 22 08:07:01 2010 +0200" }, "message": "IPVS: one-packet scheduling\n\nAllow one-packet scheduling for UDP connections. When the fwmark-based or\nnormal virtual service is marked with \u0027-o\u0027 or \u0027--ops\u0027 options all\nconnections are created only to schedule one packet. Useful to schedule UDP\npackets from same client port to different real servers. Recommended with\nRR or WRR schedulers (the connections are not visible with ipvsadm -L).\n\nSigned-off-by: Nick Chalk \u003cnick@loadbalancer.org\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "c68cd6cc21eb329c47ff020ff7412bf58176984e", "tree": "2e49be79c66d550b37fc494e22b5e31b39a8bc38", "parents": [ "f9181f4ffc71d7b7dd1906c9a11d51d6659220ae" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Jun 17 06:12:26 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Jun 17 06:12:26 2010 +0200" }, "message": "netfilter: nf_nat: support user-specified SNAT rules in LOCAL_IN\n\n2.6.34 introduced \u0027conntrack zones\u0027 to deal with cases where packets\nfrom multiple identical networks are handled by conntrack/NAT. Packets\nare looped through veth devices, during which they are NATed to private\naddresses, after which they can continue normally through the stack\nand possibly have NAT rules applied a second time.\n\nThis works well, but is needlessly complicated for cases where only\na single SNAT/DNAT mapping needs to be applied to these packets. In that\ncase, all that needs to be done is to assign each network to a seperate\nzone and perform NAT as usual. However this doesn\u0027t work for packets\ndestined for the machine performing NAT itself since its corrently not\npossible to configure SNAT mappings for the LOCAL_IN chain.\n\nThis patch adds a new INPUT chain to the NAT table and changes the\ntargets performing SNAT to be usable in that chain.\n\nExample usage with two identical networks (192.168.0.0/24) on eth0/eth1:\n\niptables -t raw -A PREROUTING -i eth0 -j CT --zone 1\niptables -t raw -A PREROUTING -i eth0 -j MARK --set-mark 1\niptables -t raw -A PREROUTING -i eth1 -j CT --zone 2\niptabels -t raw -A PREROUTING -i eth1 -j MARK --set-mark 2\n\niptables -t nat -A INPUT -m mark --mark 1 -j NETMAP --to 10.0.0.0/24\niptables -t nat -A POSTROUTING -m mark --mark 1 -j NETMAP --to 10.0.0.0/24\niptables -t nat -A INPUT -m mark --mark 2 -j NETMAP --to 10.0.1.0/24\niptables -t nat -A POSTROUTING -m mark --mark 2 -j NETMAP --to 10.0.1.0/24\n\niptables -t raw -A PREROUTING -d 10.0.0.0/24 -j CT --zone 1\niptables -t raw -A OUTPUT -d 10.0.0.0/24 -j CT --zone 1\niptables -t raw -A PREROUTING -d 10.0.1.0/24 -j CT --zone 2\niptables -t raw -A OUTPUT -d 10.0.1.0/24 -j CT --zone 2\n\niptables -t nat -A PREROUTING -d 10.0.0.0/24 -j NETMAP --to 192.168.0.0/24\niptables -t nat -A OUTPUT -d 10.0.0.0/24 -j NETMAP --to 192.168.0.0/24\niptables -t nat -A PREROUTING -d 10.0.1.0/24 -j NETMAP --to 192.168.0.0/24\niptables -t nat -A OUTPUT -d 10.0.1.0/24 -j NETMAP --to 192.168.0.0/24\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "f9181f4ffc71d7b7dd1906c9a11d51d6659220ae", "tree": "194f22e8216a1b9ee2c0dd019142202d73a7dc87", "parents": [ "0902b469bd25065aa0688c3cee6f11744c817e7c", "1ab6c163dee279559e3a62d774af7e4c4c9b4c67" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Jun 15 17:31:06 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Jun 15 17:31:06 2010 +0200" }, "message": "Merge branch \u0027master\u0027 of /repos/git/net-next-2.6\n\nConflicts:\n\tinclude/net/netfilter/xt_rateest.h\n\tnet/bridge/br_netfilter.c\n\tnet/netfilter/nf_conntrack_core.c\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "0902b469bd25065aa0688c3cee6f11744c817e7c", "tree": "b7e1516da57ee49d98de0789a19fc283b50bf1de", "parents": [ "d73f33b168831e53972fbf7c85db87950a41436c" ], "author": { "name": "Luciano Coelho", "email": "luciano.coelho@nokia.com", "time": "Tue Jun 15 15:04:00 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Jun 15 15:04:00 2010 +0200" }, "message": "netfilter: xtables: idletimer target implementation\n\nThis patch implements an idletimer Xtables target that can be used to\nidentify when interfaces have been idle for a certain period of time.\n\nTimers are identified by labels and are created when a rule is set with a new\nlabel. The rules also take a timeout value (in seconds) as an option. If\nmore than one rule uses the same timer label, the timer will be restarted\nwhenever any of the rules get a hit.\n\nOne entry for each timer is created in sysfs. This attribute contains the\ntimer remaining for the timer to expire. The attributes are located under\nthe xt_idletimer class:\n\n/sys/class/xt_idletimer/timers/\u003clabel\u003e\n\nWhen the timer expires, the target module sends a sysfs notification to the\nuserspace, which can then decide what to do (eg. disconnect to save power).\n\nCc: Timo Teras \u003ctimo.teras@iki.fi\u003e\nSigned-off-by: Luciano Coelho \u003cluciano.coelho@nokia.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "d73f33b168831e53972fbf7c85db87950a41436c", "tree": "5a3b5837b12728bc74fdf20505ffc1770b2a885e", "parents": [ "0b041f8d1e6fb11a6134d37230da8c2182f99110" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Jun 15 13:08:51 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Jun 15 13:08:51 2010 +0200" }, "message": "netfilter: CLUSTERIP: RCU conversion\n\n- clusterip_lock becomes a spinlock\n- lockless lookups\n- kfree() deferred after RCU grace period\n- rcu_barrier_bh() inserted in clusterip_tg_exit()\n\nv2)\n- As Patrick pointed out, we use atomic_inc_not_zero() in\nclusterip_config_find_get().\n- list_add_rcu() and list_del_rcu() variants are used.\n- atomic_dec_and_lock() used in clusterip_config_entry_put()\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "1ab6c163dee279559e3a62d774af7e4c4c9b4c67", "tree": "e0e53b37ebece752bb6c0eded82c6c493d990155", "parents": [ "d6cc1d642de9284cb26488ea390d915b50ee2504" ], "author": { "name": "Yaniv Rosner", "email": "yanivr@broadcom.com", "time": "Mon Jun 14 23:25:19 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 14 23:25:19 2010 -0700" }, "message": "bnx2x: Fix link problem with some DACs\n\nChange 2wire transfer rate of SFP+ module EEPROM from 400Khz to 100Khz\nsince some DACs(direct attached cables) do not work at 400Khz.\n\nReported-by: Krzysztof Oldzki \u003cole@ans.pl\u003e\nSigned-off-by: Yaniv Rosner \u003cyanivr@broadcom.com\u003e\nSigned-off-by: Eilon Greenstein \u003ceilong@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d6cc1d642de9284cb26488ea390d915b50ee2504", "tree": "7652471f541c11f63f54e282a04a9cba614e8d5e", "parents": [ "6b10de38f0ef4e921a1f6e5cba2b6c92d6b46ecd" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Jun 14 19:35:21 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 14 23:13:08 2010 -0700" }, "message": "inetpeer: various changes\n\nTry to reduce cache line contentions in peer management, to reduce IP\ndefragmentation overhead.\n\n- peer_fake_node is marked \u0027const\u0027 to make sure its not modified.\n (tested with CONFIG_DEBUG_RODATA\u003dy)\n\n- Group variables in two structures to reduce number of dirtied cache\nlines. One named \"peers\" for avl tree root, its number of entries, and\nassociated lock. (candidate for RCU conversion)\n\n- A second one named \"unused_peers\" for unused list and its lock\n\n- Add a !list_empty() test in unlink_from_unused() to avoid taking lock\nwhen entry is not unused.\n\n- Use atomic_dec_and_lock() in inet_putpeer() to avoid taking lock in\nsome cases.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6b10de38f0ef4e921a1f6e5cba2b6c92d6b46ecd", "tree": "76e914c5097cb80cf65bf9ce1e48acff8e46795c", "parents": [ "c68f24cc354050415c5ea543cd19ea5424463a2f" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Jun 14 05:59:22 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 14 23:13:07 2010 -0700" }, "message": "loopback: Implement 64bit stats on 32bit arches\n\nUses a seqcount_t to synchronize stat producer and consumer, for packets\nand bytes counter, now u64 types.\n\n(dropped counter being rarely used, stay a native \"unsigned long\" type)\n\nNo noticeable performance impact on x86, as it only adds two increments\nper frame. It might be more expensive on arches where smp_wmb() is not\nfree.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c68f24cc354050415c5ea543cd19ea5424463a2f", "tree": "13921fd85a8d7f4fa38ddfafba3bf7a9592190b2", "parents": [ "f6bc7d9e4760324258ad5f5d147e79db8442842e" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Jun 14 04:46:20 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 14 23:13:07 2010 -0700" }, "message": "ipv6: RCU changes in ipv6_get_mtu() and ip6_dst_hoplimit()\n\nUse RCU to avoid atomic ops on idev refcnt in ipv6_get_mtu()\nand ip6_dst_hoplimit()\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: YOSHIFUJI Hideaki \u003cyoshfuji@linux-ipv6.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f6bc7d9e4760324258ad5f5d147e79db8442842e", "tree": "a1f9cd28b1bf3df58b1eb30df58854fa623edc64", "parents": [ "1be3b5fe9dffe3300f995584d8f996dd20e29412" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Jun 14 04:39:27 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 14 23:13:06 2010 -0700" }, "message": "ipv6: avoid two atomics in ipv6_rthdr_rcv()\n\nUse __in6_dev_get() instead of in6_dev_get()/in6_dev_put()\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1be3b5fe9dffe3300f995584d8f996dd20e29412", "tree": "45f5e99951d237f7216bf59bb482d2d8d1a12f3e", "parents": [ "6b08f516244abda22c07b5e7db10ef109dc43f2d" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Mon Jun 14 08:53:26 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 14 23:13:06 2010 -0700" }, "message": "ethtool: Revert incorrect indentation changes\n\ncommit 97f8aefbbfb5aa5c9944e5fa8149f1fdaf71c7b6 \"net: fix ethtool\ncoding style errors and warnings\" changed the indentation of several\nmacro definitions in ethtool.h. These definitions line up in the diff\nwhere there is an extra character at the start of each line, but not\nin the resulting file.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6b08f516244abda22c07b5e7db10ef109dc43f2d", "tree": "098fbb9b45213feeb5e093a9a690ef76e624469a", "parents": [ "0b5c25e8ac3a60bd01a52ca7405ba96aec8c16be", "28c8e4790ca5ef75f54895ca46437f9fbb433ddf" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 14 22:59:34 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 14 22:59:34 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/ixgbe/ixgbe_ethtool.c\n\nWith merge conflict help from Stephen Rothwell.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0b041f8d1e6fb11a6134d37230da8c2182f99110", "tree": "72472564e377285159800b882c9c36ad19bf26d4", "parents": [ "841a5940eb872d70dad2b9ee7f946d8fd13a8c22" ], "author": { "name": "Shan Wei", "email": "shanwei@cn.fujitsu.com", "time": "Mon Jun 14 16:30:47 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon Jun 14 16:30:47 2010 +0200" }, "message": "netfilter: defrag: kill unused work parameter of frag_kfree_skb()\n\nThe parameter (work) is unused, remove it.\nReported from Eric Dumazet.\n\nSigned-off-by: Shan Wei \u003cshanwei@cn.fujitsu.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "841a5940eb872d70dad2b9ee7f946d8fd13a8c22", "tree": "7727cf76129dbb783f02059517bc293183f545db", "parents": [ "c86ee67c7c4bbab2818f653eb00a70671821624a" ], "author": { "name": "Shan Wei", "email": "shanwei@cn.fujitsu.com", "time": "Mon Jun 14 16:28:23 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon Jun 14 16:28:23 2010 +0200" }, "message": "netfilter: defrag: remove one redundant atomic ops\n\nInstead of doing one atomic operation per frag, we can factorize them.\nReported from Eric Dumazet.\n\nSigned-off-by: Shan Wei \u003cshanwei@cn.fujitsu.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "c86ee67c7c4bbab2818f653eb00a70671821624a", "tree": "9891e77244749ee9d3dea22a948c80e554a27788", "parents": [ "f5c5440d40a24c5dc8030cde0a03debe87de4afb" ], "author": { "name": "Shan Wei", "email": "shanwei@cn.fujitsu.com", "time": "Mon Jun 14 16:20:02 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon Jun 14 16:20:02 2010 +0200" }, "message": "netfilter: kill redundant check code in which setting ip_summed value\n\nIf the returned csum value is 0, We has set ip_summed with\nCHECKSUM_UNNECESSARY flag in __skb_checksum_complete_head().\n\nSo this patch kills the check and changes to return to upper\ncaller directly.\n\nSigned-off-by: Shan Wei \u003cshanwei@cn.fujitsu.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "f5c5440d40a24c5dc8030cde0a03debe87de4afb", "tree": "2dacda8f2134860488dad9783dbcc7ef970f2985", "parents": [ "bed1be20867d17a3eb2fb5e1613ebdc50c83b8aa" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Jun 14 16:15:23 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon Jun 14 16:15:23 2010 +0200" }, "message": "netfilter: nfnetlink_log: RCU conversion, part 2\n\n- must use atomic_inc_not_zero() in instance_lookup_get()\n\n- must use hlist_add_head_rcu() instead of hlist_add_head()\n\n- must use hlist_del_rcu() instead of hlist_del()\n\n- Introduce NFULNL_COPY_DISABLED to stop lockless reader from using an\ninstance, before we do final instance_put() on it.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "28c8e4790ca5ef75f54895ca46437f9fbb433ddf", "tree": "335150601c08e1eecb819ce638e11430235ba4c1", "parents": [ "7837e58ce39bd727e0a163e7d34e479df36f6d29" ], "author": { "name": "Andy Gospodarek", "email": "andy@greyhouse.net", "time": "Fri Jun 11 12:47:03 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jun 13 18:20:53 2010 -0700" }, "message": "ixgbe: fix automatic LRO/RSC settings for low latency\n\nThis patch added to 2.6.34:\n\n\tcommit f8d1dcaf88bddc7f282722ec1fdddbcb06a72f18\n\tAuthor: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\n\tDate: Tue Apr 27 01:37:20 2010 +0000\n\n\t ixgbe: enable extremely low latency\n\nintroduced a feature where LRO (called RSC on the hardware) was disabled\nautomatically when setting rx-usecs to 0 via ethtool. Some might not\nlike the fact that LRO was disabled automatically, but I\u0027m fine with\nthat. What I don\u0027t like is that LRO/RSC is automatically enabled when\nrx-usecs is set \u003e0 via ethtool.\n\nThis would certainly be a problem if the device was used for forwarding\nand it was determined that the low latency wasn\u0027t needed after the\ndevice was already forwarding. I played around with saving the state of\nLRO in the driver, but it just didn\u0027t seem worthwhile and would require\na small change to dev_disable_lro() that I did not like.\n\nThis patch simply leaves LRO disabled when setting rx-usecs \u003e0 and\nrequires that the user enable it again. An extra informational message\nwill also now appear in the log so users can understand why LRO isn\u0027t\nbeing enabled as they expect.\n\nInconsistency of LRO setting first noticed by Stanislaw Gruszka.\n\nSigned-off-by: Andy Gospodarek \u003candy@greyhouse.net\u003e\nCC: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nCC: stable@kernel.org\nTested-by: Stephen Ko \u003cstephen.s.ko@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": "7837e58ce39bd727e0a163e7d34e479df36f6d29", "tree": "6000cacc22ba2be7dd2fede5195e4f9dfc282cf9", "parents": [ "d08935c274b7e552e47633cf0cbd74b6e953d228" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Fri Jun 11 12:51:49 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jun 13 18:20:53 2010 -0700" }, "message": "e1000: Fix message logging defect\n\ncommit 675ad47375c76a7c3be4ace9554d92cd55518ced\nremoved the capability to use ethtool.set_msglevel to\ncontrol the types of messages emitted by the driver.\n\nThat commit should probably be reverted.\n\nIf not, then this patch fixes a message logging defect\nintroduced by converting a printk without KERN_\u003clevel\u003e\nto e_info.\n\nThis also reduces text by about 200 bytes.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nTested-by: Emil Tantilov \u003cemil.s.tantilov@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": "d08935c274b7e552e47633cf0cbd74b6e953d228", "tree": "531cbcadc890a3b13fb3a829431fd4b72618b48c", "parents": [ "e8d15e6460cb0eea00f2574a80d94496943403ba" ], "author": { "name": "Don Skidmore", "email": "donald.c.skidmore@intel.com", "time": "Fri Jun 11 13:20:29 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jun 13 18:20:52 2010 -0700" }, "message": "ixgbe: fix for race with 8259(8|9) during shutdown\n\nThere is a small window where the watchdog could be running as the\ninterface is brought down on a NIC with two ports wired back to back.\nIf ixgbe_update_status is then called can lead to a panic. This patch\nallows the update to bail if we are in that condition.\n\nThis issue was orignally reported and fix proposed by Akihiko Saitou.\n\nCC: Akihiko Saitou \u003casaitou@users.sourceforge.net\u003e\nSigned-off-by: Don Skidmore \u003cdonald.c.skidmore@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": "e8d15e6460cb0eea00f2574a80d94496943403ba", "tree": "34b40fbf0d7dbd294c918ff3e12af11e5ca77e95", "parents": [ "e897082fe7a5b591dc4dd5599ac39081a7c8e482" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sun Jun 13 10:50:46 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jun 13 17:16:54 2010 -0700" }, "message": "net: rxhash already set in __copy_skb_header\n\nNo need to copy rxhash again in __skb_clone()\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e897082fe7a5b591dc4dd5599ac39081a7c8e482", "tree": "9d33789a1cbdffc0e77a1187d32b0051eb7648c4", "parents": [ "d49aba84fe775671133295658f43f4d142a517f9" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Sun Jun 13 10:36:30 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jun 13 17:12:40 2010 -0700" }, "message": "net: fix deliver_no_wcard regression on loopback device\n\ndeliver_no_wcard is not being set in skb_copy_header.\nIn the skb_cloned case it is not being cleared and\nmay cause the skb to be dropped when the loopback device\npushes it back up the stack.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nTested-by: Markus Trippelsdorf \u003cmarkus@trippelsdorf.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0b5c25e8ac3a60bd01a52ca7405ba96aec8c16be", "tree": "62f917ba35c9eef315e23f7e8390c19e7537f8e3", "parents": [ "8ccef431a2994bb8a722d0fbc6c6da2bdbf86834" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Tue Jun 08 08:23:01 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 12 18:18:33 2010 -0700" }, "message": "irttp: Print device parameters and statistics as unsigned\n\nDevice statistics have type unsigned long and several of the\ndevice-specific parameters printed here have type __u32.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8ccef431a2994bb8a722d0fbc6c6da2bdbf86834", "tree": "63a2fc3d4b454fe673301785c8394add7908bd07", "parents": [ "4472702e6575809c2d232efc09ac25caf66b395d" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Tue Jun 08 08:20:59 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 12 18:18:33 2010 -0700" }, "message": "usbnet: Print device statistics as unsigned\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4472702e6575809c2d232efc09ac25caf66b395d", "tree": "77c28d9c159592c978472d92ae31dc154aee7d48", "parents": [ "be1f3c2c027cc5ad735df6a45a542ed1db7ec48b" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Tue Jun 08 07:21:12 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 12 15:51:23 2010 -0700" }, "message": "sfc: Implement 64-bit net device statistics on all architectures\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "be1f3c2c027cc5ad735df6a45a542ed1db7ec48b", "tree": "c97815a7cf25ea62e8f3a6b3597cfa8957f40b81", "parents": [ "d19b51499967baddf4f9f12a0067146c2554527a" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Tue Jun 08 07:19:54 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 12 15:51:22 2010 -0700" }, "message": "net: Enable 64-bit net device statistics on 32-bit architectures\n\nUse struct rtnl_link_stats64 as the statistics structure.\n\nOn 32-bit architectures, insert 32 bits of padding after/before each\nfield of struct net_device_stats to make its layout compatible with\nstruct rtnl_link_stats64. Add an anonymous union in net_device; move\nstats into the union and add struct rtnl_link_stats64 stats64.\n\nAdd net_device_ops::ndo_get_stats64, implementations of which will\nreturn a pointer to struct rtnl_link_stats64. Drivers that implement\nthis operation must not update the structure asynchronously.\n\nChange dev_get_stats() to call ndo_get_stats64 if available, and to\nreturn a pointer to struct rtnl_link_stats64. Change callers of\ndev_get_stats() accordingly.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d19b51499967baddf4f9f12a0067146c2554527a", "tree": "30e373ca631c13ee3b42099698accf9b127943e9", "parents": [ "43d28b6515a6ea580a198df3e253e88236f08978" ], "author": { "name": "Sergey Matyukevich", "email": "geomatsi@gmail.com", "time": "Mon Jun 07 08:38:13 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 12 15:26:07 2010 -0700" }, "message": "ucc_geth driver: add ioctl\n\nioctl operation (ndo_do_ioctl) is added to make mii-tools work\n\nSigned-off-by: Sergey Matyukevich \u003cgeomatsi@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d49aba84fe775671133295658f43f4d142a517f9", "tree": "367f731720046001de6bb6f20ea4376303dcfb27", "parents": [ "e79aa8671033535c2e9ffc0a68010ae49ed5734c" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Tue Jun 08 07:00:20 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 12 15:23:45 2010 -0700" }, "message": "enic: fix pci_alloc_consistent argument\n\nFix build warning on i386 (32-bit) with 32-bit dma_addr_t:\n\ndrivers/net/enic/vnic_dev.c: In function \u0027vnic_dev_init_prov\u0027:\ndrivers/net/enic/vnic_dev.c:716: warning: passing argument 3 of \u0027pci_alloc_consistent\u0027 from incompatible pointer type\ninclude/asm-generic/pci-dma-compat.h:16: note: expected \u0027dma_addr_t *\u0027 but argument is of type \u0027u64 *\u0027\n\nNow builds without warnings on i386 and on x86_64.\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nCc:\tScott Feldman \u003cscofeldm@cisco.com\u003e\nCc:\tVasanthy Kolluri \u003cvkolluri@cisco.com\u003e\nCc:\tRoopa Prabhu \u003croprabhu@cisco.com\u003e\nAcked-by: Scott Feldman \u003cscofeldm@cisco.com\u003e\n" }, { "commit": "43d28b6515a6ea580a198df3e253e88236f08978", "tree": "97419dbd96cfb236694de00397a619cf5a0bab05", "parents": [ "0c78a92fbd655ab990e2799f645707f05f548e2f" ], "author": { "name": "Daniel Turull", "email": "daniel.turull@gmail.com", "time": "Wed Jun 09 22:49:57 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 11 18:37:09 2010 -0700" }, "message": "pktgen: increasing transmission granularity\n\nThis patch increases the granularity of the rate generated by pktgen.\nThe previous version of pktgen uses micro seconds (udelay) resolution when it\nwas delayed causing gaps in the rates. It is changed to nanosecond (ndelay).\nNow any rate is possible.\n\nAlso it allows to set, the desired rate in Mb/s or packets per second.\n\nThe documentation has been updated.\n\nSigned-off-by: Daniel Turull \u003cdaniel.turull@gmail.com\u003e\nSigned-off-by: Robert Olsson \u003crobert.olsson@its.uu.se\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0c78a92fbd655ab990e2799f645707f05f548e2f", "tree": "8dd5bb176c76c142c6b310b4ce4d076d36acaec3", "parents": [ "c7de2cf053420d63bac85133469c965d4b1083e1" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jun 09 16:33:05 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 11 18:37:08 2010 -0700" }, "message": "econet: fix locking\n\neconet lacks proper locking. It holds econet_lock only when inserting or\ndeleting an entry in econet_sklist, not during lookups.\n\n- convert econet_lock from rwlock to spinlock\n\n- use econet_lock in ec_listening_socket() lookup\n\n- use appropriate sock_hold() / sock_put() to avoid corruptions.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c7de2cf053420d63bac85133469c965d4b1083e1", "tree": "b56f7c96d01e25f79fe1f9b7e5305265e92214d9", "parents": [ "cbd6890c5987cd7115147e1dd2c10d729afabb08" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jun 09 02:09:23 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 11 18:37:08 2010 -0700" }, "message": "pkt_sched: gen_kill_estimator() rcu fixes\n\ngen_kill_estimator() API is incomplete or not well documented, since\ncaller should make sure an RCU grace period is respected before\nfreeing stats_lock.\n\nThis was partially addressed in commit 5d944c640b4\n(gen_estimator: deadlock fix), but same problem exist for all\ngen_kill_estimator() users, if lock they use is not already RCU\nprotected.\n\nA code review shows xt_RATEEST.c, act_api.c, act_police.c have this\nproblem. Other are ok because they use qdisc lock, already RCU\nprotected.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cbd6890c5987cd7115147e1dd2c10d729afabb08", "tree": "074d6e8fcb69fdc2d5a2d07d7a284c76f08b8771", "parents": [ "fc0ba8e87189b02683177116932fa580ab97b7ff" ], "author": { "name": "Michael Chan", "email": "mchan@broadcom.com", "time": "Tue Jun 08 07:21:30 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 11 18:37:07 2010 -0700" }, "message": "bnx2: Fix compiler warning in bnx2_disable_forced_2g5().\n\ndrivers/net/bnx2.c: In function \u0027bnx2_disable_forced_2g5\u0027:\ndrivers/net/bnx2.c:1489: warning: \u0027bmcr\u0027 may be used uninitialized in this function\n\nWe fix it by checking return values from all bnx2_read_phy() and proceeding\nto do read-modify-write only if the read operation is successful.\n\nThe related bnx2_enable_forced_2g5() is also fixed the same way.\n\nReported-by: Prarit Bhargava \u003cprarit@redhat.com\u003e\nSigned-off-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fc0ba8e87189b02683177116932fa580ab97b7ff", "tree": "ba9bac6b668cf6e5bbb2d1a55767302397641471", "parents": [ "62522d36d74a843e78d17f2dffc90468c6762803" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Wed Jun 09 21:59:03 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 11 18:37:07 2010 -0700" }, "message": "enic: cleanup vic_provinfo_alloc()\n\nIf oui were a null variable then vic_provinfo_alloc() would leak memory.\nBut this function is only called from one place and oui is not null so\nI removed the check.\n\nI also moved the memory allocation down a line so it was easier to spot.\n(No one ever reads variable declarations).\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "62522d36d74a843e78d17f2dffc90468c6762803", "tree": "d9d21de6724425c1b0ba12991e0865556aeda6b4", "parents": [ "a71fba97295db924c0b90266e9833e5059fead24", "e79aa8671033535c2e9ffc0a68010ae49ed5734c" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 11 13:32:31 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 11 13:32:31 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "a71fba97295db924c0b90266e9833e5059fead24", "tree": "d6be811cf4910167ed83fdfb2bdcd51d0c7bf0fd", "parents": [ "b46773db64c264a6600f58d9da1ae43708b47fda" ], "author": { "name": "Jonas Bonn", "email": "jonas@southpole.se", "time": "Fri Jun 11 02:47:40 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 11 13:28:37 2010 -0700" }, "message": "ethoc: use devres resource management\n\nThe point of using the devres resource management routines is that they\nsimplify the driver by taking care of releasing resources on failure and\nrelease. A recent commit added a bunch of error handling that is unnecessary\nin this context.\n\nThis patch removes this redundant error handling, as well as using\ndmam_alloc_coherent in place of dma_alloc_coherent in order to use this\nframework consistenly throughout the driver.\n\nSigned-off-by: Jonas Bonn \u003cjonas@southpole.se\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b46773db64c264a6600f58d9da1ae43708b47fda", "tree": "611c2780840473ccf0dc2a5daadb7e10f0bbf075", "parents": [ "2cbc8ef9facf60afa62e04bde91fb5fcac9a5683" ], "author": { "name": "Jonas Bonn", "email": "jonas@southpole.se", "time": "Fri Jun 11 02:47:39 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 11 13:28:36 2010 -0700" }, "message": "ethoc: Clear command buffer after write\n\nThis matches what ethoc_mdio_read does and makes the functions\nsymmetric.\n\nSigned-off-by: Jonas Bonn \u003cjonas@southpole.se\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2cbc8ef9facf60afa62e04bde91fb5fcac9a5683", "tree": "199a6fdea0b04a3cd0bc359045f15c8938a1764e", "parents": [ "637f33b80d774060646772a22fd728e198d9ebf9" ], "author": { "name": "Jonas Bonn", "email": "jonas@southpole.se", "time": "Fri Jun 11 02:47:38 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 11 13:28:36 2010 -0700" }, "message": "Remove unused variable\n\nSigned-off-by: Jonas Bonn \u003cjonas@southpole.se\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "637f33b80d774060646772a22fd728e198d9ebf9", "tree": "6a88fc51ea69bb8a9a7f0da22092f99204108e77", "parents": [ "ee4f56b990391f0ea333121ebc0e9fba28619b52" ], "author": { "name": "Jonas Bonn", "email": "jonas@southpole.se", "time": "Fri Jun 11 02:47:37 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 11 13:28:35 2010 -0700" }, "message": "ethoc: Clean up PHY probing\n\n- No need to iterate over all possible addresses on bus\n- Use helper function phy_find_first\n- Use phy_connect_direct as we already have the relevant structure\n\nSigned-off-by: Jonas Bonn \u003cjonas@southpole.se\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ee4f56b990391f0ea333121ebc0e9fba28619b52", "tree": "e087bf962608e04671d89fcda9933a70813aa629", "parents": [ "f8555ad0cfb0ba6cbc8729f337341fb11c82db89" ], "author": { "name": "Jonas Bonn", "email": "jonas@southpole.se", "time": "Fri Jun 11 02:47:36 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 11 13:28:35 2010 -0700" }, "message": "ethoc: write number of TX buffers in init_ring\n\nThis moves the write of the TX_BD_NUM to init_ring together with the\nrest of the code setting up the transmission buffers.\n\nSigned-off-by: Jonas Bonn \u003cjonas@southpole.se\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f8555ad0cfb0ba6cbc8729f337341fb11c82db89", "tree": "c16c743438c26af94d959bc933a79208484a9277", "parents": [ "c527f81475aaa18123eebe3d72a40a25d8e244af" ], "author": { "name": "Jonas Bonn", "email": "jonas@southpole.se", "time": "Fri Jun 11 02:47:35 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 11 13:28:34 2010 -0700" }, "message": "ethoc: Write bus addresses to registers\n\nThe ethoc driver should be writing bus addresses to the ethoc registers, not\nvirtual addresses. This patch adds an array to store the virtual addresses\nin and references that array when manipulating the contents of the buffer\ndescriptors.\n\nSigned-off-by: Jonas Bonn \u003cjonas@southpole.se\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c527f81475aaa18123eebe3d72a40a25d8e244af", "tree": "d71dcb9b809da2e8b3d24ab6e937c5d3e99fae9d", "parents": [ "14599f1e341ee219abdd15f4eee5872d6f2d29f1" ], "author": { "name": "Jonas Bonn", "email": "jonas@southpole.se", "time": "Fri Jun 11 02:47:34 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 11 13:28:34 2010 -0700" }, "message": "ethoc: calculate number of buffers in ethoc_probe\n\nThis moves the calculation of the number of transmission buffers to\nethoc_probe where it more logically fits with the rest of the memory\nallocation code.\n\nSigned-off-by: Jonas Bonn \u003cjonas@southpole.se\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e79aa8671033535c2e9ffc0a68010ae49ed5734c", "tree": "237e16dd5d999f6ac2de89ae2a1d35ae0d4d74fd", "parents": [ "349124a00754129a5f1e43efa84733e364bf3749", "a385a53e659b35ebee604889e21c40e5c336941f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 11 12:38:23 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 11 12:38:23 2010 -0700" }, "message": "Merge branch \u0027wimax-2.6.35.y\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax\n" }, { "commit": "a385a53e659b35ebee604889e21c40e5c336941f", "tree": "b58b887077f435da273ee5922ed267f3357bdabd", "parents": [ "3a24934f065d23145f1c9c70da9f630c7a37795f" ], "author": { "name": "Inaky Perez-Gonzalez", "email": "inaky.perez-gonzalez@intel.com", "time": "Fri Jun 11 11:51:20 2010 -0700" }, "committer": { "name": "Inaky Perez-Gonzalez", "email": "inaky.perez-gonzalez@intel.com", "time": "Fri Jun 11 11:51:20 2010 -0700" }, "message": "wimax/i2400m: fix missing endian correction read in fw loader\n\ni2400m_fw_hdr_check() was accessing hardware field\nbcf_hdr-\u003emodule_type (little endian 32) without converting to host\nbyte sex.\n\nReported-by: Данилин Михаил \u003cmdanilin@nsg.net.ru\u003e\n\nSigned-off-by: Inaky Perez-Gonzalez \u003cinaky@linux.intel.com\u003e\n" }, { "commit": "14599f1e341ee219abdd15f4eee5872d6f2d29f1", "tree": "3875181429010e58416ab34e6c06ef42de52e756", "parents": [ "d8d1f30b95a635dbd610dcc5eb641aca8f4768cf", "832c10fd733893f86c63bde1c65b005d5a2fe346" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 11 11:34:06 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 11 11:34:06 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6\n\nConflicts:\n\tdrivers/net/wireless/wl12xx/wl1271.h\n\tdrivers/net/wireless/wl12xx/wl1271_cmd.h\n" }, { "commit": "d8d1f30b95a635dbd610dcc5eb641aca8f4768cf", "tree": "71424d82a96facd5fcf05cc769ef2ba52b584aeb", "parents": [ "592fcb9dfafaa02dd0edc207bf5d3a0ee7a1f8df" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Thu Jun 10 23:31:35 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 10 23:31:35 2010 -0700" }, "message": "net-next: remove useless union keyword\n\nremove useless union keyword in rtable, rt6_info and dn_route.\n\nSince there is only one member in a union, the union keyword isn\u0027t useful.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "349124a00754129a5f1e43efa84733e364bf3749", "tree": "acff33465eb6b21aadca78657a7fa330d6987936", "parents": [ "07a0f0f07a68014c92c752a5598102372bddf46e" ], "author": { "name": "Figo.zhang", "email": "zhangtianfei@leadcoretech.com", "time": "Mon Jun 07 21:13:22 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 10 23:14:08 2010 -0700" }, "message": "net8139: fix a race at the end of NAPI\n\nfix a race at the end of NAPI complete processing, it had\nbetter do __napi_complete() first before re-enable interrupt.\n\nSigned-off-by:Figo.zhang \u003cfigo1802@gmail.com\u003e\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "07a0f0f07a68014c92c752a5598102372bddf46e", "tree": "9429833f5f1f95066d9f4113cf224dcef7c4bd1e", "parents": [ "ae638c47dc040b8def16d05dc6acdd527628f231" ], "author": { "name": "Daniel Turull", "email": "daniel.turull@gmail.com", "time": "Thu Jun 10 23:08:11 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 10 23:08:11 2010 -0700" }, "message": "pktgen: Fix accuracy of inter-packet delay.\n\nThis patch correct a bug in the delay of pktgen. \nIt makes sure the inter-packet interval is accurate.\n\nSigned-off-by: Daniel Turull \u003cdaniel.turull@gmail.com\u003e\nSigned-off-by: Robert Olsson \u003crobert.olsson@its.uu.se\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ae638c47dc040b8def16d05dc6acdd527628f231", "tree": "f3fa7015b8f4ed85d44d675d4a9f5f6c82063764", "parents": [ "597a264b1a9c7e36d1728f677c66c5c1f7e3b837" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Jun 08 23:39:10 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 10 22:53:52 2010 -0700" }, "message": "pkt_sched: gen_estimator: add a new lock\n\ngen_kill_estimator() / gen_new_estimator() is not always called with\nRTNL held.\n\nnet/netfilter/xt_RATEEST.c is one user of these API that do not hold\nRTNL, so random corruptions can occur between \"tc\" and \"iptables\".\n\nAdd a new fine grained lock instead of trying to use RTNL in netfilter.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "592fcb9dfafaa02dd0edc207bf5d3a0ee7a1f8df", "tree": "3b7bbd5313c7f564cf8087658c36d32a87ca79c4", "parents": [ "96b52e61be1ad4d4f8de39b9deaf253da804ea3b" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jun 09 16:21:07 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 10 22:47:08 2010 -0700" }, "message": "ip: ip_ra_control() rcu fix\n\ncommit 66018506e15b (ip: Router Alert RCU conversion) introduced RCU\nlookups to ip_call_ra_chain(). It missed proper deinit phase :\nWhen ip_ra_control() deletes an ip_ra_chain, it should make sure\nip_call_ra_chain() users can not start to use socket during the rcu\ngrace period. It should also delay the sock_put() after the grace\nperiod, or we risk a premature socket freeing and corruptions, as\nraw sockets are not rcu protected yet.\n\nThis delay avoids using expensive atomic_inc_not_zero() in\nip_call_ra_chain().\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "597a264b1a9c7e36d1728f677c66c5c1f7e3b837", "tree": "22db16f0a7b54ece127e127e152e9172456d9e1c", "parents": [ "00d9d6a185de89edc0649ca4ead58f0283dfcbac" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Thu Jun 03 09:30:11 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 10 22:23:34 2010 -0700" }, "message": "net: deliver skbs on inactive slaves to exact matches\n\nCurrently, the accelerated receive path for VLAN\u0027s will\ndrop packets if the real device is an inactive slave and\nis not one of the special pkts tested for in\nskb_bond_should_drop(). This behavior is different then\nthe non-accelerated path and for pkts over a bonded vlan.\n\nFor example,\n\nvlanx -\u003e bond0 -\u003e ethx\n\nwill be dropped in the vlan path and not delivered to any\npacket handlers at all. However,\n\nbond0 -\u003e vlanx -\u003e ethx\n\nand\n\nbond0 -\u003e ethx\n\nwill be delivered to handlers that match the exact dev,\nbecause the VLAN path checks the real_dev which is not a\nslave and netif_recv_skb() doesn\u0027t drop frames but only\ndelivers them to exact matches.\n\nThis patch adds a sk_buff flag which is used for tagging\nskbs that would previously been dropped and allows the\nskb to continue to skb_netif_recv(). Here we add\nlogic to check for the deliver_no_wcard flag and if it\nis set only deliver to handlers that match exactly. This\nmakes both paths above consistent and gives pkt handlers\na way to identify skbs that come from inactive slaves.\nWithout this patch in some configurations skbs will be\ndelivered to handlers with exact matches and in others\nbe dropped out right in the vlan path.\n\nI have tested the following 4 configurations in failover modes\nand load balancing modes.\n\n# bond0 -\u003e ethx\n\n# vlanx -\u003e bond0 -\u003e ethx\n\n# bond0 -\u003e vlanx -\u003e ethx\n\n# bond0 -\u003e ethx\n |\n vlanx -\u003e --\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "00d9d6a185de89edc0649ca4ead58f0283dfcbac", "tree": "2c7bb666781736a94170624519182b68b13f099d", "parents": [ "81a95f049962ec20a9aed888e676208b206f0f2e" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Jun 07 22:24:44 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 09 18:39:27 2010 -0700" }, "message": "ipv6: fix ICMP6_MIB_OUTERRORS\n\nIn commit 1f8438a85366 (icmp: Account for ICMP out errors), I did a typo\non IPV6 side, using ICMP6_MIB_OUTMSGS instead of ICMP6_MIB_OUTERRORS\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "96b52e61be1ad4d4f8de39b9deaf253da804ea3b", "tree": "7751b360813e7c821b3eb3439651edcbc77f5eae", "parents": [ "97859160c5158a97a4b976a2d7bc74cf2223afe0" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Jun 07 21:05:02 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 09 18:06:14 2010 -0700" }, "message": "ipv6: mcast: RCU conversions\n\n- ipv6_sock_mc_join() : doesnt touch dev refcount\n\n- ipv6_sock_mc_drop() : doesnt touch dev/idev refcounts\n\n- ip6_mc_find_dev() becomes ip6_mc_find_dev_rcu() (called from rcu),\n and doesnt touch dev/idev refcounts\n\n- ipv6_sock_mc_close() : doesnt touch dev/idev refcounts\n\n- ip6_mc_source() uses ip6_mc_find_dev_rcu()\n\n- ip6_mc_msfilter() uses ip6_mc_find_dev_rcu()\n\n- ip6_mc_msfget() uses ip6_mc_find_dev_rcu()\n\n- ipv6_dev_mc_dec(), ipv6_chk_mcast_addr(),\n igmp6_event_query(), igmp6_event_report(),\n mld_sendpack(), igmp6_send() dont touch idev refcount\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "97859160c5158a97a4b976a2d7bc74cf2223afe0", "tree": "396225c2a54d614a9d9076db7c2d1d76fb35ddab", "parents": [ "cfa087f689402438e3cb0f077e649d01c871b0e7" ], "author": { "name": "Rami Rosen", "email": "ramirose@gmail.com", "time": "Tue Jun 08 19:07:56 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 09 18:06:14 2010 -0700" }, "message": "cleanup: remove pppoe_xmit() declaration.\n\nThere is no need for pppoe_xmit() forward declaration in\ndrivers/net/pppoe.c. This patch removes this pppoe_xmit() declaration.\n\nSigned-off-by: Rami Rosen \u003cramirose@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cfa087f689402438e3cb0f077e649d01c871b0e7", "tree": "0284b1ef6a086fae77da311cc2f9efd6588a77dc", "parents": [ "88e7594a9775e54dcd421cb246406dce62e48bee" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Jun 07 22:34:35 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 09 18:06:13 2010 -0700" }, "message": "icmp: RCU conversion in icmp_address_reply()\n\n- rcu_read_lock() already held by caller\n- use __in_dev_get_rcu() instead of in_dev_get() / in_dev_put()\n- remove goto out;\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "81a95f049962ec20a9aed888e676208b206f0f2e", "tree": "6084276117d85d181044d65bc1dd9c691cb11694", "parents": [ "ebedb22d2bacdcf577348eae77ab8f27c9db8ee8" ], "author": { "name": "Timo Teräs", "email": "timo.teras@iki.fi", "time": "Wed Jun 09 17:31:48 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 09 17:31:48 2010 -0700" }, "message": "r8169: fix mdio_read and update mdio_write according to hw specs\n\nRealtek confirmed that a 20us delay is needed after mdio_read and\nmdio_write operations. Reduce the delay in mdio_write, and add it\nto mdio_read too. Also add a comment that the 20us is from hw specs.\n\nSigned-off-by: Timo Teräs \u003ctimo.teras@iki.fi\u003e\nAcked-by: Francois Romieu \u003cromieu@fr.zoreil.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ebedb22d2bacdcf577348eae77ab8f27c9db8ee8", "tree": "16abc0c02b45126e6064d6d9d71dc0cf9a870c72", "parents": [ "619baba195d92ec39379e24c151f4a640898d140", "08c801f8d45387a1b46066aad1789a9bb9c4b645" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 09 16:28:25 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 09 16:28:25 2010 -0700" }, "message": "Merge branch \u0027num_rx_queues\u0027 of git://kernel.ubuntu.com/rtg/net-2.6\n" }, { "commit": "619baba195d92ec39379e24c151f4a640898d140", "tree": "3acb28ffdd3ebbc8f4b99028b69f51c11ff0f105", "parents": [ "aea34e7ae7a40bc72f9f11b5658160dfb4b90c48" ], "author": { "name": "Anton Vorontsov", "email": "avorontsov@mvista.com", "time": "Wed Jun 09 16:27:08 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 09 16:27:08 2010 -0700" }, "message": "gianfar: Revive the driver for eTSEC devices (disable timestamping)\n\nSince commit cc772ab7cdcaa24d1fae332d92a1602788644f7a (\"gianfar: Add\nhardware RX timestamping support\"), the driver no longer works on\nat least MPC8313ERDB and MPC8568EMDS boards (and possibly much more\nboards as well).\n\nThat\u0027s how MPC8313 Reference Manual describes RCTRL_TS_ENABLE bit:\n\n Timestamp incoming packets as padding bytes. PAL field is set\n to 8 if the PAL field is programmed to less than 8. Must be set\n to zero if TMR_CTRL[TE]\u003d0.\n\nI see that the commit above sets this bit, but it doesn\u0027t handle\nTMR_CTRL. Manfred probably had this bit set by the firmware for\nhis boards. But obviously this isn\u0027t true for all boards in the\nwild.\n\nAlso, I recall that Freescale BSPs were explicitly disabling the\ntimestamping because of a performance drop.\n\nFor now, the best way to deal with this is just disable the\ntimestamping, and later we can discuss proper device tree bindings\nand implement enabling this feature via some property.\n\nSigned-off-by: Anton Vorontsov \u003cavorontsov@mvista.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "aea34e7ae7a40bc72f9f11b5658160dfb4b90c48", "tree": "12bba1eacc4d0359c4d0b394368c2f439bcb1042", "parents": [ "e13647c158307f0e7ff5fc5bec34731f28917595" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Mon Jun 07 04:51:58 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 09 16:18:53 2010 -0700" }, "message": "caif: fix a couple range checks\n\nThe extra ! character means that these conditions are always false.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nAcked-by: Sjur Braendeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e13647c158307f0e7ff5fc5bec34731f28917595", "tree": "157e393bed93f540a93e96fcafaac8f6f541f92c", "parents": [ "327723edebbbd621ed35b0d63073685eb225563e" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Mon Jun 07 05:39:32 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 09 16:17:02 2010 -0700" }, "message": "phylib: Add support for the LXT973 phy.\n\nThis patch implements a work around for Erratum 5, \"3.3 V Fiber Speed\nSelection.\" If the hardware wiring does not respect this erratum, then\nfiber optic mode will not work properly.\n\nSigned-off-by: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "88e7594a9775e54dcd421cb246406dce62e48bee", "tree": "2a95adf9feb4c793d45d3ae86df05de4ca460d63", "parents": [ "bb69ae049fcc986fcd742eb90ca0d44a7a49c9f1" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Mon Jun 07 03:27:39 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 09 16:14:25 2010 -0700" }, "message": "phonet: use call_rcu for phonet device free\n\nUse call_rcu rather than synchronize_rcu.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "08c801f8d45387a1b46066aad1789a9bb9c4b645", "tree": "d82ec32778a908f5cd75a102d3d9dc4949986b22", "parents": [ "327723edebbbd621ed35b0d63073685eb225563e" ], "author": { "name": "Tim Gardner", "email": "tim.gardner@canonical.com", "time": "Tue Jun 08 17:51:27 2010 -0600" }, "committer": { "name": "Tim Gardner", "email": "tim.gardner@canonical.com", "time": "Wed Jun 09 13:46:03 2010 -0600" }, "message": "net: Print num_rx_queues imbalance warning only when there are allocated queues\n\nBugLink: http://bugs.launchpad.net/bugs/591416\n\nThere are a number of network drivers (bridge, bonding, etc) that are not yet\nreceive multi-queue enabled and use alloc_netdev(), so don\u0027t print a\nnum_rx_queues imbalance warning in that case.\n\nAlso, only print the warning once for those drivers that _are_ multi-queue\nenabled.\n\nSigned-off-by: Tim Gardner \u003ctim.gardner@canonical.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\n" }, { "commit": "327723edebbbd621ed35b0d63073685eb225563e", "tree": "5983bf544284c4bd11028e198c937f86be358dc4", "parents": [ "035320d54758e21227987e3aae0d46e7a04f4ddc", "b054b747a694927879c94dd11af54d04346aed7d" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 09 11:13:23 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 09 11:13:23 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "bed1be20867d17a3eb2fb5e1613ebdc50c83b8aa", "tree": "c8350ba3c47861b11857ff943d8647d7bd08eb36", "parents": [ "c463ac972315a0c86bb20b8d35225baa75caf899" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jun 09 18:14:58 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Wed Jun 09 18:14:58 2010 +0200" }, "message": "netfilter: nfnetlink_log: RCU conversion\n\n- instances_lock becomes a spinlock\n- lockless lookups\n\nWhile nfnetlink_log probably not performance critical, using less\nrwlocks in our code is always welcomed...\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "c463ac972315a0c86bb20b8d35225baa75caf899", "tree": "fccefe1583f3d8a64aca969ec299b60da473d5e1", "parents": [ "144ad2a6c56b6109ff0f64074863ae5cf1c1698a" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jun 09 18:07:06 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Wed Jun 09 18:07:06 2010 +0200" }, "message": "netfilter: nfnetlink_queue: some optimizations\n\n- Use an atomic_t for id_sequence to avoid a spin_lock/spin_unlock pair\n\n- Group highly modified struct nfqnl_instance fields together\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "144ad2a6c56b6109ff0f64074863ae5cf1c1698a", "tree": "58b3934b3b2ef3c739cd4a77b08a809d0290be7e", "parents": [ "5756d346c7cdefcd84a8ac4901167cdfb5447b69" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jun 09 16:25:08 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Wed Jun 09 16:25:08 2010 +0200" }, "message": "netfilter: ip6_queue: rwlock to spinlock conversion\n\nConverts queue_lock rwlock to a spinlock.\n\n(readlocked part can be changed by reads of integer values)\n\nOne atomic operation instead of four per ipq_enqueue_packet() call.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "5756d346c7cdefcd84a8ac4901167cdfb5447b69", "tree": "4ac2c15adef1bd1e62292815a04ce7c8aefb765a", "parents": [ "2bf074825403e0e0d623bac7573580773b78abef" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jun 09 15:47:41 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Wed Jun 09 15:47:41 2010 +0200" }, "message": "netfilter: ip_queue: rwlock to spinlock conversion\n\nConverts queue_lock rwlock to a spinlock.\n\n(readlocked part can be changed by reads of integer values)\n\nOne atomic operation instead of four per ipq_enqueue_packet() call.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "2bf074825403e0e0d623bac7573580773b78abef", "tree": "eb4904cbc35df4db627a79df0f5c7c29ebfd556a", "parents": [ "b3c5163fe0193a74016dba1bb22491e0d1e9aaa4" ], "author": { "name": "Shan Wei", "email": "shanwei@cn.fujitsu.com", "time": "Wed Jun 09 14:47:40 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Wed Jun 09 14:47:40 2010 +0200" }, "message": "netfilter: xt_sctp: use WORD_ROUND macro to calculate length of multiple of 4 bytes\n\nUse WORD_ROUND to round an int up to the next multiple of 4.\n\nSigned-off-by: Shan Wei \u003cshanwei@cn.fujitsu.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "b3c5163fe0193a74016dba1bb22491e0d1e9aaa4", "tree": "fc52d035b431969c034a1033e1c70803dd9ef219", "parents": [ "5bfddbd46a95c978f4d3c992339cbdf4f4b790a3" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jun 09 14:43:38 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Wed Jun 09 14:43:38 2010 +0200" }, "message": "netfilter: nf_conntrack: per_cpu untracking\n\nNOTRACK makes all cpus share a cache line on nf_conntrack_untracked\ntwice per packet, slowing down performance.\n\nThis patch converts it to a per_cpu variable.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "b054b747a694927879c94dd11af54d04346aed7d", "tree": "91651e415fde622e53551286dd57279a4661e7cf", "parents": [ "6db6340c42d027b6364d49fa99d69019aca24de4" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Mon Jun 07 21:50:07 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jun 08 14:41:54 2010 -0400" }, "message": "mac80211: fix deauth before assoc\n\nWhen we receive a deauthentication frame before\nhaving successfully associated, we neither print\na message nor abort assocation. The former makes\nit hard to debug, while the latter later causes\na warning in cfg80211 when, as will typically be\nthe case, association timed out.\n\nThis warning was reported by many, e.g. in\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d15981,\nbut I couldn\u0027t initially pinpoint it. I verified\nthe fix by hacking hostapd to send a deauth frame\ninstead of an association response.\n\nCc: stable@kernel.org\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nTested-by: Miles Lane \u003cmiles.lane@gmail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "6db6340c42d027b6364d49fa99d69019aca24de4", "tree": "ac8e547e4f22edfaed9336899807112dbb185847", "parents": [ "35dd0509b21e4b5bab36b9eb80c8dab0322f5007" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Mon Jun 07 21:20:38 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jun 08 14:34:08 2010 -0400" }, "message": "iwlwifi: add missing rcu_read_lock\n\nUsing ieee80211_find_sta() needs to be under\nRCU read lock, which iwlwifi currently misses,\nso fix it.\n\nCc: stable@kernel.org\nReported-by: Miles Lane \u003cmiles.lane@gmail.com\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nAcked-by: Reinette Chatre \u003creinette.chatre@intel.com\u003e\nTested-by: Miles Lane \u003cmiles.lane@gmail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "5bfddbd46a95c978f4d3c992339cbdf4f4b790a3", "tree": "9291ba4e1e3c7bf7ae8b5dfa8271e7127a6a6958", "parents": [ "339bb99e4a8ba1f8960eed21d50be808b35ad22a" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Jun 08 16:09:52 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Jun 08 16:09:52 2010 +0200" }, "message": "netfilter: nf_conntrack: IPS_UNTRACKED bit\n\nNOTRACK makes all cpus share a cache line on nf_conntrack_untracked\ntwice per packet. This is bad for performance.\n__read_mostly annotation is also a bad choice.\n\nThis patch introduces IPS_UNTRACKED bit so that we can use later a\nper_cpu untrack structure more easily.\n\nA new helper, nf_ct_untracked_get() returns a pointer to\nnf_conntrack_untracked.\n\nAnother one, nf_ct_untracked_status_or() is used by nf_nat_init() to add\nIPS_NAT_DONE_MASK bits to untracked status.\n\nnf_ct_is_untracked() prototype is changed to work on a nf_conn pointer.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "832c10fd733893f86c63bde1c65b005d5a2fe346", "tree": "4c46420f7a8ac9f0261205383489dea4b042d91c", "parents": [ "abe37c4b84502d6931e04e94c9c2c45b4da8c889" ], "author": { "name": "Grazvydas Ignotas", "email": "notasas@gmail.com", "time": "Tue Jun 08 14:33:31 2010 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jun 08 09:31:21 2010 -0400" }, "message": "wl1251: fix ELP_CTRL register reads\n\nReading the ELP_CTRL register with sdio_readb causes problems because\nhardware seems to be performing a write using stuff bits in the request\n(those bits contain write data in write request). This indicates that it\nactually expects RAW (read after write) type of request, so perform that\nwhen reading ELP_CTRL instead. Also cache last written value so we know\nwhat to write when doing RAW request.\n\nBecause of the above it was not possible to wake the chip from ELP power\nsaving mode, PM had to be disabled to have the driver usable in SDIO\nmode. After this patch PM is functional.\n\nFor backporting to 2.6.34 or earlier, this patch depends on\n6c1f716e8154ee9315534782b9b1eedea0559a24, which adds the\nrequired SDIO funcion.\n\nSigned-off-by: Grazvydas Ignotas \u003cnotasas@gmail.com\u003e\nAcked-by: Kalle Valo \u003ckvalo@adurom.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "abe37c4b84502d6931e04e94c9c2c45b4da8c889", "tree": "2f89cecdd07faa27b8cc41944eb018e13c07d8b7", "parents": [ "90b726097ba0dcc1f9725182513e669a30e77db5" ], "author": { "name": "Johannes Berg", "email": "johannes@sipsolutions.net", "time": "Mon Jun 07 11:12:27 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jun 08 09:31:21 2010 -0400" }, "message": "wireless: fix kernel-doc\n\nFix a whole bunch of kernel-doc warnings\nand errors that crop up when running it on\nmac80211 and cfg80211; the latter isn\u0027t\nnormally done so lots of bit-rot happened.\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "90b726097ba0dcc1f9725182513e669a30e77db5", "tree": "34e18b515c3f3d39b3f604ee2034441b85f23c3a", "parents": [ "3cfd43f484c8d4bcb38db83f7be19fbd4ac8440c" ], "author": { "name": "Juuso Oikarinen", "email": "juuso.oikarinen@nokia.com", "time": "Mon Jun 07 10:52:12 2010 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jun 08 09:31:21 2010 -0400" }, "message": "mac80211: Add netif state checking to ieee80211_ifa_changed\n\nThere\u0027s a window for ieee80211_ifa_changed() to get called whilst the\nmanaged mode mutex has not been initialized when opening and stopping the\ninterface. Currently this causes a kernel BUG like the following:\n\n[ 132.460013] kernel BUG at /home/wifi/iwlwifi-2.6/net/mac80211/main.c:380!\n[ 132.460013] invalid opcode: 0000 [#1] SMP\n\nThe mutex is initialized during open(), hence once netif_running() is true,\nthe mutex should be valid. Fix by adding a netif_running() check to the\nfunction.\n\nReported-by: Reinette Chatre \u003creinette.chatre@intel.com\u003e\nSigned-off-by: Juuso Oikarinen \u003cjuuso.oikarinen@nokia.com\u003e\nTested-by: Reinette Chatre \u003creinette.chatre@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "3cfd43f484c8d4bcb38db83f7be19fbd4ac8440c", "tree": "55c9fdabb0c0e9b02c3b634859e338d8c3023370", "parents": [ "20fbed21e934355ee00850f6dead22be3147893f" ], "author": { "name": "Bruno Randolf", "email": "br1@einfach.org", "time": "Mon Jun 07 13:11:40 2010 +0900" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jun 08 09:31:21 2010 -0400" }, "message": "ath5k: add debugfs file for queue debugging\n\nSigned-off-by: Bruno Randolf \u003cbr1@einfach.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "20fbed21e934355ee00850f6dead22be3147893f", "tree": "af00747418f8fa4383c6485804180ade94ff1454", "parents": [ "0ca74027ac709f99aae1805e593c95843dd18234" ], "author": { "name": "Bruno Randolf", "email": "br1@einfach.org", "time": "Mon Jun 07 13:11:35 2010 +0900" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jun 08 09:31:21 2010 -0400" }, "message": "ath5k: no need to save/restore the default antenna\n\nSince ath5k_hw_set_antenna_mode() always writes the default antenna register\nand is called at the end of reset, there is no need to separately save and\nrestore the default antenna.\n\nSigned-off-by: Bruno Randolf \u003cbr1@einfach.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "0ca74027ac709f99aae1805e593c95843dd18234", "tree": "282f5e8e943632a202e64bc3a60351a45f2679a4", "parents": [ "39d5b2c83ca8904b6826a0713263a4e5a9c0730a" ], "author": { "name": "Bruno Randolf", "email": "br1@einfach.org", "time": "Mon Jun 07 13:11:30 2010 +0900" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jun 08 09:31:20 2010 -0400" }, "message": "ath5k: new function for setting the antenna switch table\n\nCollect all pieces concering the antenna switch table into one function.\nPreviously it was split up between ath5k_hw_reset() and\nath5k_hw_commit_eeprom_settings().\n\nAlso we need to set the antenna switch table when ath5k_hw_set_antenna_mode()\nis called manually (by \"iw phy0 antenna set\", for example).\n\nI\u0027m not sure if we need to set the switchtable at the same place in\nath5k_hw_reset() as it was before - it is set later thru\nath5k_hw_set_antenna_mode() anyways - but i leave it there to avoid\nproblems(?).\n\nPlus print switchtable registers in the debugfs file.\n\nSigned-off-by: Bruno Randolf \u003cbr1@einfach.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "39d5b2c83ca8904b6826a0713263a4e5a9c0730a", "tree": "f808861ade19d3f138d358a77261285f95684ae3", "parents": [ "84efa0e7aab9f41451bdf4bff5e2414bb59c6a93" ], "author": { "name": "Bruno Randolf", "email": "br1@einfach.org", "time": "Mon Jun 07 13:11:25 2010 +0900" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jun 08 09:31:20 2010 -0400" }, "message": "ath5k: update AR5K_PHY_RESTART_DIV_GC values to match masks\n\n#define AR5K_PHY_RESTART_DIV_GC 0x001c0000\nis 3 bit wide.\n\nThe previous values of 0xc and 0x8 are 4bit wide and bigger than the mask.\n\nWriting 0 and 1 to AR5K_PHY_RESTART_DIV_GC is consistent with the comments and\ninitvals we have in the HAL.\n\nSigned-off-by: Bruno Randolf \u003cbr1@einfach.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "84efa0e7aab9f41451bdf4bff5e2414bb59c6a93", "tree": "ccabc600c6c4ef5772995b48c6ee58fc21094dd6", "parents": [ "a5fdbcad0a3f461d43f7b801f8fc176cd2840704" ], "author": { "name": "Sascha Silbe", "email": "sascha-pgp@silbe.org", "time": "Sat Jun 05 13:30:12 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jun 08 09:31:20 2010 -0400" }, "message": "libertas: Fix ethtool reporting no WOL options supported if WOL is not already active\n\nThis patch fixes the libertas driver incorrectly reporting that Wake-on-LAN\nis not supported if Wake-on-LAN is currently disabled.\n\nSigned-off-by: Sascha Silbe \u003csascha-pgp@silbe.org\u003e\nAcked-by: Dan Williams \u003cdcbw@redhat.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "339bb99e4a8ba1f8960eed21d50be808b35ad22a", "tree": "077f679c919b00331569622e035a822e94492377", "parents": [ "e12f8e29a8526172b7715881503bae636d60bdd8" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Jun 08 14:11:19 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Jun 08 14:11:19 2010 +0200" }, "message": "netfilter: xt_rateest: Better struct xt_rateest layout\n\nWe currently dirty two cache lines in struct xt_rateest, this hurts SMP\nperformance.\n\nThis patch moves lock/bstats/rstats at beginning of structure so that\nthey share a single cache line.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "bb69ae049fcc986fcd742eb90ca0d44a7a49c9f1", "tree": "22f9aa03f9f59139ece8ef1484fe5d4a5b86bd47", "parents": [ "6e8b11b43b0c2e901734e2cdd70c6e325a90c4ef" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Jun 07 11:42:13 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 07 22:49:25 2010 -0700" }, "message": "anycast: Some RCU conversions\n\n- dev_get_by_flags() changed to dev_get_by_flags_rcu()\n\n- ipv6_sock_ac_join() dont touch dev \u0026 idev refcounts\n- ipv6_sock_ac_drop() dont touch dev \u0026 idev refcounts\n- ipv6_sock_ac_close() dont touch dev \u0026 idev refcounts\n- ipv6_dev_ac_dec() dount touch idev refcount\n- ipv6_chk_acast_addr() dont touch idev refcount\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Hideaki YOSHIFUJI \u003cyoshfuji@linux-ipv6.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6e8b11b43b0c2e901734e2cdd70c6e325a90c4ef", "tree": "867d740b9969f749890dabaa252f78232af467b3", "parents": [ "ed7865a47d4759e85bbd7bed44bee411d868eaad" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Jun 07 03:54:46 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 07 21:49:51 2010 -0700" }, "message": "net: avoid two atomic ops in ip_rcv_options()\n\nin_dev_get() -\u003e __in_dev_get_rcu() in a rcu protected function.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ed7865a47d4759e85bbd7bed44bee411d868eaad", "tree": "f0d2bd7d1f6c2c9d962baf84d2041a5b8c1c6b64", "parents": [ "9a57a9d291980302b4a3184fbc47dbddac71903e" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Jun 07 21:49:44 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 07 21:49:44 2010 -0700" }, "message": "ipv4: avoid two atomic ops in ip_rt_redirect()\n\nin_dev_get() -\u003e __in_dev_get_rcu() in a rcu protected function.\n\n[ Fix build with CONFIG_IP_ROUTE_VERBOSE disabled. -DaveM ]\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9a57a9d291980302b4a3184fbc47dbddac71903e", "tree": "f7e28ced28e4615074ceaf6ab4750a9630cdba95", "parents": [ "66018506e15bea62de4eefc3298f170b4bfcf5ef" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Jun 07 03:17:10 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 07 21:25:21 2010 -0700" }, "message": "igmp: avoid two atomic ops in igmp_rcv()\n\nin_dev_get() -\u003e __in_dev_get_rcu() in a rcu protected function.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "66018506e15bea62de4eefc3298f170b4bfcf5ef", "tree": "d2dbf5c06e317b85f75b946a1b63ed0917d0382a", "parents": [ "8b37ef0a1f6c2401fea3536facfa21191936bd6c" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Jun 07 03:12:08 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 07 21:25:21 2010 -0700" }, "message": "ip: Router Alert RCU conversion\n\nStraightforward conversion to RCU.\n\nOne rwlock becomes a spinlock, and is static.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8b37ef0a1f6c2401fea3536facfa21191936bd6c", "tree": "57c0933abf47485aa22d94bb3810341a9702b03b", "parents": [ "271c1dfa61bc90a57648ff96f3eb92d4b4d4f11e" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Mon Jun 07 01:36:29 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 07 21:25:20 2010 -0700" }, "message": "macvlan: use call_rcu for port free\n\nUse call_rcu rather than synchronize_rcu.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a5fdbcad0a3f461d43f7b801f8fc176cd2840704", "tree": "84291b3194d2ec25a09e45231289ea6cd26a284d", "parents": [ "9d88477c41904127ab9ae1f3b5b4a39bf6474043" ], "author": { "name": "Prarit Bhargava", "email": "prarit@redhat.com", "time": "Thu May 27 14:14:54 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 07 15:14:53 2010 -0400" }, "message": "ath: Fix uninitialized variable warnings\n\nFixes \u0027make -j24 CONFIG_DEBUG_SECTION_MISMATCH\u003dy\u0027 warning:\n\ndrivers/net/wireless/ath/ath9k/eeprom_4k.c: In function ‘ath9k_hw_get_4k_gain_boundaries_pdadcs.clone.1’:\ndrivers/net/wireless/ath/ath9k/eeprom_4k.c:311: error: ‘minPwrT4’ may be used uninitialized in this function\ndrivers/net/wireless/ath/ath9k/eeprom_9287.c: In function ‘ath9k_hw_get_AR9287_gain_boundaries_pdadcs’:\ndrivers/net/wireless/ath/ath9k/eeprom_9287.c:302: error: ‘minPwrT4’ may be used uninitialized in this function\ndrivers/net/wireless/ath/ath9k/eeprom_def.c: In function ‘ath9k_hw_get_def_gain_boundaries_pdadcs.clone.0’:\ndrivers/net/wireless/ath/ath9k/eeprom_def.c:679: error: ‘minPwrT4’ may be used uninitialized in this function\n\nSigned-off-by: Prarit Bhargava \u003cprarit@redhat.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "9d88477c41904127ab9ae1f3b5b4a39bf6474043", "tree": "f50d5185ac89a9fd76d7cb087b952d5c55d5063b", "parents": [ "11b7c60988e5fbabb4e150612931cc068559af16", "35dd0509b21e4b5bab36b9eb80c8dab0322f5007" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 07 15:13:46 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 07 15:13:46 2010 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n\nConflicts:\n\tdrivers/net/wireless/iwlwifi/iwl-core.h\n" }, { "commit": "11b7c60988e5fbabb4e150612931cc068559af16", "tree": "533364fe997071c4cab3f1ff44dcd9e496c6f55e", "parents": [ "dc1dfe47445d45b3076ea940dda8f46a4b96e386" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 07 15:02:17 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 07 15:09:16 2010 -0400" }, "message": "mac80211: fix lock leak w/ ARP filtering and w/o CONFIG_INET\n\n\"mac80211: make ARP filtering depend on CONFIG_INET\" introduced this\npotential locking leak.\n\nReported-by: Juuso Oikarinen \u003cjuuso.oikarinen@nokia.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "dc1dfe47445d45b3076ea940dda8f46a4b96e386", "tree": "f3b62e6c518f2e09132c4a0cafaeb462d7aa36cf", "parents": [ "f668da2f150948a961d359c65b5e9d62da1290e2" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 07 14:16:11 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 07 15:09:12 2010 -0400" }, "message": "iwlwifi: fix-up botched revert\n\nIn the revert of \"iwlwifi: move _agn statistics related structure\", I\nneed to use CONFIG_IWLWIFI_DEBUGFS instead of CONFIG_IWLWIFI_DEBUG in\nthe private structure definition. Without this patch, it is possible\nto get this:\n\ndrivers/net/wireless/iwlwifi/iwl-rx.c: In function \u0027iwl_accumulative_statistics\u0027:\ndrivers/net/wireless/iwlwifi/iwl-rx.c:304: error: \u0027struct iwl_priv\u0027 has no member named \u0027accum_statistics\u0027\ndrivers/net/wireless/iwlwifi/iwl-rx.c:305: error: \u0027struct iwl_priv\u0027 has no member named \u0027delta_statistics\u0027\ndrivers/net/wireless/iwlwifi/iwl-rx.c:306: error: \u0027struct iwl_priv\u0027 has no member named \u0027max_delta\u0027\ndrivers/net/wireless/iwlwifi/iwl-rx.c:321: error: \u0027struct iwl_priv\u0027 has no member named \u0027accum_statistics\u0027\ndrivers/net/wireless/iwlwifi/iwl-rx.c:323: error: \u0027struct iwl_priv\u0027 has no member named \u0027accum_statistics\u0027\ndrivers/net/wireless/iwlwifi/iwl-rx.c:325: error: \u0027struct iwl_priv\u0027 has no member named \u0027accum_statistics\u0027\ndrivers/net/wireless/iwlwifi/iwl-rx.c:327: error: \u0027struct iwl_priv\u0027 has no member named \u0027accum_statistics\u0027\ndrivers/net/wireless/iwlwifi/iwl-rx.c:329: error: \u0027struct iwl_priv\u0027 has no member named \u0027accum_statistics\u0027\ndrivers/net/wireless/iwlwifi/iwl-rx.c:331: error: \u0027struct iwl_priv\u0027 has no member named \u0027accum_statistics\u0027\ndrivers/net/wireless/iwlwifi/iwl-rx.c: In function \u0027iwl_reply_statistics\u0027:\ndrivers/net/wireless/iwlwifi/iwl-rx.c:484: error: \u0027struct iwl_priv\u0027 has no member named \u0027accum_statistics\u0027\ndrivers/net/wireless/iwlwifi/iwl-rx.c:486: error: \u0027struct iwl_priv\u0027 has no member named \u0027delta_statistics\u0027\ndrivers/net/wireless/iwlwifi/iwl-rx.c:488: error: \u0027struct iwl_priv\u0027 has no member named \u0027max_delta\u0027\n\nReported-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "35dd0509b21e4b5bab36b9eb80c8dab0322f5007", "tree": "ff718895d1e443d2aa831fea2d579c547a3082f3", "parents": [ "e500ae5b535a5209fd397fcc542e3b3290fc2fc5" ], "author": { "name": "Holger Schurig", "email": "holgerschurig@gmail.com", "time": "Mon Jun 07 16:33:49 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 07 14:44:40 2010 -0400" }, "message": "mac80211: fix function pointer check\n\nThis makes \"iw wlan0 dump survey\" work again with\nmac80211-based drivers that support it, e.g. ath5k.\n\nSigned-off-by: Holger Schurig \u003cholgerschurig@gmail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "e500ae5b535a5209fd397fcc542e3b3290fc2fc5", "tree": "70789cb6ae278fd0dfd8d1d95a798317e2de400d", "parents": [ "436c109adb54433fff689abd71c23a6505e46bb0" ], "author": { "name": "Zhu Yi", "email": "yi.zhu@intel.com", "time": "Mon Jun 07 14:15:43 2010 +0800" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 07 14:44:40 2010 -0400" }, "message": "wireless: remove my name from the maintainer list\n\nRemove my name from the MAINTAINERS file.\n\nSigned-off-by: Zhu Yi \u003cyi.zhu@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "436c109adb54433fff689abd71c23a6505e46bb0", "tree": "ad7860f0d757f83b439e2cf6d5a9ef8dc0e1a6e7", "parents": [ "0f666a08901f8b01f294ca0ad751019375240ae3" ], "author": { "name": "Bruno Randolf", "email": "br1@einfach.org", "time": "Mon Jun 07 13:11:19 2010 +0900" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 07 14:43:57 2010 -0400" }, "message": "ath5k: fix NULL pointer in antenna configuration\n\nIf the channel is not set yet and we configure the antennas just store the\nsetting. It will be activated during the next reset, when the channel is set.\n\nSigned-off-by: Bruno Randolf \u003cbr1@einfach.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "0f666a08901f8b01f294ca0ad751019375240ae3", "tree": "a930a2baf60a87143ba3a7152273b32adaa49224", "parents": [ "aa679c36756003f1fabdb9fc6f00eb159559f7c3" ], "author": { "name": "Jason Dravet", "email": "dravet@hotmail.com", "time": "Sat Jun 05 15:08:29 2010 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 07 14:42:52 2010 -0400" }, "message": "p54usb: Add device ID for Dell WLA3310 USB\n\nAdd Dell WLA3310 USB wireless card, which has a Z-Com XG-705A chipset, to the\nUSB Ids in p54usb.\n\nSigned-off-by: Jason Dravet \u003cdravet@hotmail.com\u003e\nTested-by: Richard Gregory Tillmore \u003crtillmore@gmail.com\u003e\nSigned-off-by: Larry Finger \u003cLarry.Finger@lwfinger.net\u003e\nAcked-by: Christian Lamparter \u003cchunkeey@googlemail.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "aa679c36756003f1fabdb9fc6f00eb159559f7c3", "tree": "a59541ac3983582e50b4f9e4fdca49a4177754cd", "parents": [ "7d47618a2ade0cb6d8a0b2597029c383c1662fa0" ], "author": { "name": "Grazvydas Ignotas", "email": "notasas@gmail.com", "time": "Sat Jun 05 02:25:47 2010 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 07 14:42:51 2010 -0400" }, "message": "wl1251: fix a memory leak in probe\n\nwl1251_sdio_probe() error path is missing wl1251_free_hw, add it.\n\nSigned-off-by: Grazvydas Ignotas \u003cnotasas@gmail.com\u003e\nAcked-by: Kalle Valo \u003ckvalo@adurom.com\u003e\nCc: stable@kernel.org\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "035320d54758e21227987e3aae0d46e7a04f4ddc", "tree": "9ad66a45ab0b0d903ebcbe435894d1fb9d5d78f5", "parents": [ "3fd7fa4a89f0b85b9b33e922f15a2289c0fb8499" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sun Jun 06 23:48:40 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 07 02:57:14 2010 -0700" }, "message": "ipmr: dont corrupt lists\n\nipmr_rules_exit() and ip6mr_rules_exit() free a list of items, but\nforget to properly remove these items from list. List head is not\nchanged and still points to freed memory.\n\nThis can trigger a fault later when icmpv6_sk_exit() is called.\n\nFix is to either reinit list, or use list_del() to properly remove items\nfrom list before freeing them.\n\nbugzilla report : https://bugzilla.kernel.org/show_bug.cgi?id\u003d16120\n\nIntroduced by commit d1db275dd3f6e4 (ipv6: ip6mr: support multiple\ntables) and commit f0ad0860d01e (ipv4: ipmr: support multiple tables)\n\nReported-by: Alex Zhavnerchik \u003calex.vizor@gmail.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3fd7fa4a89f0b85b9b33e922f15a2289c0fb8499", "tree": "b945b7fb52aada745b386f12392e86f997c6814d", "parents": [ "9227a46bfbac0516fb7428715a095e1bc59b872a" ], "author": { "name": "Denis Kirjanov", "email": "dkirjanov@kernel.org", "time": "Mon Jun 07 01:13:57 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 07 01:13:57 2010 -0700" }, "message": "8139too: fix buffer overrun in rtl8139_init_board\n\nFix rtl_chip_info buffer overrun when we can\u0027t identify the chip.\n(i \u003d ARRAY_SIZE (rtl_chip_info) in this case)\n\nSigned-off-by: Denis Kirjanov \u003cdkirjanov@kernel.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "271c1dfa61bc90a57648ff96f3eb92d4b4d4f11e", "tree": "4c49a74ec730279a6aa0fe05eeedb1f652f73a03", "parents": [ "9dacaf17a60101a55d456cc7b00e269d8145aa0d" ], "author": { "name": "jamal", "email": "hadi@cyberus.ca", "time": "Fri Jun 04 02:06:22 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 07 01:10:44 2010 -0700" }, "message": "net: Remove unnecessary net action assertion\n\nThe extra assertion to allow packet munging only when there are\nno other ptypes listening which may have worked around an old bug\nis unnecessary. It is sufficient to check if the skb is cloned before\ntrampling on it. Thanks to Herbert Xu for being persistent and patient\nin getting this across.\n[Note that cloning checks and assertions are the general rule used\nby tc actions (documentation/networking/tc-actions-env-rules.txt)].\n\nSigned-off-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9dacaf17a60101a55d456cc7b00e269d8145aa0d", "tree": "ed5996e4d799559f8f91fdb09ec989042b8f4c0e", "parents": [ "f2a03367c072150c881fa23ce3d3f76b8236018f" ], "author": { "name": "jamal", "email": "hadi@cyberus.ca", "time": "Fri Jun 04 02:43:06 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 07 01:10:43 2010 -0700" }, "message": "net sched: make pedit check for clones instead\n\nNow that the core path doesnt set OK to munge we detect\nwritable skbs by looking to see if they are cloned.\n\nSigned-off-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f2a03367c072150c881fa23ce3d3f76b8236018f", "tree": "52b98e8b034352f8afd9c6b2974f85f3b9171ed4", "parents": [ "fa6ca57113c2fd2d86dd854e0bc5e18b9786282b" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Fri Jun 04 01:33:33 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 07 01:08:11 2010 -0700" }, "message": "htb: remove two unnecessary assignments\n\nremove two unnecessary assignments\n\nwe don\u0027t need to assign NULL when initialize structure objects.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\n----\n net/sched/sch_htb.c | 2 --\n 1 file changed, 2 deletions(-)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fa6ca57113c2fd2d86dd854e0bc5e18b9786282b", "tree": "31778a23f379c2f0bf0fa4cabe3fe46fa812132e", "parents": [ "1789a640f55658d9a54c1868cc3405e4d85dbd8e" ], "author": { "name": "Tobias Klauser", "email": "tklauser@distanz.ch", "time": "Thu Jun 03 20:24:21 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 07 01:08:11 2010 -0700" }, "message": "greth: Remove unnecessary memset of napi member in netdev private data\n\nThe memory for the private data is allocated using kzalloc in\nalloc_etherdev (or alloc_netdev_mq respectively) so there is no need to\nset the napi member to 0 explicitely.\n\nSigned-off-by: Tobias Klauser \u003ctklauser@distanz.ch\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" } ], "next": "1789a640f55658d9a54c1868cc3405e4d85dbd8e" }