)]}' { "log": [ { "commit": "fa6dd8a2c89861d05621ce7e2880e485bec22fba", "tree": "8636aee24a084dc6b530cc8c0e06c283429d037e", "parents": [ "f76957fc8fc4fa9735f01e59653b2792b077de06" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Tue Jan 11 08:04:12 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 11 14:03:09 2011 -0800" }, "message": "xfrm: check trunc_len in XFRMA_ALG_AUTH_TRUNC\n\nMaximum trunc length is defined by MAX_AH_AUTH_LEN (in bytes)\nand need to be checked when this value is set (in bits) by\nthe user. In ah4.c and ah6.c a BUG_ON() checks this condiftion.\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0ab03c2b1478f2438d2c80204f7fef65b1bca9cf", "tree": "a130abc7a3cc2d5c326b1bbdad80c06e741db3fd", "parents": [ "dba5a68ae147d0672d4b9259f3ece37777f8b2fa" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Fri Jan 07 03:15:05 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 09 16:25:03 2011 -0800" }, "message": "netlink: test for all flags of the NLM_F_DUMP composite\n\nDue to NLM_F_DUMP is composed of two bits, NLM_F_ROOT | NLM_F_MATCH,\nwhen doing \"if (x \u0026 NLM_F_DUMP)\", it tests for _either_ of the bits\nbeing set. Because NLM_F_MATCH\u0027s value overlaps with NLM_F_EXCL,\nnon-dump requests with NLM_F_EXCL set are mistaken as dump requests.\n\nSubstitute the condition to test for _all_ bits being set.\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\nAcked-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b4aa9e05a61b845541fa6f5b1d246976922601f0", "tree": "ca94478c3df281ab76a3399f5ba6341ade3f5791", "parents": [ "1dc0f3c54ce1df957f99c17b145488fd03eb1a59", "4b8fe66300acb2fba8b16d62606e0d30204022fc" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 17 12:27:22 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 17 12:27:22 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/bnx2x/bnx2x.h\n\tdrivers/net/wireless/iwlwifi/iwl-1000.c\n\tdrivers/net/wireless/iwlwifi/iwl-6000.c\n\tdrivers/net/wireless/iwlwifi/iwl-core.h\n\tdrivers/vhost/vhost.c\n" }, { "commit": "d33e455337ea2c71d09d7f4367d6ad6dd32b6965", "tree": "d1b35b1be5ab73df6f7e57b86a2e68fad2990adf", "parents": [ "9fe146aef44afe5ec677d8150b6ae94e09b773f7" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 14 13:01:14 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 14 13:01:14 2010 -0800" }, "message": "net: Abstract default MTU metric calculation behind an accessor.\n\nLike RTAX_ADVMSS, make the default calculation go through a dst_ops\nmethod rather than caching the computation in the routing cache\nentries.\n\nNow dst metrics are pretty much left as-is when new entries are\ncreated, thus optimizing metric sharing becomes a real possibility.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0dbaee3b37e118a96bb7b8eb0d9bbaeeb46264be", "tree": "37000c5d7e663e4ae9800a7bcde9934984b8bae9", "parents": [ "cc6f02dd490dac4ad821d5077b934c9b37037cd0" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 13 12:52:14 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 13 12:52:14 2010 -0800" }, "message": "net: Abstract default ADVMSS behind an accessor.\n\nMake all RTAX_ADVMSS metric accesses go through a new helper function,\ndst_metric_advmss().\n\nLeave the actual default metric as \"zero\" in the real metric slot,\nand compute the actual default value dynamically via a new dst_ops\nAF specific callback.\n\nFor stacked IPSEC routes, we use the advmss of the path which\npreserves existing behavior.\n\nUnlike ipv4/ipv6, DecNET ties the advmss to the mtu and thus updates\nadvmss on pmtu updates. This inconsistency in advmss handling\nresults in more raw metric accesses than I wish we ended up with.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "35d2856b4693e8de5d616307b56cef296b839157", "tree": "ad267bf9f3312b2d64bec8b4912178577a8cb71e", "parents": [ "957fca95e3521e471aac4c2e4cfbc21f399bdd84" ], "author": { "name": "Martin Willi", "email": "martin@strongswan.org", "time": "Wed Dec 08 04:37:49 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 10 14:43:58 2010 -0800" }, "message": "xfrm: Add Traffic Flow Confidentiality padding XFRM attribute\n\nThe XFRMA_TFCPAD attribute for XFRM state installation configures\nTraffic Flow Confidentiality by padding ESP packets to a specified\nlength.\n\nSigned-off-by: Martin Willi \u003cmartin@strongswan.org\u003e\nAcked-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "78347c8c6b2ddf20535bc1b18d749a3bbdea2a60", "tree": "2aa2048f11a93c4319b023e938eee387d19c96f4", "parents": [ "fb4fa76a1fa59340154c42d998d700e1f8bf21e0" ], "author": { "name": "Thomas Egerer", "email": "thomas.egerer@secunet.com", "time": "Mon Dec 06 23:28:56 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 09 20:35:27 2010 -0800" }, "message": "xfrm: Fix xfrm_state_migrate leak\n\nxfrm_state_migrate calls kfree instead of xfrm_state_put to free\na failed state. According to git commit 553f9118 this can cause\nmemory leaks.\n\nSigned-off-by: Thomas Egerer \u003cthomas.egerer@secunet.com\u003e\nSigned-off-by: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\nAcked-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "defb3519a64141608725e2dac5a5aa9a3c644bae", "tree": "2f44985e44aef53a0d99991b9f5c2f0eb6dbf4ad", "parents": [ "84b3cdc38cd2882d7ac3c2ae4b6faf5c199874e3" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 08 21:16:57 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 09 10:46:36 2010 -0800" }, "message": "net: Abstract away all dst_entry metrics accesses.\n\nUse helper functions to hide all direct accesses, especially writes,\nto dst_entry metrics values.\n\nThis will allow us to:\n\n1) More easily change how the metrics are stored.\n\n2) Implement COW for metrics.\n\nIn particular this will help us put metrics into the inetpeer\ncache if that is what we end up doing. We can make the _metrics\nmember a pointer instead of an array, initially have it point\nat the read-only metrics in the FIB, and then on the first set\ngrab an inetpeer entry and point the _metrics member there.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\n" }, { "commit": "7a1c8e5ab120a5f352e78bbc1fa5bb64e6f23639", "tree": "9c9b81e173c59d4be5590be5101c405457acab83", "parents": [ "a6c36ee677607b02d8ecc88e8a12785418b88107" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sat Nov 20 07:46:35 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 21 10:04:04 2010 -0800" }, "message": "net: allow GFP_HIGHMEM in __vmalloc()\n\nWe forgot to use __GFP_HIGHMEM in several __vmalloc() calls.\n\nIn ceph, add the missing flag.\n\nIn fib_trie.c, xfrm_hash.c and request_sock.c, using vzalloc() is\ncleaner and allows using HIGHMEM pages as well.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1c4c40c42da468ef02dc04940930c1926c964558", "tree": "3285bd36ab5ff41a24245e94e50016d5bf45bedf", "parents": [ "8d8a0b1cc2a8f9794a3f1f747089b6a93774408d" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Fri Oct 15 05:14:19 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 21 03:09:46 2010 -0700" }, "message": "xfrm: make xfrm_bundle_ok local\n\nOnly used in one place.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8444cf712c5f71845cba9dc30d8f530ff0d5ff83", "tree": "3283983551829eb3f985a92d49ec65ac8e487268", "parents": [ "842c74bffcdb1d305ccd9e61e417cceae86b9963" ], "author": { "name": "Thomas Egerer", "email": "thomas.egerer@secunet.com", "time": "Mon Sep 20 11:11:38 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 20 11:11:38 2010 -0700" }, "message": "xfrm: Allow different selector family in temporary state\n\nThe family parameter xfrm_state_find is used to find a state matching a\ncertain policy. This value is set to the template\u0027s family\n(encap_family) right before xfrm_state_find is called.\nThe family parameter is however also used to construct a temporary state\nin xfrm_state_find itself which is wrong for inter-family scenarios\nbecause it produces a selector for the wrong family. Since this selector\nis included in the xfrm_user_acquire structure, user space programs\nmisinterpret IPv6 addresses as IPv4 and vice versa.\nThis patch splits up the original init_tempsel function into a part that\ninitializes the selector respectively the props and id of the temporary\nstate, to allow for differing ip address families whithin the state.\n\nSigned-off-by: Thomas Egerer \u003cthomas.egerer@secunet.com\u003e\nSigned-off-by: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e71895a1beff2014534c9660d9ae42e043f11555", "tree": "bec0ddc23b1176cac8f3a53b76aa8f2bc5e653a1", "parents": [ "801e147cde02f04b5c2f42764cd43a89fc7400a2" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Sep 16 12:27:50 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 16 21:46:15 2010 -0700" }, "message": "xfrm: dont assume rcu_read_lock in xfrm_output_one()\n\nip_local_out() is called with rcu_read_lock() held from ip_queue_xmit()\nbut not from other call sites.\n\nReported-and-bisected-by: Nick Bowler \u003cnbowler@elliptictech.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "928497f0209027ccd649480a38a499fab9c3f6f6", "tree": "c2d86ba0a40d43ea964e8900999c9e3c09076a91", "parents": [ "3b2eb6131e2f6ff646abb0fc69648179b8b70216" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Tue Aug 31 05:54:00 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 01 14:29:35 2010 -0700" }, "message": "xfrm_user: avoid a warning with some compiler\n\nAttached is a small patch to remove a warning (\"warning: ISO C90 forbids\nmixed declarations and code\" with gcc 4.3.2).\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2f09a4d5daaa36690d506fafda9c24f2be866f6b", "tree": "3ad73903ae199c4bc47d029fed7f346ce6406b25", "parents": [ "3c09e2647b5e1f1f9fd383971468823c2505e1b0" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Sat Aug 14 22:38:09 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 14 22:38:09 2010 -0700" }, "message": "xfrm: Use GFP_ATOMIC in xfrm_compile_policy\n\nAs xfrm_compile_policy runs within a read_lock, we cannot use\nGFP_KERNEL for memory allocations.\n\nReported-by: Luca Tettamanti \u003ckronos.it@gmail.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\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": "d809ec895505e6f35fb1965f0946381ab4eaa474", "tree": "479a8937a4fd736ed5db9d87bb3ff81ee60f5cd5", "parents": [ "ab83a38958ae7e419f18fabe9b2954a6087bfe0d" ], "author": { "name": "Timo Teräs", "email": "timo.teras@iki.fi", "time": "Mon Jul 12 21:29:42 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 14 14:16:48 2010 -0700" }, "message": "xfrm: do not assume that template resolving always returns xfrms\n\nxfrm_resolve_and_create_bundle() assumed that, if policies indicated\npresence of xfrms, bundle template resolution would always return\nsome xfrms. This is not true for \u0027use\u0027 level policies which can\nresult in no xfrm\u0027s being applied if there is no suitable xfrm states.\nThis fixes a crash by this incorrect assumption.\n\nReported-by: George Spelvin \u003clinux@horizon.com\u003e\nBisected-by: George Spelvin \u003clinux@horizon.com\u003e\nTested-by: George Spelvin \u003clinux@horizon.com\u003e\nSigned-off-by: Timo Teräs \u003ctimo.teras@iki.fi\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": "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": "b1312c89f0016f778cac4f1536f1434e132f8713", "tree": "6cec9bc88430cf30f8409b8b607d2b6a6d2fd118", "parents": [ "38000a94a902e94ca8b5498f7871c6316de8957a" ], "author": { "name": "Timo Teräs", "email": "timo.teras@iki.fi", "time": "Thu Jun 24 14:35:00 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 24 14:35:00 2010 -0700" }, "message": "xfrm: check bundle policy existance before dereferencing it\n\nFix the bundle validation code to not assume having a valid policy.\nWhen we have multiple transformations for a xfrm policy, the bundle\ninstance will be a chain of bundles with only the first one having\nthe policy reference. When policy_genid is bumped it will expire the\nfirst bundle in the chain which is equivalent of expiring the whole\nchain.\n\nReported-bisected-and-tested-by: Justin P. Mattock \u003cjustinmattock@gmail.com\u003e\nSigned-off-by: Timo Teräs \u003ctimo.teras@iki.fi\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8764ab2ca7ab5055e1ca80f9cfa4970c34acb804", "tree": "ca0a6ea6c6fabbb98220f5b700981f7f23855f42", "parents": [ "4f4aeb7fd0f7e6ca008bb2147ba36cee13876595" ], "author": { "name": "Steffen Klassert", "email": "steffen.klassert@secunet.com", "time": "Fri Jun 04 01:57:38 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 04 15:56:00 2010 -0700" }, "message": "net: check for refcount if pop a stacked dst_entry\n\nxfrm triggers a warning if dst_pop() drops a refcount\non a noref dst. This patch changes dst_pop() to\nskb_dst_pop(). skb_dst_pop() drops the refcnt only\non a refcounted dst. Also we don\u0027t clone the child\ndst_entry, so it is not refcounted and we can use\nskb_dst_set_noref() in xfrm_output_one().\n\nSigned-off-by: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fafeeb6c80e3842c6dc19d05de09a23f23eef0d8", "tree": "47a177d76fa0833a324737e103d5128ad77b231b", "parents": [ "b42d9165e1e3d92e4e3318642463dbe592a12568" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Jun 01 10:04:49 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 02 02:26:39 2010 -0700" }, "message": "xfrm: force a dst reference in __xfrm_route_forward()\n\nPackets going through __xfrm_route_forward() have a not refcounted dst\nentry, since we enabled a noref forwarding path.\n\nxfrm_lookup() might incorrectly release this dst entry.\n\nIt\u0027s a bit late to make invasive changes in xfrm_lookup(), so lets force\na refcount in this path.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3fa21e07e6acefa31f974d57fba2b6920a7ebd1a", "tree": "4254644ef2579e9ac96db6ec0535b5e4231fd18e", "parents": [ "b60b6592baa69c43a5a0f55d6300a7feaab15338" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Mon May 17 23:08:21 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 17 23:23:14 2010 -0700" }, "message": "net: Remove unnecessary returns from void function()s\n\nThis patch removes from net/ (but not any netfilter files)\nall the unnecessary return; statements that precede the\nlast closing brace of void functions.\n\nIt does not remove the returns that are immediately\npreceded by a label as gcc doesn\u0027t like that.\n\nDone via:\n$ grep -rP --include\u003d*.[ch] -l \"return;\\n}\" net/ | \\\n xargs perl -i -e \u0027local $/ ; while (\u003c\u003e) { s/\\n[ \\t\\n]+return;\\n}/\\n}/g; print; }\u0027\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "62db5cfd70b1ef53aa21f144a806fe3b78c84fab", "tree": "b08a24636d467885a543ae5b762d52ee6e6cb168", "parents": [ "6ff9c3644e72bfac20844e0155c2cc8108602820" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Wed May 12 06:37:06 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 17 23:23:13 2010 -0700" }, "message": "xfrm: add severity to printk\n\nSerious oh sh*t messages converted to WARN().\nAdd KERN_NOTICE severity to the unknown policy type messages.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ccbd6a5a4f76e821ed36f69fdaf59817c3a7f18e", "tree": "9fd681809e588913cc312f63ae0e701f18599afc", "parents": [ "935e2a26b85003c0bd52b6c92712c2f77a5f9d33" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Fri May 14 10:58:26 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 17 17:44:35 2010 -0700" }, "message": "net: Remove unnecessary semicolons after switch statements\n\nAlso added an explicit break; to avoid\na fallthrough in net/ipv4/tcp_input.c\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a1aa3483041bd3691c7f029272ccef4ce70bd957", "tree": "10aae3a5100a85fad5ca81da37e4bf1b064d29bb", "parents": [ "a14462f1bd4d3962994f518459102000438665aa" ], "author": { "name": "Timo Teras", "email": "timo.teras@iki.fi", "time": "Sat May 15 23:49:26 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat May 15 23:49:26 2010 -0700" }, "message": "xfrm: fix policy unreferencing on larval drop\n\nI mistakenly had the error path to use num_pols to decide how\nmany policies we need to drop (cruft from earlier patch set\nversion which did not handle socket policies right).\n\nThis is wrong since normally we do not keep explicit references\n(instead we hold reference to the cache entry which holds references\nto policies). drop_pols is set to num_pols if we are holding the\nreferences, so use that. Otherwise we eventually BUG_ON inside\nxfrm_policy_destroy due to premature policy deletion.\n\nSigned-off-by: Timo Teras \u003ctimo.teras@iki.fi\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4b021628beb26238087812829cc080da47e4b236", "tree": "815a0bcdb435c3d070b110a1fa08ed9cb33691f4", "parents": [ "767dd03369ac18af58efdef0383d6eb986eab426" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Tue Apr 27 21:20:22 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 30 16:40:05 2010 -0700" }, "message": "xfrm: potential uninitialized variable num_xfrms\n\npotential uninitialized variable num_xfrms\n\nfix compiler warning: \u0027num_xfrms\u0027 may be used uninitialized in this function.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\n----\n net/xfrm/xfrm_policy.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0eae88f31ca2b88911ce843452054139e028771f", "tree": "90f50197d8e1e50e3621e9c525bd4ca2634fe368", "parents": [ "cb903bf4ee2d6e53210e2174d363e10698112042" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Apr 20 19:06:52 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 20 19:06:52 2010 -0700" }, "message": "net: Fix various endianness glitches\n\nSparse can help us find endianness bugs, but we need to make some\ncleanups to be able to more easily spot real bugs.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "871039f02f8ec4ab2e5e9010718caa8e085786f1", "tree": "f0d2b3127fc48c862967d68c46c2d46668137515", "parents": [ "e4077e018b5ead3de9951fc01d8bf12eeeeeefed", "4a1032faac94ebbf647460ae3e06fc21146eb280" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 11 14:53:53 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 11 14:53:53 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/stmmac/stmmac_main.c\n\tdrivers/net/wireless/wl12xx/wl1271_cmd.c\n\tdrivers/net/wireless/wl12xx/wl1271_main.c\n\tdrivers/net/wireless/wl12xx/wl1271_spi.c\n\tnet/core/ethtool.c\n\tnet/mac80211/scan.c\n" }, { "commit": "285ead175c5dd5075cab5b6c94f35a3e6c0a3ae6", "tree": "75304a312806df6ad799fb2ee86849cee820d32c", "parents": [ "80c802f3073e84c956846e921e8a0b02dfa3755f" ], "author": { "name": "Timo Teräs", "email": "timo.teras@iki.fi", "time": "Wed Apr 07 00:30:06 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 07 03:43:19 2010 -0700" }, "message": "xfrm: remove policy garbage collection\n\nPolicies are now properly reference counted and destroyed from\nall code paths. The delayed gc is just an overhead now and can\nbe removed.\n\nSigned-off-by: Timo Teras \u003ctimo.teras@iki.fi\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "80c802f3073e84c956846e921e8a0b02dfa3755f", "tree": "895dc92dcf6b658d78838e0a23db3dd29c8be695", "parents": [ "fe1a5f031e76bd8761a7803d75b95ee96e84a574" ], "author": { "name": "Timo Teräs", "email": "timo.teras@iki.fi", "time": "Wed Apr 07 00:30:05 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 07 03:43:19 2010 -0700" }, "message": "xfrm: cache bundles instead of policies for outgoing flows\n\n__xfrm_lookup() is called for each packet transmitted out of\nsystem. The xfrm_find_bundle() does a linear search which can\nkill system performance depending on how many bundles are\nrequired per policy.\n\nThis modifies __xfrm_lookup() to store bundles directly in\nthe flow cache. If we did not get a hit, we just create a new\nbundle instead of doing slow search. This means that we can now\nget multiple xfrm_dst\u0027s for same flow (on per-cpu basis).\n\nSigned-off-by: Timo Teras \u003ctimo.teras@iki.fi\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fe1a5f031e76bd8761a7803d75b95ee96e84a574", "tree": "c74392cef02c1529b00df6c5d0b8f4239fe091c3", "parents": [ "8020eb82d4c37d21dade0abeb8feed265a01819e" ], "author": { "name": "Timo Teräs", "email": "timo.teras@iki.fi", "time": "Wed Apr 07 00:30:04 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 07 03:43:18 2010 -0700" }, "message": "flow: virtualize flow cache entry methods\n\nThis allows to validate the cached object before returning it.\nIt also allows to destruct object properly, if the last reference\nwas held in flow cache. This is also a prepartion for caching\nbundles in the flow cache.\n\nIn return for virtualizing the methods, we save on:\n- not having to regenerate the whole flow cache on policy removal:\n each flow matching a killed policy gets refreshed as the getter\n function notices it smartly.\n- we do not have to call flow_cache_flush from policy gc, since the\n flow cache now properly deletes the object if it had any references\n\nSigned-off-by: Timo Teras \u003ctimo.teras@iki.fi\u003e\nAcked-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ea2dea9dacc256fe927857feb423872051642ae7", "tree": "507da54eb46680b833ead15c3e74f9312cf10c22", "parents": [ "c8bf4d04f970fafb3430d332533e1cf103f2a018" ], "author": { "name": "Timo Teräs", "email": "timo.teras@iki.fi", "time": "Wed Mar 31 00:17:05 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 01 19:41:35 2010 -0700" }, "message": "xfrm: remove policy lock when accessing policy-\u003ewalk.dead\n\nAll of the code considers -\u003edead as a hint that the cached policy\nneeds to get refreshed. The read side can just drop the read lock\nwithout any side effects.\n\nThe write side needs to make sure that it\u0027s written only exactly\nonce. Only possible race is at xfrm_policy_kill(). This is fixed\nby checking result of __xfrm_policy_unlink() when needed. It will\nalways succeed if the policy object is looked up from the hash\nlist (so some checks are removed), but it needs to be checked if\nwe are trying to unlink policy via a reference (appropriate\nchecks added).\n\nSince policy-\u003ewalk.dead is written exactly once, it no longer\nneeds to be protected with a write lock.\n\nSigned-off-by: Timo Teras \u003ctimo.teras@iki.fi\u003e\nAcked-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c8bf4d04f970fafb3430d332533e1cf103f2a018", "tree": "5d0a7507da01350b64fe182d7906bc0d85166f8b", "parents": [ "34996cb91dd72f0b0456d8fd3fef4aaee62232f2" ], "author": { "name": "Timo Teräs", "email": "timo.teras@iki.fi", "time": "Wed Mar 31 00:17:04 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 01 19:41:35 2010 -0700" }, "message": "xfrm_user: verify policy direction at XFRM_MSG_POLEXPIRE handler\n\nAdd missing check for policy direction verification. This is\nespecially important since without this xfrm_user may end up\ndeleting per-socket policy which is not allowed.\n\nSigned-off-by: Timo Teras \u003ctimo.teras@iki.fi\u003e\nAcked-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "34996cb91dd72f0b0456d8fd3fef4aaee62232f2", "tree": "404cfd62ecc437a83ffecdaf86560bbe9e8fdb7e", "parents": [ "bd2c77a0a749589b45f2697ea446a4438d078f9b" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Wed Mar 31 01:19:49 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 01 19:41:34 2010 -0700" }, "message": "xfrm: Remove xfrm_state_genid\n\nThe xfrm state genid only needs to be matched against the copy\nsaved in xfrm_dst. So we don\u0027t need a global genid at all. In\nfact, we don\u0027t even need to initialise it.\n\nBased on observation by Timo Teräs.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5a0e3ad6af8660be21ca98a971cd00f331318c05", "tree": "5bfb7be11a03176a87296a43ac6647975c00a1d1", "parents": [ "ed391f4ebf8f701d3566423ce8f17e614cde9806" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Mar 24 17:04:11 2010 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Mar 30 22:02:32 2010 +0900" }, "message": "include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h\n\npercpu.h is included by sched.h and module.h and thus ends up being\nincluded when building most .c files. percpu.h includes slab.h which\nin turn includes gfp.h making everything defined by the two files\nuniversally available and complicating inclusion dependencies.\n\npercpu.h -\u003e slab.h dependency is about to be removed. Prepare for\nthis change by updating users of gfp and slab facilities include those\nheaders directly instead of assuming availability. As this conversion\nneeds to touch large number of source files, the following script is\nused as the basis of conversion.\n\n http://userweb.kernel.org/~tj/misc/slabh-sweep.py\n\nThe script does the followings.\n\n* Scan files for gfp and slab usages and update includes such that\n only the necessary includes are there. ie. if only gfp is used,\n gfp.h, if slab is used, slab.h.\n\n* When the script inserts a new include, it looks at the include\n blocks and try to put the new include such that its order conforms\n to its surrounding. It\u0027s put in the include block which contains\n core kernel includes, in the same order that the rest are ordered -\n alphabetical, Christmas tree, rev-Xmas-tree or at the end if there\n doesn\u0027t seem to be any matching order.\n\n* If the script can\u0027t find a place to put a new include (mostly\n because the file doesn\u0027t have fitting include block), it prints out\n an error message indicating which .h file needs to be added to the\n file.\n\nThe conversion was done in the following steps.\n\n1. The initial automatic conversion of all .c files updated slightly\n over 4000 files, deleting around 700 includes and adding ~480 gfp.h\n and ~3000 slab.h inclusions. The script emitted errors for ~400\n files.\n\n2. Each error was manually checked. Some didn\u0027t need the inclusion,\n some needed manual addition while adding it to implementation .h or\n embedding .c file was more appropriate for others. This step added\n inclusions to around 150 files.\n\n3. The script was run again and the output was compared to the edits\n from #2 to make sure no file was left behind.\n\n4. Several build tests were done and a couple of problems were fixed.\n e.g. lib/decompress_*.c used malloc/free() wrappers around slab\n APIs requiring slab.h to be added manually.\n\n5. The script was run on all .h files but without automatically\n editing them as sprinkling gfp.h and slab.h inclusions around .h\n files could easily lead to inclusion dependency hell. Most gfp.h\n inclusion directives were ignored as stuff from gfp.h was usually\n wildly available and often used in preprocessor macros. Each\n slab.h inclusion directive was examined and added manually as\n necessary.\n\n6. percpu.h was updated not to include slab.h.\n\n7. Build test were done on the following configurations and failures\n were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my\n distributed build env didn\u0027t work with gcov compiles) and a few\n more options had to be turned off depending on archs to make things\n build (like ipr on powerpc/64 which failed due to missing writeq).\n\n * x86 and x86_64 UP and SMP allmodconfig and a custom test config.\n * powerpc and powerpc64 SMP allmodconfig\n * sparc and sparc64 SMP allmodconfig\n * ia64 SMP allmodconfig\n * s390 SMP allmodconfig\n * alpha SMP allmodconfig\n * um on x86_64 SMP allmodconfig\n\n8. percpu.h modifications were reverted so that it could be applied as\n a separate patch and serve as bisection point.\n\nGiven the fact that I had only a couple of failures from tests on step\n6, I\u0027m fairly confident about the coverage of this conversion patch.\nIf there is a breakage, it\u0027s likely to be something in one of the arch\nheaders which should be easily discoverable easily on most builds of\nthe specific arch.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nGuess-its-ok-by: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Lee Schermerhorn \u003cLee.Schermerhorn@hp.com\u003e\n" }, { "commit": "87c1e12b5eeb7b30b4b41291bef8e0b41fc3dde9", "tree": "4e30c4d60c21ab5e0346648ed852258a96265288", "parents": [ "3a5b27bf6f29574d667230c7e76e4b83fe3014e0" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Mar 02 02:51:56 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 03 01:04:37 2010 -0800" }, "message": "ipsec: Fix bogus bundle flowi\n\nWhen I merged the bundle creation code, I introduced a bogus\nflowi value in the bundle. Instead of getting from the caller,\nit was instead set to the flow in the route object, which is\ntotally different.\n\nThe end result is that the bundles we created never match, and\nwe instead end up with an ever growing bundle list.\n\nThanks to Jamal for find this problem.\n\nReported-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nAcked-by: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\nAcked-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "47871889c601d8199c51a4086f77eebd77c29b0b", "tree": "40cdcac3bff0ee40cc33dcca61d0577cdf965f77", "parents": [ "c16cc0b464b8876cfd57ce1c1dbcb6f9a6a0bce3", "30ff056c42c665b9ea535d8515890857ae382540" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Feb 28 19:23:06 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Feb 28 19:23:06 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of /home/davem/src/GIT/linux-2.6/\n\nConflicts:\n\tdrivers/firmware/iscsi_ibft.c\n" }, { "commit": "37d4008484977f60d5d37499a2670c79b214dd46", "tree": "e73ef4b7c3eee1543e13d7be2ecb1593e77eb123", "parents": [ "68c6b859846bd078b37c6ca5f3882032f129e72d", "8d0c123f8b710561cfd34f6e1a5bebc27988edbe" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 26 16:50:02 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 26 16:50:02 2010 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (31 commits)\n crypto: aes_generic - Fix checkpatch errors\n crypto: fcrypt - Fix checkpatch errors\n crypto: ecb - Fix checkpatch errors\n crypto: des_generic - Fix checkpatch errors\n crypto: deflate - Fix checkpatch errors\n crypto: crypto_null - Fix checkpatch errors\n crypto: cipher - Fix checkpatch errors\n crypto: crc32 - Fix checkpatch errors\n crypto: compress - Fix checkpatch errors\n crypto: cast6 - Fix checkpatch errors\n crypto: cast5 - Fix checkpatch errors\n crypto: camellia - Fix checkpatch errors\n crypto: authenc - Fix checkpatch errors\n crypto: api - Fix checkpatch errors\n crypto: anubis - Fix checkpatch errors\n crypto: algapi - Fix checkpatch errors\n crypto: blowfish - Fix checkpatch errors\n crypto: aead - Fix checkpatch errors\n crypto: ablkcipher - Fix checkpatch errors\n crypto: pcrypt - call the complete function on error\n ...\n" }, { "commit": "fb977e2ca607a7e74946a1de798f474d1b80b9d6", "tree": "5e966bbf23b524d9ae58ce5f962103e715c58fc6", "parents": [ "10886af54a2478f97f2d5f89bbe270b99206f8ab" ], "author": { "name": "Jamal Hadi Salim", "email": "hadi@cyberus.ca", "time": "Tue Feb 23 15:09:53 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 23 15:09:53 2010 -0800" }, "message": "xfrm: clone mark when cloning policy\n\nWhen we clone the SP, we should also clone the mark.\nUseful for socket based SPs.\n\nSigned-off-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "295fae568885a93c39a0e29a9455054608b6cc0e", "tree": "1cce881be6501a8ddad33e6ea7c6336b93e5562f", "parents": [ "6f26b61e177e57a41795355f6222cf817f1212dc" ], "author": { "name": "Jamal Hadi Salim", "email": "hadi@cyberus.ca", "time": "Mon Feb 22 11:33:00 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Feb 22 16:21:26 2010 -0800" }, "message": "xfrm: Allow user space manipulation of SPD mark\n\nAdd ability for netlink userspace to manipulate the SPD\nand manipulate the mark, retrieve it and get events with a defined\nmark, etc.\n\nSigned-off-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6f26b61e177e57a41795355f6222cf817f1212dc", "tree": "6894f386ad84fa6d48ff860e6f04b9e5acd65024", "parents": [ "34f8d8846f69f3b5bc3916ba9145e4eebae9394e" ], "author": { "name": "Jamal Hadi Salim", "email": "hadi@cyberus.ca", "time": "Mon Feb 22 11:32:59 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Feb 22 16:21:25 2010 -0800" }, "message": "xfrm: Allow user space config of SAD mark\n\nAdd ability for netlink userspace to manipulate the SAD\nand manipulate the mark, retrieve it and get events with a defined\nmark.\nMIGRATE may be added later.\n\nSigned-off-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "34f8d8846f69f3b5bc3916ba9145e4eebae9394e", "tree": "99f778801ae5753e250deb0a69986912a529863e", "parents": [ "8ca2e93b557f2a0b35f7769038abf600177e1122" ], "author": { "name": "Jamal Hadi Salim", "email": "hadi@cyberus.ca", "time": "Mon Feb 22 11:32:58 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Feb 22 16:21:25 2010 -0800" }, "message": "xfrm: SP lookups with mark\n\nAllow mark to be used when doing SP lookup\n\nSigned-off-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8ca2e93b557f2a0b35f7769038abf600177e1122", "tree": "2b25012de07a48c33db0a191924d6e5fcc99c22a", "parents": [ "3d6acfa7641fd0a35f608b142f61e79f7ed8db43" ], "author": { "name": "Jamal Hadi Salim", "email": "hadi@cyberus.ca", "time": "Mon Feb 22 11:32:57 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Feb 22 16:21:12 2010 -0800" }, "message": "xfrm: SP lookups signature with mark\n\npass mark to all SP lookups to prepare them for when we add code\nto have them search.\n\nSigned-off-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3d6acfa7641fd0a35f608b142f61e79f7ed8db43", "tree": "747ed113a5ae6082eaad218583f172ef7c82321f", "parents": [ "bd55775c8dd656fc69b3a42a1c4ab32abb7e8af9" ], "author": { "name": "Jamal Hadi Salim", "email": "hadi@cyberus.ca", "time": "Mon Feb 22 11:32:56 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Feb 22 16:21:07 2010 -0800" }, "message": "xfrm: SA lookups with mark\n\nAllow mark to be added to the SA lookup\n\nSigned-off-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bd55775c8dd656fc69b3a42a1c4ab32abb7e8af9", "tree": "766b30d5fc29d5d4849a10a290db51fe0f7c3ad7", "parents": [ "bf825f81b454fae2ffe1b675f3a549656726440e" ], "author": { "name": "Jamal Hadi Salim", "email": "hadi@cyberus.ca", "time": "Mon Feb 22 16:20:22 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Feb 22 16:20:22 2010 -0800" }, "message": "xfrm: SA lookups signature with mark\n\npass mark to all SA lookups to prepare them for when we add code\nto have them search.\n\nSigned-off-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2f1eb65f366b81aa3c22c31e6e8db26168777ec5", "tree": "3c838f5801d0842c586519ddd4d991e22ac3ecd0", "parents": [ "9e64cc9572b43afcbcd2d004538db435f2cd0587" ], "author": { "name": "Jamal Hadi Salim", "email": "hadi@cyberus.ca", "time": "Fri Feb 19 02:00:42 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 19 13:11:50 2010 -0800" }, "message": "xfrm: Flushing empty SPD generates false events\n\nTo see the effect make sure you have an empty SPD.\nOn window1 \"ip xfrm mon\" and on window2 issue \"ip xfrm policy flush\"\nYou get prompt back in window2 and you see the flush event on window1.\nWith this fix, you still get prompt on window1 but no event on window2.\n\nThanks to Alexey Dobriyan for finding a bug in earlier version\nwhen using pfkey to do the flushing.\n\nSigned-off-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9e64cc9572b43afcbcd2d004538db435f2cd0587", "tree": "36ccf743338c97b407734f1cfb39b665dd3ce05d", "parents": [ "8be987d73481831265d7e8c648bec838271bfd9b" ], "author": { "name": "Jamal Hadi Salim", "email": "hadi@cyberus.ca", "time": "Fri Feb 19 02:00:41 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 19 13:11:50 2010 -0800" }, "message": "xfrm: Flushing empty SAD generates false events\n\nTo see the effect make sure you have an empty SAD.\nOn window1 \"ip xfrm mon\" and on window2 issue \"ip xfrm state flush\"\nYou get prompt back in window2 and you see the flush event on window1.\nWith this fix, you still get prompt on window1 but no event on window2.\n\nThanks to Alexey Dobriyan for finding a bug in earlier version\nwhen using pfkey to do the flushing.\n\nSigned-off-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "72032fdbcde8b333e65b3430e1bcb4358e2d6716", "tree": "53f48599a1cf4d68641a009cb6322e1711dc5efc", "parents": [ "7e38017557bc0b87434d184f8804cadb102bb903" ], "author": { "name": "jamal", "email": "hadi@cyberus.ca", "time": "Thu Feb 18 03:35:07 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 18 15:43:09 2010 -0800" }, "message": "xfrm: Introduce LINUX_MIB_XFRMFWDHDRERROR\n\nXFRMINHDRERROR counter is ambigous when validating forwarding\npath. It makes it tricky to debug when you have both in and fwd\nvalidation.\n\nSigned-off-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "069c474e88bb7753183f1eadbd7786c27888c8e3", "tree": "09b0385d34a2d0b302b1f61a2783bfcdc510732f", "parents": [ "08326dbe7b5825295ec3711eec53b093549749e5" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 17 13:41:40 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 17 13:41:40 2010 -0800" }, "message": "xfrm: Revert false event eliding commits.\n\nAs reported by Alexey Dobriyan:\n\n--------------------\nsetkey now takes several seconds to run this simple script\nand it spits \"recv: Resource temporarily unavailable\" messages.\n\n#!/usr/sbin/setkey -f\nflush;\nspdflush;\n\nadd A B ipcomp 44 -m tunnel -C deflate;\nadd B A ipcomp 45 -m tunnel -C deflate;\n\nspdadd A B any -P in ipsec\n ipcomp/tunnel/192.168.1.2-192.168.1.3/use;\nspdadd B A any -P out ipsec\n ipcomp/tunnel/192.168.1.3-192.168.1.2/use;\n--------------------\n\nObviously applications want the events even when the table\nis empty. So we cannot make this behavioral change.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7d720c3e4f0c4fc152a6bf17e24244a3c85412d2", "tree": "36e037187ce79acb211702bea22e99c625787757", "parents": [ "2bb4646fce8d09916b351d1a62f98db7cec6fc41" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Feb 16 15:20:26 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 16 23:05:38 2010 -0800" }, "message": "percpu: add __percpu sparse annotations to net\n\nAdd __percpu sparse annotations to net.\n\nThese annotations are to make sparse consider percpu variables to be\nin a different address space and warn if accessed without going\nthrough percpu accessors. This patch doesn\u0027t affect normal builds.\n\nThe macro and type tricks around snmp stats make things a bit\ninteresting. DEFINE/DECLARE_SNMP_STAT() macros mark the target field\nas __percpu and SNMP_UPD_PO_STATS() macro is updated accordingly. All\nsnmp_mib_*() users which used to cast the argument to (void **) are\nupdated to cast it to (void __percpu **).\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: Patrick McHardy \u003ckaber@trash.net\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@ghostprotocols.net\u003e\nCc: Vlad Yasevich \u003cvladislav.yasevich@hp.com\u003e\nCc: netdev@vger.kernel.org\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2bb4646fce8d09916b351d1a62f98db7cec6fc41", "tree": "c1f0d002e69868606eca9d1b919835f422892063", "parents": [ "6836b9bdd98e3b500cd49512484df68f46e14659", "b0483e78e5c4c9871fc5541875b3bc006846d46b" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 16 22:09:29 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 16 22:09:29 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "6836b9bdd98e3b500cd49512484df68f46e14659", "tree": "39eb8e910213e71ab707ad5d3e0b1606fa844f54", "parents": [ "e06d41d09f314a1664ad60e46934b0ac131c6fa2" ], "author": { "name": "jamal", "email": "hadi@cyberus.ca", "time": "Tue Feb 16 02:01:22 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 16 20:20:24 2010 -0800" }, "message": "xfrm: avoid spinlock in get_acqseq() used by xfrm user\n\nEric\u0027s version fixed it for pfkey. This one is for xfrm user.\nI thought about amortizing those two get_acqseq()s but it seems\nreasonable to have two of these sequence spaces for the two different\ninterfaces.\n\ncheers,\njamal\ncommit d5168d5addbc999c94aacda8f28a4a173756a72b\nAuthor: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nDate: Tue Feb 16 06:51:22 2010 -0500\n\n xfrm: avoid spinlock in get_acqseq() used by xfrm user\n\n This is in the same spirit as commit 28aecb9d7728dc26bf03ce7925fe622023a83a2a\n by Eric Dumazet.\n Use atomic_inc_return() in get_acqseq() to avoid taking a spinlock\n\n Signed-off-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "553f9118abc4fc53674fff87f6fe5fa3f56a41ed", "tree": "8b6fcbbfc3709915cc733aa48a49f95d9f930e89", "parents": [ "10e7454ed7a2da39f1f6255f63d7df27ab4bb67f" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon Feb 15 20:00:51 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 16 14:53:24 2010 -0800" }, "message": "xfrm: Fix xfrm_state_clone leak\n\nxfrm_state_clone calls kfree instead of xfrm_state_put to free\na failed state. Depending on the state of the failed state, it\ncan cause leaks to things like module references.\n\nAll states should be freed by xfrm_state_put past the point of\nxfrm_init_state.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0dca3a843632c2fbb6e358734fb08fc23e800f50", "tree": "fe86830e9582b534c0481c2ac2f58e63a684906b", "parents": [ "19f4c7133fc1b94001b997c4843d0a9192ee63e5" ], "author": { "name": "jamal", "email": "hadi@cyberus.ca", "time": "Thu Feb 11 00:53:13 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Feb 15 21:49:50 2010 -0800" }, "message": "xfrm: Flushing empty SPD generates false events\n\nObserved similar behavior on SPD as previouly seen on SAD flushing..\nThis fixes it.\n\ncheers,\njamal\ncommit 428b20432dc31bc2e01a94cd451cf5a2c00d2bf4\nAuthor: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nDate: Thu Feb 11 05:49:38 2010 -0500\n\n xfrm: Flushing empty SPD generates false events\n\n To see the effect make sure you have an empty SPD.\n On window1 \"ip xfrm mon\" and on window2 issue \"ip xfrm policy flush\"\n You get prompt back in window1 and you see the flush event on window2.\n With this fix, you still get prompt on window1 but no event on window2.\n\n Signed-off-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "19f4c7133fc1b94001b997c4843d0a9192ee63e5", "tree": "403d6b4d53ce3b12c9f5a75819f68542b38d942c", "parents": [ "9546377c42e12513b33925ab829d893dcf521c5f" ], "author": { "name": "jamal", "email": "hadi@cyberus.ca", "time": "Wed Feb 10 23:51:27 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Feb 15 21:49:50 2010 -0800" }, "message": "xfrm: Flushing empty SAD generates false events\n\nTo see the effect make sure you have an empty SAD.\n-On window1 \"ip xfrm mon\"\n-on window2 issue \"ip xfrm state flush\"\nYou get prompt back in window1\nand you see the flush event on window2.\nWith this fix, you still get prompt on window1 but no\nevent on window2.\n\nI was tempted to return -ESRCH on window1 (which would\nshow \"RTNETLINK answers: No such process\") but didnt want\nto change current behavior.\n\ncheers,\njamal\ncommit 5f3dd4a772326166e1bcf54acc2391df00dc7ab5\nAuthor: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nDate: Thu Feb 11 04:41:36 2010 -0500\n\n xfrm: Flushing empty SAD generates false events\n\n To see the effect make sure you have an empty SAD.\n On window1 \"ip xfrm mon\" and on window2 issue \"ip xfrm state flush\"\n You get prompt back in window1 and you see the flush event on window2.\n With this fix, you still get prompt on window1 but no event on window2.\n\n Signed-off-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c28e93040b497e895d5c41b54abef3bc8db17fa9", "tree": "825a6c41cd26d051a9391a36b61d788c7ef10c69", "parents": [ "d707204c1fd21ab49242aad17f92f949538e1507" ], "author": { "name": "jamal", "email": "hadi@cyberus.ca", "time": "Tue Feb 09 03:59:38 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 12 13:27:47 2010 -0800" }, "message": "xfrm: validate attributes\n\nSome XFRM attributes were not going through basic validation.\n\nSigned-off-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "05ba712d7eb156009753e18e5116cabd869cc6e2", "tree": "1ad850d6889f6b3671a5636653940f20a7d22bdf", "parents": [ "257ddbdad13cd3c4f7d03b85af632c508aa8abc9", "b473946a0853860e13b51c28add5524741117786" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 28 06:12:38 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 28 06:12:38 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "d7c7544c3d5f59033d1bf3236bc7b289f5f26b75", "tree": "1a3c9e7b6c0c9158ddb73faa05b07697c3493cf1", "parents": [ "a40ccc6868943e74ec12f26a266ce1d0373b2b32" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Sun Jan 24 22:47:53 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 24 22:47:53 2010 -0800" }, "message": "netns xfrm: deal with dst entries in netns\n\nGC is non-existent in netns, so after you hit GC threshold, no new\ndst entries will be created until someone triggers cleanup in init_net.\n\nMake xfrm4_dst_ops and xfrm6_dst_ops per-netns.\nThis is not done in a generic way, because it woule waste\n(AF_MAX - 2) * sizeof(struct dst_ops) bytes per-netns.\n\nReorder GC threshold initialization so it\u0027d be done before registering\nXFRM policies.\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e071041be037eca208b62b84469a06bdfc692bea", "tree": "c78506a4a582555959ffeb94980cb0cd7f86eab5", "parents": [ "2ca4231de7f7a5fd7137bac152030ba71f15e8c3" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Sat Jan 23 13:37:10 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 23 23:10:42 2010 -0800" }, "message": "netns xfrm: fix \"ip xfrm state|policy count\" misreport\n\n\"ip xfrm state|policy count\" report SA/SP count from init_net,\nnot from netns of caller process.\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5833929cc2ad2b3064b4fac8c44e293972d240d8", "tree": "f40c1e8c54f7b42fb1edf7dadc624ad60deac307", "parents": [ "81c1ebfc4379f529b001e23164dd5c2282bdc0ec" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Fri Jan 22 10:17:26 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 23 01:21:27 2010 -0800" }, "message": "net: constify MIB name tables\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2c8c1e7297e19bdef3c178c3ea41d898a7716e3e", "tree": "4d336562e8d5379732a0646e17b0bb1750111ef6", "parents": [ "72659ecce68588b74f6c46862c2b4cec137d7a5a" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Sun Jan 17 03:35:32 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 17 19:16:02 2010 -0800" }, "message": "net: spread __net_init, __net_exit\n\n__net_init/__net_exit are apparently not going away, so use them\nto full extent.\n\nIn some cases __net_init was removed, because it was called from\n__net_exit code.\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "73c89c15b959adf06366722c4be8d2eddec0a529", "tree": "91c0d936c49607fbae703e4c7331e39896004d28", "parents": [ "faad98f29606d9d3c6bddae7c88693be37d2fb43" ], "author": { "name": "Tobias Brunner", "email": "tobias@strongswan.org", "time": "Sun Jan 17 21:52:11 2010 +1100" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Sun Jan 17 21:52:11 2010 +1100" }, "message": "crypto: gcm - Add RFC4543 wrapper for GCM\n\nThis patch adds the RFC4543 (GMAC) wrapper for GCM similar to the\nexisting RFC4106 wrapper. The main differences between GCM and GMAC are\nthe contents of the AAD and that the plaintext is empty for the latter.\n\nSigned-off-by: Tobias Brunner \u003ctobias@strongswan.org\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "96c5340147584481ef0c0afbb5423f7563c1d24a", "tree": "85f4a2ddd61e28c705b4a86ff683933fe1b3d4c7", "parents": [ "c99a3d2e04c63a795e13c26d6f2982731e1f1ae0" ], "author": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Fri Dec 25 23:30:02 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Dec 26 20:24:46 2009 -0800" }, "message": "NET: XFRM: Fix spelling of neighbour.\n\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\n\n net/xfrm/xfrm_policy.c | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d7fc02c7bae7b1cf69269992cf880a43a350cdaa", "tree": "a43d56fa72913a1cc98a0bbebe054d08581b3a7c", "parents": [ "ee1262dbc65ce0b6234a915d8432171e8d77f518", "28b4d5cc17c20786848cdc07b7ea237a309776bb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 08 07:55:01 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 08 07:55:01 2009 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1815 commits)\n mac80211: fix reorder buffer release\n iwmc3200wifi: Enable wimax core through module parameter\n iwmc3200wifi: Add wifi-wimax coexistence mode as a module parameter\n iwmc3200wifi: Coex table command does not expect a response\n iwmc3200wifi: Update wiwi priority table\n iwlwifi: driver version track kernel version\n iwlwifi: indicate uCode type when fail dump error/event log\n iwl3945: remove duplicated event logging code\n b43: fix two warnings\n ipw2100: fix rebooting hang with driver loaded\n cfg80211: indent regulatory messages with spaces\n iwmc3200wifi: fix NULL pointer dereference in pmkid update\n mac80211: Fix TX status reporting for injected data frames\n ath9k: enable 2GHz band only if the device supports it\n airo: Fix integer overflow warning\n rt2x00: Fix padding bug on L2PAD devices.\n WE: Fix set events not propagated\n b43legacy: avoid PPC fault during resume\n b43: avoid PPC fault during resume\n tcp: fix a timewait refcnt race\n ...\n\nFix up conflicts due to sysctl cleanups (dead sysctl_check code and\nCTL_UNNUMBERED removed) in\n\tkernel/sysctl_check.c\n\tnet/ipv4/sysctl_net_ipv4.c\n\tnet/ipv6/addrconf.c\n\tnet/sctp/sysctl.c\n" }, { "commit": "d79d792ef9f99cca463b6619a93e860d1c833a6e", "tree": "06d8a085701546be48ac104fd4f2413a6371180c", "parents": [ "04dc7f6be3a7b308f8545bb45772c9fb75f71aca" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Thu Dec 03 02:29:05 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 03 12:22:03 2009 -0800" }, "message": "net: Allow xfrm_user_net_exit to batch efficiently.\n\nxfrm.nlsk is provided by the xfrm_user module and is access via rcu from\nother parts of the xfrm code. Add xfrm.nlsk_stash a copy of xfrm.nlsk that\nwill never be set to NULL. This allows the synchronize_net and\nnetlink_kernel_release to be deferred until a whole batch of xfrm.nlsk sockets\nhave been set to NULL.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ff9c38bba37937adb909cceb2a6521f2e92e17c6", "tree": "93bd6152d9fa28348be99ef1c788040cc7b7a94d", "parents": [ "65c0cfafce9575319fb6f70080fbe226e5617e3b", "b2722b1c3a893ec6021508da15b32282ec79f4da" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 01 22:13:38 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 01 22:13:38 2009 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tnet/mac80211/ht.c\n" }, { "commit": "138f3c8518976953563a1316d7e0420c72d4ab96", "tree": "a24c63a1edd763367ccee82366175ec1a43ded34", "parents": [ "1fdf475aa141a669af8db6ccc7015f0b725087de" ], "author": { "name": "Li Yewang", "email": "lyw@cn.fujitsu.com", "time": "Tue Dec 01 15:35:05 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 01 15:35:05 2009 -0800" }, "message": "ipsec: can not add camellia cipher algorithm when using \"ip xfrm state\" command\n\ncan not add camellia cipher algorithm when using \"ip xfrm state\" command.\n\nSigned-off-by: Li Yewang \u003clyw@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bc74b0c8af17458ecae77f725e507ab5fd100105", "tree": "9f15b0cb9731ae1eb4e820440894c8edba5d6a45", "parents": [ "8f8a088c2127c729638da8f2d33860e346c01eda" ], "author": { "name": "Martin Willi", "email": "martin@strongswan.org", "time": "Wed Nov 25 00:58:39 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 25 15:48:44 2009 -0800" }, "message": "xfrm: Add SHA384 and SHA512 HMAC authentication algorithms to XFRM\n\nThese algorithms use a truncation of 192/256 bits, as specified\nin RFC4868.\n\nSigned-off-by: Martin Willi \u003cmartin@strongswan.org\u003e\nAcked-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4447bb33f09444920a8f1d89e1540137429351b6", "tree": "0aeadd5f09b412380974d3155255ba8db27dd1ed", "parents": [ "4e242d1616781f9f1f0b01abf878700b259cd8b5" ], "author": { "name": "Martin Willi", "email": "martin@strongswan.org", "time": "Wed Nov 25 00:29:52 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 25 15:48:38 2009 -0800" }, "message": "xfrm: Store aalg in xfrm_state with a user specified truncation length\n\nAdding a xfrm_state requires an authentication algorithm specified\neither as xfrm_algo or as xfrm_algo_auth with a specific truncation\nlength. For compatibility, both attributes are dumped to userspace,\nand we also accept both attributes, but prefer the new syntax.\n\nIf no truncation length is specified, or the authentication algorithm\nis specified using xfrm_algo, the truncation length from the algorithm\ndescription in the kernel is used.\n\nSigned-off-by: Martin Willi \u003cmartin@strongswan.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f8572d8f2a2ba75408b97dc24ef47c83671795d7", "tree": "052506a457939fea00d138d3a982d778df34e14c", "parents": [ "86b1bc68e2f4244e4ea5db5458df9d19259fbb30" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Thu Nov 05 13:32:03 2009 -0800" }, "committer": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Thu Nov 12 02:05:06 2009 -0800" }, "message": "sysctl net: Remove unused binary sysctl code\n\nNow that sys_sysctl is a compatiblity wrapper around /proc/sys\nall sysctl strategy routines, and all ctl_name and strategy\nentries in the sysctl tables are unused, and can be\nrevmoed.\n\nIn addition neigh_sysctl_register has been modified to no longer\ntake a strategy argument and it\u0027s callers have been modified not\nto pass one.\n\nCc: \"David Miller\" \u003cdavem@davemloft.net\u003e\nCc: Hideaki YOSHIFUJI \u003cyoshfuji@linux-ipv6.org\u003e\nCc: netdev@vger.kernel.org\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\n" }, { "commit": "9e0d57fd6dad37d72a3ca6db00ca8c76f2215454", "tree": "89693eb2e093da06e2228c12b43bde23e95049ad", "parents": [ "7a50a240c495478179f01c9df4bd75e39cff79c7" ], "author": { "name": "Yury Polyanskiy", "email": "polyanskiy@gmail.com", "time": "Sun Nov 08 20:58:41 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 08 20:58:41 2009 -0800" }, "message": "xfrm: SAD entries do not expire correctly after suspend-resume\n\n This fixes the following bug in the current implementation of\nnet/xfrm: SAD entries timeouts do not count the time spent by the machine \nin the suspended state. This leads to the connectivity problems because \nafter resuming local machine thinks that the SAD entry is still valid, while \nit has already been expired on the remote server.\n\n The cause of this is very simple: the timeouts in the net/xfrm are bound to \nthe old mod_timer() timers. This patch reassigns them to the\nCLOCK_REALTIME hrtimer.\n\n I have been using this version of the patch for a few months on my\nmachines without any problems. Also run a few stress tests w/o any\nissues.\n\n This version of the patch uses tasklet_hrtimer by Peter Zijlstra\n(commit 9ba5f0).\n\n This patch is against 2.6.31.4. Please CC me.\n\nSigned-off-by: Yury Polyanskiy \u003cpolyanskiy@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eb2ff967a587a4a784fd2390f38e324a5bec01ec", "tree": "63deb9023b47287a7fad08465f7c75a5c41e29fc", "parents": [ "2ad9afbf5ca27482aa275de517261d56fd1e7ba0" ], "author": { "name": "Steffen Klassert", "email": "steffen.klassert@secunet.com", "time": "Wed Oct 07 22:50:40 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Oct 18 21:32:01 2009 -0700" }, "message": "xfrm: remove skb_icv_walk\n\nThe last users of skb_icv_walk are converted to ahash now,\nso skb_icv_walk is unused and can be removed.\n\nSigned-off-by: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5ca1b998d33c39819fca2b675d80c4469e705f2d", "tree": "fbe882f3908b6b57ae3fe54d13abb0067538276d", "parents": [ "3b401a81c0d50ea9c718cf837f62cc2e6e79cc30" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Tue Sep 01 19:25:05 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 02 01:03:53 2009 -0700" }, "message": "net: file_operations should be const\n\nAll instances of file_operations should be const.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b79a79471bd31d737c939a6ddc347417047b4320", "tree": "c208fa8937da25184215504c063e032822ea2d3e", "parents": [ "082ba88a5e6b1425abed3fae4ad65e0e985ed081" ], "author": { "name": "Jussi Mäki", "email": "joamaki@gmail.com", "time": "Thu Aug 06 21:38:14 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Aug 09 21:45:31 2009 -0700" }, "message": "Fix xfrm hash collisions by changing __xfrm4_daddr_saddr_hash to hash addresses with addition\n\nThis patch fixes hash collisions in cases where number\nof entries have incrementing IP source and destination addresses\nfrom single respective subnets (i.e. 192.168.0.1-172.16.0.1,\n192.168.0.2-172.16.0.2, and so on.).\n\nSigned-off-by: Jussi Maki \u003cjoamaki@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1802571b9865c0fc1d8d0fa39cf73275f3a75af3", "tree": "c26651ac2d19ecb5aa633d6a550fbddf7094fee5", "parents": [ "6828b92bd21acd65113dfe0541f19f5df0d9668f" ], "author": { "name": "Wei Yongjun", "email": "yjwei@cn.fujitsu.com", "time": "Sun Jun 28 18:42:53 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 29 19:41:46 2009 -0700" }, "message": "xfrm: use xfrm_addr_cmp() instead of compare addresses directly\n\nClean up to use xfrm_addr_cmp() instead of compare addresses directly.\n\nSigned-off-by: Wei Yongjun \u003cyjwei@cn.fujitsu.com\u003e\nAcked-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "245acb87729bc76ba65c7476665c01837e0cdccb", "tree": "b7190a01772e3ae93900300712bdc437cf014179", "parents": [ "28d0325ce6e0a52f53d8af687e6427fee59004d3" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Wed Jun 24 03:55:41 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 24 18:03:10 2009 -0700" }, "message": "ipsec: Fix name of CAST algorithm\n\nOur CAST algorithm is called cast5, not cast128. Clearly nobody\nhas ever used it :)\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d4fd3bc101909802f9ed083093cce688cc3416aa", "tree": "5b69ca6437f871ae581ae7b7ca3e9149615b7486", "parents": [ "1b003be39e91a6cd013c9ea580ccc24d1fac9959" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 09 00:22:47 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 09 00:24:07 2009 -0700" }, "message": "xfrm: Use frag list abstraction interfaces.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "adf30907d63893e4208dfe3f5c88ae12bc2f25d5", "tree": "0f07542bb95de2ad537540868aba6cf87a86e17d", "parents": [ "511c3f92ad5b6d9f8f6464be1b4f85f0422be91a" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Jun 02 05:19:30 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 03 02:51:04 2009 -0700" }, "message": "net: skb-\u003edst accessors\n\nDefine three accessors to get/set dst attached to a skb\n\nstruct dst_entry *skb_dst(const struct sk_buff *skb)\n\nvoid skb_dst_set(struct sk_buff *skb, struct dst_entry *dst)\n\nvoid skb_dst_drop(struct sk_buff *skb)\nThis one should replace occurrences of :\ndst_release(skb-\u003edst)\nskb-\u003edst \u003d NULL;\n\nDelete skb-\u003edst field\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6a783c9067e3f71aac61a9262fe42c1f68efd4fc", "tree": "a1bc0c5f7625dfc71e777dba2ebb546df820be02", "parents": [ "8f955d7f042e4ac44891a400d5000928f8db9f58" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Mon Apr 27 02:58:59 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 27 02:58:59 2009 -0700" }, "message": "xfrm: wrong hash value for temporary SA\n\nWhen kernel inserts a temporary SA for IKE, it uses the wrong hash\nvalue for dst list. Two hash values were calcultated before: one with\nsource address and one with a wildcard source address.\n\nBug hinted by Junwei Zhang \u003cjunwei.zhang@6wind.com\u003e\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7d0b591c655ca0d72ebcbd242cf659a20a8995c5", "tree": "4f8d642a62abdb302829f942f2aedef3828ca873", "parents": [ "71f6f6dfdf7c7a67462386d9ea05c1095a89c555" ], "author": { "name": "Chuck Ebbert", "email": "cebbert@redhat.com", "time": "Fri Mar 27 00:22:01 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Mar 27 00:23:04 2009 -0700" }, "message": "xfrm: spin_lock() should be spin_unlock() in xfrm_state.c\n\nspin_lock() should be spin_unlock() in xfrm_state_walk_done().\n\ncaused by:\ncommit 12a169e7d8f4b1c95252d8b04ed0f1033ed7cfe2\n\"ipsec: Put dumpers on the dump list\"\n\nReported-by: Marc Milgram \u003cmmilgram@redhat.com\u003e\nSigned-off-by: Chuck Ebbert \u003ccebbert@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "08ec9af1c0622b0858099a8644a33af02dd3019f", "tree": "1aa7a5ff6de043d6b87b023835f0494570369f10", "parents": [ "9616a75505be9b87f9625c4d87d8b07a45ddad4d" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Mar 13 14:22:40 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Mar 13 14:22:40 2009 -0700" }, "message": "xfrm: Fix xfrm_state_find() wrt. wildcard source address.\n\nThe change to make xfrm_state objects hash on source address\nbroke the case where such source addresses are wildcarded.\n\nFix this by doing a two phase lookup, first with fully specified\nsource address, next using saddr wildcarded.\n\nReported-by: Nicolas Dichtel \u003cnicolas.dichtel@dev.6wind.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "66f9a2590aa87dc77cddaeaf46177de76edd2339", "tree": "d186efb35e147878219dfecef1f2341f7192c7e8", "parents": [ "f4895b8bc83a22a36446c4aee277e1750fcc6a18" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 20 09:49:51 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 20 09:49:51 2009 -0800" }, "message": "Revert \"xfrm: For 32/64 compatability wrt. xfrm_usersa_info\"\n\nThis reverts commit fc8c7dc1b29560c016a67a34ccff32a712b5aa86.\n\nAs indicated by Jiri Klimes, this won\u0027t work. These numbers are\nnot only used the size validation, they are also used to locate\nattributes sitting after the message.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fc8c7dc1b29560c016a67a34ccff32a712b5aa86", "tree": "5858cfda1d68dbad2a5b75ff65e1f6d6bedd676d", "parents": [ "5f3e54057c62e5f654c66e4ce1172993f67fc284" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 14 14:55:35 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 14 14:55:35 2009 -0800" }, "message": "xfrm: For 32/64 compatability wrt. xfrm_usersa_info\n\nReported by Jiri Klimes.\n\nFix suggested by Patrick McHardy.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9498c05820580afbf03a317b0b5bdb0ca0e27e40", "tree": "fbafc631d0a0eff6a4a71f5f1b30a28a25fa77d3", "parents": [ "eefacf3b4f8a688aeaddd2f7c46ac5ffceb92472" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Jan 08 21:27:06 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 11 00:04:11 2009 -0800" }, "message": "ipcomp: Remove spurious truesize increase\n\nWhen I made ipcomp use frags, I forgot to take out the original\ntruesize update that was added for pskb_expand_head. As we no\nlonger expand the head of skb, that update should have been removed.\n\nThis bug is not related to the truesize warnings since we only\nmade it bigger than what it should\u0027ve been.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "91b208c7c1db4cefa2247f8243fbda75b0472d24", "tree": "8acdb0d44f2223f36ee20f7975487fd1cdcaa582", "parents": [ "2d0658d4ef92e4958172c832bd88c961840e599e" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon Dec 29 18:20:06 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 29 18:20:06 2008 -0800" }, "message": "net: make xfrm_statistics_seq_show use generic snmp_fold_field\n\nNo reason to roll our own here.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3de77cf23e9a19b9fc28e3b29371308325428c39", "tree": "20a6eafcdf351426ca0c8119cda1ff0e999f407d", "parents": [ "49ad9599d42da4787d5b3a19263440e0fcd4d1fc" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 18 19:23:56 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 18 22:27:37 2008 -0800" }, "message": "Revert \"xfrm: Accept ESP packets regardless of UDP encapsulation mode\"\n\nThis reverts commit e061b165c7f4ec5e2e160d990b49011b5b6e5c6a.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d8eb93078cedbbf4b7e18e1d7054171c7b70b442", "tree": "69f232bbdb2d2f214424deb74f7b1e3a96aad740", "parents": [ "8da73b73ef29d537ba09f29393cd68707833e746" ], "author": { "name": "Ilpo Järvinen", "email": "ilpo.jarvinen@helsinki.fi", "time": "Sun Dec 14 23:16:22 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Dec 14 23:16:22 2008 -0800" }, "message": "xfrm: join error paths\n\nSigned-off-by: Ilpo Järvinen \u003cilpo.jarvinen@helsinki.fi\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e061b165c7f4ec5e2e160d990b49011b5b6e5c6a", "tree": "7108f6490557641531405d6e0d2ea7d22e58547f", "parents": [ "3f9b766ca7c4654d41f4f21357031c1c1e7de29e" ], "author": { "name": "Martin Willi", "email": "martin@strongswan.org", "time": "Thu Dec 04 15:40:17 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 04 15:40:17 2008 -0800" }, "message": "xfrm: Accept ESP packets regardless of UDP encapsulation mode\n\nFrom: Martin Willi \u003cmartin@strongswan.org\u003e\n\nAn IPsec node speaking IKEv2 MUST accept incoming UDP encapsulated\nESP packets, even if no NAT situation is detected. This is important\nif MOBIKE is in use. Some implementation keep the encapsulation\nmode if they move out of a NAT situation.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d81d228567f55af517796638075dbbce9b40d7af", "tree": "1c904a111ca0a494151b83cdb51792f70fe39835", "parents": [ "29fa0b301bc823016d1a3bed41c36a8977ef9947" ], "author": { "name": "Martin Willi", "email": "martin@strongswan.org", "time": "Wed Dec 03 15:38:07 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 03 15:38:07 2008 -0800" }, "message": "xfrm: Accept XFRM_STATE_AF_UNSPEC SAs on IPv4/IPv6 only hosts\n\nInstalling SAs using the XFRM_STATE_AF_UNSPEC fails on hosts with\nsupport for one address family only. This patch accepts such SAs, even\nif the processing of not supported packets will fail.\n\nSigned-off-by: Martin Willi \u003cmartin@strongswan.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "29fa0b301bc823016d1a3bed41c36a8977ef9947", "tree": "b55111be188ee2dcc70ca80ebf92f614f2177c64", "parents": [ "22d55328b7d27694718f5d64a53d2bddbbe173a5" ], "author": { "name": "Wei Yongjun", "email": "yjwei@cn.fujitsu.com", "time": "Wed Dec 03 00:33:09 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 03 00:33:09 2008 -0800" }, "message": "xfrm: Cleanup for unlink SPD entry\n\nUsed __xfrm_policy_unlink() to instead of the dup codes when unlink\nSPD entry.\n\nSigned-off-by: Wei Yongjun \u003cyjwei@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "22d55328b7d27694718f5d64a53d2bddbbe173a5", "tree": "9bb8ecd03fadca07b5887006fbd59ddaa0114bf1", "parents": [ "3f8c6c9c7739d18e4b75902fdcbf6c3ba98dc123", "d5654efd3ff1cd0baa935a0c9a5d89862f07d009" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 03 00:29:24 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 03 00:29:24 2008 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "d5654efd3ff1cd0baa935a0c9a5d89862f07d009", "tree": "dd93620de07f9a181e0238ee820b81df92c376f4", "parents": [ "f6f7b52e2f6149d2ee365717afff315b05720162" ], "author": { "name": "Wei Yongjun", "email": "yjwei@cn.fujitsu.com", "time": "Wed Dec 03 00:27:18 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 03 00:27:18 2008 -0800" }, "message": "xfrm: Fix kernel panic when flush and dump SPD entries\n\nAfter flush the SPD entries, dump the SPD entries will cause kernel painc.\n\nUsed the following commands to reproduct:\n\n- echo \u0027spdflush;\u0027 | setkey -c\n- echo \u0027spdadd 3ffe:501:ffff:ff01::/64 3ffe:501:ffff:ff04::/64 any -P out ipsec \\\n ah/tunnel/3ffe:501:ffff:ff00:200:ff:fe00:b0b0-3ffe:501:ffff:ff02:200:ff:fe00:a1a1/require;\\\n spddump;\u0027 | setkey -c\n- echo \u0027spdflush; spddump;\u0027 | setkey -c\n- echo \u0027spdadd 3ffe:501:ffff:ff01::/64 3ffe:501:ffff:ff04::/64 any -P out ipsec \\\n ah/tunnel/3ffe:501:ffff:ff00:200:ff:fe00:b0b0-3ffe:501:ffff:ff02:200:ff:fe00:a1a1/require;\\\n spddump;\u0027 | setkey -c\n\nThis is because when flush the SPD entries, the SPD entry is not remove\nfrom the list.\n\nThis patch fix the problem by remove the SPD entry from the list.\n\nSigned-off-by: Wei Yongjun \u003cyjwei@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b27aeadb5948d400df83db4d29590fb9862ba49d", "tree": "f76cc43150164facbb890e4d5c619a99fe6ce303", "parents": [ "c68cd1a01ba56995d85a4a62b195b2b3f6415c64" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Tue Nov 25 18:00:48 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 25 18:00:48 2008 -0800" }, "message": "netns xfrm: per-netns sysctls\n\nMake\n\tnet.core.xfrm_aevent_etime\n\tnet.core.xfrm_acq_expires\n\tnet.core.xfrm_aevent_rseqth\n\tnet.core.xfrm_larval_drop\n\nsysctls per-netns.\n\nFor that make net_core_path[] global, register it to prevent two\n/proc/net/core antries and change initcall position -- xfrm_init() is called\nfrom fs_initcall, so this one should be fs_initcall at least.\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c68cd1a01ba56995d85a4a62b195b2b3f6415c64", "tree": "69351005622aced7acf9085fa5c54134419286ba", "parents": [ "59c9940ed0ef026673cac52f2eaed77af7d486da" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Tue Nov 25 18:00:14 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 25 18:00:14 2008 -0800" }, "message": "netns xfrm: /proc/net/xfrm_stat in netns\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "59c9940ed0ef026673cac52f2eaed77af7d486da", "tree": "d7d4e38e693178f16000eaa5ae03f415f3197f7a", "parents": [ "4fb236bac9fc7d51e2267866de6d4c30e549d2f8" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Tue Nov 25 17:59:52 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 25 17:59:52 2008 -0800" }, "message": "netns xfrm: per-netns MIBs\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7c2776ee21a60e0d370538bd08b9ed82979f6e3a", "tree": "c8b9757f6989216c00b5ca9e09ee074662fff586", "parents": [ "fbda33b2b85941c1ae3a0d89522dec5c1b1bd98c" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Tue Nov 25 17:57:44 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 25 17:57:44 2008 -0800" }, "message": "netns xfrm: flush SA/SPDs on netns stop\n\nSA/SPD doesn\u0027t pin netns (and it shouldn\u0027t), so get rid of them by hand.\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fbda33b2b85941c1ae3a0d89522dec5c1b1bd98c", "tree": "f35036a6faf4fa549e45ff2b0407344e17cf9455", "parents": [ "c5b3cf46eabe6e7459125fc6e2033b4222665017" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Tue Nov 25 17:56:49 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 25 17:56:49 2008 -0800" }, "message": "netns xfrm: -\u003eget_saddr in netns\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c5b3cf46eabe6e7459125fc6e2033b4222665017", "tree": "a968ad567906d7b45270b9e91d534493f8a1a38d", "parents": [ "db983c1144884cab10d6397532f4bf05eb0c01d2" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Tue Nov 25 17:51:25 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 25 17:51:25 2008 -0800" }, "message": "netns xfrm: -\u003edst_lookup in netns\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "db983c1144884cab10d6397532f4bf05eb0c01d2", "tree": "ebb86abdaeb916191424407881d52635019502cf", "parents": [ "7067802e262457a9737521e5669b622028b2283a" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Tue Nov 25 17:51:01 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 25 17:51:01 2008 -0800" }, "message": "netns xfrm: KM reporting in netns\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7067802e262457a9737521e5669b622028b2283a", "tree": "f6f94b1429700979cb1407fc1f96de487f6bf085", "parents": [ "fc34acd36eecdec95171b98ef2516e3d4daa5c41" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Tue Nov 25 17:50:36 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 25 17:50:36 2008 -0800" }, "message": "netns xfrm: pass netns with KM notifications\n\nSA and SPD flush are executed with NULL SA and SPD respectively, for\nthese cases pass netns explicitly from userspace socket.\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" } ], "next": "fc34acd36eecdec95171b98ef2516e3d4daa5c41" }