)]}' { "log": [ { "commit": "3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4", "tree": "5adc1ff2eaf64d450bf28bb6b2ce890db2567288", "parents": [ "5cf65713f87775c548e3eb48dbafa32e12f28000", "0ea6e61122196509af82cc4f36cbdaacbefb8227" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 04 15:31:02 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 04 15:31:02 2010 -0700" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (48 commits)\n Documentation: update broken web addresses.\n fix comment typo \"choosed\" -\u003e \"chosen\"\n hostap:hostap_hw.c Fix typo in comment\n Fix spelling contorller -\u003e controller in comments\n Kconfig.debug: FAIL_IO_TIMEOUT: typo Faul -\u003e Fault\n fs/Kconfig: Fix typo Userpace -\u003e Userspace\n Removing dead MACH_U300_BS26\n drivers/infiniband: Remove unnecessary casts of private_data\n fs/ocfs2: Remove unnecessary casts of private_data\n libfc: use ARRAY_SIZE\n scsi: bfa: use ARRAY_SIZE\n drm: i915: use ARRAY_SIZE\n drm: drm_edid: use ARRAY_SIZE\n synclink: use ARRAY_SIZE\n block: cciss: use ARRAY_SIZE\n comment typo fixes: charater \u003d\u003e character\n fix comment typos concerning \"challenge\"\n arm: plat-spear: fix typo in kerneldoc\n reiserfs: typo comment fix\n update email address\n ...\n" }, { "commit": "d790d4d583aeaed9fc6f8a9f4d9f8ce6b1c15c7f", "tree": "854ab394486288d40fa8179cbfaf66e8bdc44b0f", "parents": [ "73b2c7165b76b20eb1290e7efebc33cfd21db1ca", "3a09b1be53d23df780a0cd0e4087a05e2ca4a00c" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Aug 04 15:14:38 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Aug 04 15:14:38 2010 +0200" }, "message": "Merge branch \u0027master\u0027 into for-next\n" }, { "commit": "83bf2e4089bebc2c7fd14a79de5954b26fe8d4af", "tree": "ab2cb1f229ba4c2d7236406c997e41a223daf74d", "parents": [ "de38483010bae523f533bb6bf9f7b7353772f6eb", "6661481d5a8975657742c7ed40ae16bdaa7d0a6e" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 02 15:07:58 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 02 15:07:58 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6\n" }, { "commit": "24b36f0193467fa727b85b4c004016a8dae999b9", "tree": "d9518ed0ef2012fd14567d03b500295dfb7fe7e0", "parents": [ "7df0884ce144396fc151f2af7a73d5fb305f9b03" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Aug 02 16:49:01 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon Aug 02 16:49:01 2010 +0200" }, "message": "netfilter: {ip,ip6,arp}_tables: dont block bottom half more than necessary\n\nWe currently disable BH for the whole duration of get_counters()\n\nOn machines with a lot of cpus and large tables, this might be too long.\n\nWe can disable preemption during the whole function, and disable BH only\nwhile fetching counters for the current cpu.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "bb7e95c8fd859922c6cf3ebbb3a8546007df1748", "tree": "58b54c6306ba168b76f25cc6dc9a2d1d2eb830a7", "parents": [ "b8bc0421ab7f83712a0a8ef7eb05fa73ec53c027", "5447080cfa3c77154498dfbf225367ac85b4c2b5" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jul 27 21:01:35 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jul 27 21:01:35 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/bnx2x_main.c\n\nMerge bnx2x bug fixes in by hand... :-/\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "261abc8c964e018256c1bcbd99b8a208c624d7cc", "tree": "c98dd4640e000fe0fa0f4bbc57d8db92d88c492a", "parents": [ "49daf6a22622d4e1619aeaad5f9f0472bf89daff" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Fri Jul 23 16:24:34 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jul 23 16:24:34 2010 +0200" }, "message": "netfilter: ip6tables: use skb-\u003elen for accounting\n\nipv6_hdr(skb)-\u003epayload_len is ZERO and can\u0027t be used for accounting, if\nthe payload is a Jumbo Payload specified in RFC2675.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "64e724f62ab743d55229cd5e27ec8b068b68eb16", "tree": "cc73b4a138f1fa2585f8bc4cb44f91c6c5751cc7", "parents": [ "be2b6e62357dd7ee56bdcb05e54002afb4830292" ], "author": { "name": "Brian Haley", "email": "brian.haley@hp.com", "time": "Tue Jul 20 10:34:30 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 22 13:41:32 2010 -0700" }, "message": "ipv6: Don\u0027t add routes to ipv6 disabled interfaces.\n\nIf the interface has IPv6 disabled, don\u0027t add a multicast or\nlink-local route since we won\u0027t be adding a link-local address.\n\nReported-by: Mahesh Kelkar \u003cmaheshkelkar@gmail.com\u003e\nSigned-off-by: Brian Haley \u003cbrian.haley@hp.com\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": "d9a9dc66eb8a8fd85c8546247e7e1d6023d0eb0f", "tree": "cedd329461bcfeaad782b574912dbe68dd28d00a", "parents": [ "ee2e6114de3bdb1c34f3910b690f990483e981ab" ], "author": { "name": "Arnaud Ebalard", "email": "arno@natisbad.org", "time": "Fri Jul 16 00:38:44 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 18 15:04:33 2010 -0700" }, "message": "IPv6: fix CoA check in RH2 input handler (mip6_rthdr_input())\n\nThe input handler for Type 2 Routing Header (mip6_rthdr_input())\nchecks if the CoA in the packet matches the CoA in the XFRM state.\n\nCurrent check is buggy: it compares the adddress in the Type 2\nRouting Header, i.e. the HoA, against the expected CoA in the state.\nThe comparison should be made against the address in the destination\nfield of the IPv6 header.\n\nThe bug remained unnoticed because the main (and possibly only current)\nuser of the code (UMIP MIPv6 Daemon) initializes the XFRM state with the\nunspecified address, i.e. explicitly allows everything.\n\nYoshifuji-san, can you ack that one?\n\nSigned-off-by: Arnaud Ebalard \u003carno@natisbad.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7ba42910073f8432934d61a6c08b1023c408fb62", "tree": "4f74648133eaf6cbea26d59c43d34e7153648f5d", "parents": [ "53d3176b282cc105493babb0fef36c8b873f6201" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Sat Jul 10 20:41:55 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 12 20:21:46 2010 -0700" }, "message": "inet, inet6: make tcp_sendmsg() and tcp_sendpage() through inet_sendmsg() and inet_sendpage()\n\na new boolean flag no_autobind is added to structure proto to avoid the autobind\ncalls when the protocol is TCP. Then sock_rps_record_flow() is called int the\nTCP\u0027s sendmsg() and sendpage() pathes.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\n----\n include/net/inet_common.h | 4 ++++\n include/net/sock.h | 1 +\n include/net/tcp.h | 8 ++++----\n net/ipv4/af_inet.c | 15 +++++++++------\n net/ipv4/tcp.c | 11 +++++------\n net/ipv4/tcp_ipv4.c | 3 +++\n net/ipv6/af_inet6.c | 8 ++++----\n net/ipv6/tcp_ipv6.c | 3 +++\n 8 files changed, 33 insertions(+), 20 deletions(-)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "698f93159a735bd29a8767c9f60d9b2d75870f8e", "tree": "1ea0556201e4fa79c75db621e33c722eedececda", "parents": [ "b27d63d8f8d34af57805f56005e217c150187531" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Fri Jul 02 20:41:51 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Sun Jul 11 21:45:40 2010 +0200" }, "message": "fix comment/printk typos concerning \"already\"\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\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": "ea8fbe8f198edea19116d4b61267e12235513225", "tree": "e9fae0d935a083b8db23dbe02e0bd1b61fe4fc2a", "parents": [ "39827be26b36ef9cdbc661c92a269e0484cd9ef5" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Mon Jul 05 10:38:23 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon Jul 05 10:38:23 2010 +0200" }, "message": "netfilter: nf_conntrack_reasm: add fast path for in-order fragments\n\nAs the fragments are sent in order in most of OSes, such as Windows, Darwin and\nFreeBSD, it is likely the new fragments are at the end of the inet_frag_queue.\nIn the fast path, we check if the skb at the end of the inet_frag_queue is the\nprev we expect.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "44b451f1633896de15d2d52e1a2bd462e80b7814", "tree": "14596f22d672a9b34e017422f772c2a0b967f2f1", "parents": [ "8bd39456bd5ab16d2a956dd3d567dcac9c73a6c0" ], "author": { "name": "Peter Kosyh", "email": "p.kosyh@gmail.com", "time": "Fri Jul 02 07:47:55 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 04 11:46:07 2010 -0700" }, "message": "xfrm: fix xfrm by MARK logic\n\nWhile using xfrm by MARK feature in\n2.6.34 - 2.6.35 kernels, the mark\nis always cleared in flowi structure via memset in\n_decode_session4 (net/ipv4/xfrm4_policy.c), so\nthe policy lookup fails.\nIPv6 code is affected by this bug too.\n\nSigned-off-by: Peter Kosyh \u003cp.kosyh@gmail.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e490c1defec4236a6a131fe2d13bf7ba787c02f8", "tree": "132325ca88cc86a74345a93b2774c5ca284b038a", "parents": [ "0a17d8c744e44617a3c22e7af68b4c5c9c1c5dba", "4df53d8bab65cf2c18daebd51a5a4847e03f1943" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 22:42:06 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 22:42:06 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6\n" }, { "commit": "94e6721d9ce938293a02736c5f7e42205a41ea68", "tree": "84717f7b9ed8132db312be443126704923bff288", "parents": [ "e2aec372ff4b7e78e79c308104a860ae0ed20950", "499031ac8a3df6738f6186ded9da853e8ea18253" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 22:04:49 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 22:04:49 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6\n" }, { "commit": "499031ac8a3df6738f6186ded9da853e8ea18253", "tree": "fe80f44cf43ccd9a642cbdb5aba7637820e83657", "parents": [ "aea9d711f3d68c656ad31ab578ecfb0bb5cd7f97" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri Jul 02 10:05:01 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jul 02 10:05:01 2010 +0200" }, "message": "netfilter: ip6t_REJECT: fix a dst leak in ipv6 REJECT\n\nWe should release dst if dst-\u003eerror is set.\n\nBug introduced in 2.6.14 by commit e104411b82f5c\n([XFRM]: Always release dst_entry on error in xfrm_lookup)\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "d6bebca92c663fb216c072193945946f3807ca7f", "tree": "fd797f062fa19d2ee470cf33c9b475bff08e2545", "parents": [ "4ce3c183fcade7f4b30a33dae90cd774c3d9e094" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Tue Jun 29 04:39:37 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 30 13:44:29 2010 -0700" }, "message": "fragment: add fast path for in-order fragments\n\nadd fast path for in-order fragments\n\nAs the fragments are sent in order in most of OSes, such as Windows, Darwin and\nFreeBSD, it is likely the new fragments are at the end of the inet_frag_queue.\nIn the fast path, we check if the skb at the end of the inet_frag_queue is the\nprev we expect.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\n----\n include/net/inet_frag.h | 1 +\n net/ipv4/ip_fragment.c | 12 ++++++++++++\n net/ipv6/reassembly.c | 11 +++++++++++\n 3 files changed, 24 insertions(+)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4ce3c183fcade7f4b30a33dae90cd774c3d9e094", "tree": "84d5a130da50096fdbeb7fffea596dffe2cebd80", "parents": [ "f3eb62d2cc7da7bea4b394dd06f6bc738aa284e7" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jun 30 13:31:19 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 30 13:31:19 2010 -0700" }, "message": "snmp: 64bit ipstats_mib for all arches\n\n/proc/net/snmp and /proc/net/netstat expose SNMP counters.\n\nWidth of these counters is either 32 or 64 bits, depending on the size\nof \"unsigned long\" in kernel.\n\nThis means user program parsing these files must already be prepared to\ndeal with 64bit values, regardless of user program being 32 or 64 bit.\n\nThis patch introduces 64bit snmp values for IPSTAT mib, where some\ncounters can wrap pretty fast if they are 32bit wide.\n\n# netstat -s|egrep \"InOctets|OutOctets\"\n InOctets: 244068329096\n OutOctets: 244069348848\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "784e2710ce3588d8316dc8efac9ecbebaeaf7c35", "tree": "5d731c6b0f67f6e0567c34a6fcde2b9630641d17", "parents": [ "f56619fc72407561b00c52244a2caa53d730bc4a" ], "author": { "name": "Ben Hutchings", "email": "ben@decadent.org.uk", "time": "Sat Jun 26 11:42:55 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 30 10:28:43 2010 -0700" }, "message": "ipv6: Use interface max_desync_factor instead of static default\n\nmax_desync_factor can be configured per-interface, but nothing is\nusing the value.\n\nReported-by: Piotr Lewandowski \u003cpiotr.lewandowski@gmail.com\u003e\nSigned-off-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f56619fc72407561b00c52244a2caa53d730bc4a", "tree": "9201b8700d4f8e185def920261a3cb718494cdcb", "parents": [ "5a9dbfe08ee17f0dc9ecff647eba3d04afa01200" ], "author": { "name": "Ben Hutchings", "email": "ben@decadent.org.uk", "time": "Sat Jun 26 11:37:47 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 30 10:28:43 2010 -0700" }, "message": "ipv6: Clamp reported valid_lft to a minimum of 0\n\nSince addresses are only revalidated every 2 minutes, the reported\nvalid_lft can underflow shortly before the address is deleted.\nClamp it to a minimum of 0, as for prefered_lft.\n\nReported-by: Piotr Lewandowski \u003cpiotr.lewandowski@gmail.com\u003e\nSigned-off-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7eb9282cd0efac08b8377cbd5037ba297c77e3f7", "tree": "7dcb6e149c96e27da69a75ff828de9681c6636f8", "parents": [ "cf377eb4aeded926375d4d0fe0b66ba95f0521e1" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon Jun 28 14:16:08 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon Jun 28 14:16:08 2010 +0200" }, "message": "netfilter: ipt_LOG/ip6t_LOG: add option to print decoded MAC header\n\nThe LOG targets print the entire MAC header as one long string, which is not\nreadable very well:\n\nIN\u003deth0 OUT\u003d MAC\u003d00:15:f2:24:91:f8:00:1b:24:dc:61:e6:08:00 ...\n\nAdd an option to decode known header formats (currently just ARPHRD_ETHER devices)\nin their individual fields:\n\nIN\u003deth0 OUT\u003d MACSRC\u003d00:1b:24:dc:61:e6 MACDST\u003d00:15:f2:24:91:f8 MACPROTO\u003d0800 ...\nIN\u003deth0 OUT\u003d MACSRC\u003d00:1b:24:dc:61:e6 MACDST\u003d00:15:f2:24:91:f8 MACPROTO\u003d86dd ...\n\nThe option needs to be explicitly enabled by userspace to avoid breaking\nexisting parsers.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "cf377eb4aeded926375d4d0fe0b66ba95f0521e1", "tree": "010628b36c81d050f4189fb8e94f0cdec60dc3c0", "parents": [ "d70a011dbbaa6335a19deb63ec3eb613f48faafd" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon Jun 28 14:12:41 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon Jun 28 14:12:41 2010 +0200" }, "message": "netfilter: ipt_LOG/ip6t_LOG: remove comparison within loop\n\nRemove the comparison within the loop to print the macheader by prepending\nthe colon to all but the first printk.\n\nBased on suggestion by Jan Engelhardt \u003cjengelh@medozas.de\u003e.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "172d69e63c7f1e8300d0e1c1bbd8eb0f630faa15", "tree": "c71118ddc86186e235a920b9529c457db5e9aae5", "parents": [ "734f614bc1e7c6bf075d201f6bd9a555b8b4a984" ], "author": { "name": "Florian Westphal", "email": "fw@strlen.de", "time": "Mon Jun 21 11:48:45 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 26 22:00:03 2010 -0700" }, "message": "syncookies: add support for ECN\n\nAllows use of ECN when syncookies are in effect by encoding ecn_ok\ninto the syn-ack tcp timestamp.\n\nWhile at it, remove a uneeded #ifdef CONFIG_SYN_COOKIES.\nWith CONFIG_SYN_COOKIES\u003dnm want_cookie is ifdef\u0027d to 0 and gcc\nremoves the \"if (0)\".\n\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "734f614bc1e7c6bf075d201f6bd9a555b8b4a984", "tree": "f5602e98d4088b1b667e286a1ead644122cd77e8", "parents": [ "9587c6ddd452314e8ed5707ad832a507a030ef57" ], "author": { "name": "Florian Westphal", "email": "fw@strlen.de", "time": "Mon Jun 21 11:48:44 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 26 22:00:03 2010 -0700" }, "message": "syncookies: do not store rcv_wscale in tcp timestamp\n\nAs pointed out by Fernando Gont there is no need to encode rcv_wscale\ninto the cookie.\n\nWe did not use the restored rcv_wscale anyway; it is recomputed\nvia tcp_select_initial_window().\n\nThus we can save 4 bits in the ts option space by removing rcv_wscale.\nIn case window scaling was not supported, we set the (invalid) wscale\nvalue 0xf.\n\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9587c6ddd452314e8ed5707ad832a507a030ef57", "tree": "7812e8223da2ec13a49b44298faae2a621a30e8a", "parents": [ "1823e4c80eeae2a774c75569ce3035070e5ee009" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jun 23 02:51:25 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 25 21:33:17 2010 -0700" }, "message": "ipv6: remove ipv6_statistics\n\ncommit 9261e5370112 (ipv6: making ip and icmp statistics per/namespace)\nforgot to remove ipv6_statistics variable.\n\ncommit bc417d99bf27 (ipv6: remove stale MIB definitions) took care of\nicmpv6_statistics \u0026 icmpv6msg_statistics\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Denis V. Lunev \u003cden@openvz.org\u003e\nCC: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nCC: Hideaki YOSHIFUJI \u003cyoshfuji@linux-ipv6.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1823e4c80eeae2a774c75569ce3035070e5ee009", "tree": "bdc1bdf4a67027193312ad584924ca8a986a064c", "parents": [ "5eaa0bd81f93225b6d1972b373ed00ca763052b2" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Jun 22 20:58:41 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 25 21:33:17 2010 -0700" }, "message": "snmp: add align parameter to snmp_mib_init()\n\nIn preparation for 64bit snmp counters for some mibs,\nadd an \u0027align\u0027 parameter to snmp_mib_init(), instead\nof assuming mibs only contain \u0027unsigned long\u0027 fields.\n\nCallers can use __alignof__(type) to provide correct\nalignment.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nCC: Arnaldo Carvalho de Melo \u003cacme@ghostprotocols.net\u003e\nCC: Hideaki YOSHIFUJI \u003cyoshfuji@linux-ipv6.org\u003e\nCC: Vlad Yasevich \u003cvladislav.yasevich@hp.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9f888160bdcccf0565dd2774956b8d9456e610be", "tree": "6366fff5417a97bbecdfe4d5f4e63c6fe5cb1b97", "parents": [ "1a61a83ff59378a5613d8c706c4a660c353b62a8" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Mon Jun 21 11:00:13 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 25 21:16:57 2010 -0700" }, "message": "ipv6: fix NULL reference in proxy neighbor discovery\n\nThe addition of TLLAO option created a kernel OOPS regression\nfor the case where neighbor advertisement is being sent via\nproxy path. When using proxy, ipv6_get_ifaddr() returns NULL\ncausing the NULL dereference.\n\nChange causing the bug was:\ncommit f7734fdf61ec6bb848e0bafc1fb8bad2c124bb50\nAuthor: Octavian Purdila \u003copurdila@ixiacom.com\u003e\nDate: Fri Oct 2 11:39:15 2009 +0000\n\n make TLLAO option for NA packets configurable\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nAcked-by: YOSHIFUJI Hideaki \u003cyoshfuji@linux-ipv6.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8c76368174ed2359739f1b7b8a9c042b1ef839c4", "tree": "143aa28c9438b24154bc3d1e36b432a534eca50c", "parents": [ "317fe0e6c5dc9448bcef41a2e31fecfd3dba7f55" ], "author": { "name": "Florian Westphal", "email": "fw@strlen.de", "time": "Wed Jun 16 14:42:15 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 16 14:42:15 2010 -0700" }, "message": "syncookies: check decoded options against sysctl settings\n\nDiscard the ACK if we find options that do not match current sysctl\nsettings.\n\nPreviously it was possible to create a connection with sack, wscale,\netc. enabled even if the feature was disabled via sysctl.\n\nAlso remove an unneeded call to tcp_sack_reset() in\ncookie_check_timestamp: Both call sites (cookie_v4_check,\ncookie_v6_check) zero \"struct tcp_options_received\", hand it to\ntcp_parse_options() (which does not change tcp_opt-\u003enum_sacks/dsack)\nand then call cookie_check_timestamp().\n\nEven if num_sacks/dsacks were changed, the structure is allocated on\nthe stack and after cookie_check_timestamp returns only a few selected\nmembers are copied to the inet_request_sock.\n\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a95d8c88bea0c93505e1d143d075f112be2b25e3", "tree": "7a94017d691ef50b2ce69e389019620bd8d44077", "parents": [ "d27f9b35827ec91d71d3561c127a0a8135fb470d" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sun Jun 13 23:22:43 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 18:12:44 2010 -0700" }, "message": "ipfrag : frag_kfree_skb() cleanup\n\nThird param (work) is unused, remove it.\n\nRemove __inline__ and inline qualifiers.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d27f9b35827ec91d71d3561c127a0a8135fb470d", "tree": "a6a9c67628bf3b807d8bf24375fe6c075b25af32", "parents": [ "2bbdf389a9432270147c8e8e35b021ad61772f65" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sun Jun 13 23:02:24 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 18:12:44 2010 -0700" }, "message": "ip_frag: Remove some atomic ops\n\nInstead of doing one atomic operation per frag, we can factorize them.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2bbdf389a9432270147c8e8e35b021ad61772f65", "tree": "0c91db74045feaa62a7c11a7757052adcff2c3f6", "parents": [ "82695d9b186dcefe9bd119b53521deec20858f19" ], "author": { "name": "Florian Westphal", "email": "fw@strlen.de", "time": "Sun Jun 13 11:29:39 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 18:10:29 2010 -0700" }, "message": "ipv6: syncookies: do not skip -\u003eiif initialization\n\nWhen syncookies are in effect, req-\u003eiif is left uninitialized.\nIn case of e.g. link-local addresses the route lookup then fails\nand no syn-ack is sent.\n\nRearrange things so -\u003eiif is also initialized in the syncookie case.\n\nwant_cookie can only be true when the isn was zero, thus move the want_cookie\ncheck into the \"!isn\" branch.\n\nCc: Glenn Griffin \u003cggriffin.kernel@gmail.com\u003e\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.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": "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": "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": "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": "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": "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": "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": "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": "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": "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": "1789a640f55658d9a54c1868cc3405e4d85dbd8e", "tree": "4ff0efbe06c9f8ab2ff715bfcda91dc31d7c7f65", "parents": [ "fe33147a58e7d1d3086bf823aabfd491d843be82" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Jun 03 22:23:57 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 07 01:08:10 2010 -0700" }, "message": "raw: avoid two atomics in xmit\n\nAvoid two atomic ops per raw_send_hdrinc() call\n\nAvoid two atomic ops per raw6_send_hdrinc() call\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eedc765ca4b19a41cf0b921a492ac08d640060d1", "tree": "95c566c6238cc953e1e336115d2daafe8bcb388f", "parents": [ "e59d44df46edaafb6b637e98d046775524b31104", "024a07bacf8287a6ddfa83e9d5b951c5e8b4070e" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jun 06 17:42:02 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jun 06 17:42:02 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/sfc/net_driver.h\n\tdrivers/net/sfc/siena.c\n" }, { "commit": "8ffb335e8d696affc04f963bf73ce2196f80edb9", "tree": "91cbe2f0876ee74971fd396ce59e848242810d0e", "parents": [ "72e09ad107e78d69ff4d3b97a69f0aad2b77280f" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sun Jun 06 15:34:40 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jun 06 15:34:40 2010 -0700" }, "message": "ip6mr: fix a typo in ip6mr_for_each_table()\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "72e09ad107e78d69ff4d3b97a69f0aad2b77280f", "tree": "daa8a97c230802bcbb8149a21172eca2c6155d91", "parents": [ "ca7335948e294faf8adf65f2c95ca18ea78540db" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sat Jun 05 03:03:30 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 05 03:03:30 2010 -0700" }, "message": "ipv6: avoid high order allocations\n\nWith mtu\u003d9000, mld_newpack() use order-2 GFP_ATOMIC allocations, that\nare very unreliable, on machines where PAGE_SIZE\u003d4K\n\nLimit allocated skbs to be at most one page. (order-0 allocations)\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5918e2fb9035b35164002c3a268feaf70b7c04d5", "tree": "3a785e4b13971d9b9e9098a339ad005364949852", "parents": [ "af9b4738574b46025de7ccbe75c7b24fd8914379" ], "author": { "name": "Florian Westphal", "email": "fw@strlen.de", "time": "Thu Jun 03 00:43:57 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 05 02:23:15 2010 -0700" }, "message": "syncookies: update mss tables\n\n- ipv6 msstab: account for ipv6 header size\n- ipv4 msstab: add mss for Jumbograms.\n\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "af9b4738574b46025de7ccbe75c7b24fd8914379", "tree": "6d05b82261ce76e6ecf00131c667292b62d16adf", "parents": [ "2a1d4bd46047efff513600d7ff422bc344f540a6" ], "author": { "name": "Florian Westphal", "email": "fw@strlen.de", "time": "Thu Jun 03 00:43:44 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 05 02:23:14 2010 -0700" }, "message": "syncookies: avoid unneeded tcp header flag double check\n\ncaller: if (!th-\u003erst \u0026\u0026 !th-\u003esyn \u0026\u0026 th-\u003eack)\ncallee: if (!th-\u003eack)\n\nmake the caller only check for !syn (common for 3whs), and move\nthe !rst / ack test to the callee.\n\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e12f8e29a8526172b7715881503bae636d60bdd8", "tree": "07a32ce30bf0c8903b9b0941c212939ec04f9c44", "parents": [ "fabf3a85ab88063c10f367cccba7b3a1e59df996" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri Jun 04 13:31:29 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jun 04 13:31:29 2010 +0200" }, "message": "netfilter: vmalloc_node cleanup\n\nUsing vmalloc_node(size, numa_node_id()) for temporary storage is not\nneeded. vmalloc(size) is more respectful of user NUMA policy.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "20c59de2e6b6bc74bbf714dcd4e720afe8d516cf", "tree": "45e5c62e286368f8259b844cb7cf796d19066fb0", "parents": [ "d92222e27fdc98d73df25f3d49fb1ff3a3369bec" ], "author": { "name": "Arnaud Ebalard", "email": "arno@natisbad.org", "time": "Tue Jun 01 21:35:01 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 02 07:08:31 2010 -0700" }, "message": "ipv6: Refactor update of IPv6 flowi destination address for srcrt (RH) option\n\nThere are more than a dozen occurrences of following code in the\nIPv6 stack:\n\n if (opt \u0026\u0026 opt-\u003esrcrt) {\n struct rt0_hdr *rt0 \u003d (struct rt0_hdr *) opt-\u003esrcrt;\n ipv6_addr_copy(\u0026final, \u0026fl.fl6_dst);\n ipv6_addr_copy(\u0026fl.fl6_dst, rt0-\u003eaddr);\n final_p \u003d \u0026final;\n }\n\nReplace those with a helper. Note that the helper overrides final_p\nin all cases. This is ok as final_p was previously initialized to\nNULL when declared.\n\nSigned-off-by: Arnaud Ebalard \u003carno@natisbad.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c2d9ba9bce8d7323ca96f239e1f505c14d6244fb", "tree": "7a184eefa2e48e6aa15cdf3aefb6ccf2fb834320", "parents": [ "c6b20d941b08941bece53bc3d857beb1fb25fffc" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Jun 01 06:51:19 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 02 05:16:23 2010 -0700" }, "message": "net: CONFIG_NET_NS reduction\n\nUse read_pnet() and write_pnet() to reduce number of ifdef CONFIG_NET_NS\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "aac4dddc358acfd9d98b20024a42c34dfab31c39", "tree": "08c9bb6dcbb45673ded4e63ea676f54f9abf8180", "parents": [ "95e3bb7aff59d3b6c73d55d1a386ee53b8363fb5" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Jun 01 00:26:58 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 01 00:26:58 2010 -0700" }, "message": "ipv6: get rid of ipip6_prl_lock\n\nAs noticed by Julia Lawall, ipip6_tunnel_add_prl() incorrectly calls \nkzallloc(..., GFP_KERNEL) while a spinlock is held. She provided\na patch to use GFP_ATOMIC instead.\n\nOne possibility would be to convert this spinlock to a mutex, or\npreallocate the thing before taking the lock.\n\nAfter RCU conversion, it appears we dont need this lock, since \ncaller already holds RTNL\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5d55354f147bcf82b7a330bf9617b82a692b7d49", "tree": "4a2723ad497a795914cb86a69ae97245f8fcc535", "parents": [ "3ed37a6fa70a3a63dbb257fc640facb3974bba40" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Mon May 31 17:23:22 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 01 00:15:54 2010 -0700" }, "message": "net/ipv6/mcast.c: Remove unnecessary kmalloc casts\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5953a303471951a4c2f2127f0b4c74df7ceb7ac2", "tree": "13b51217a6f538fe5c72821b1ee65d9bfea72842", "parents": [ "b1faf5666438090a4dc4fceac8502edc7788b7e3", "7489aec8eed4f2f1eb3b4d35763bd3ea30b32ef5" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 31 23:44:57 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 31 23:44:57 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6\n" }, { "commit": "b1faf5666438090a4dc4fceac8502edc7788b7e3", "tree": "f90808dea27cc38aff6feed1782e2a5666fa6ee9", "parents": [ "bc284f94f84c3d76e49c6f3df9028c503f9589d9" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon May 31 23:44:05 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 31 23:44:05 2010 -0700" }, "message": "net: sock_queue_err_skb() dont mess with sk_forward_alloc\n\nCorrect sk_forward_alloc handling for error_queue would need to use a\nbacklog of frames that softirq handler could not deliver because socket\nis owned by user thread. Or extend backlog processing to be able to\nprocess normal and error packets.\n\nAnother possibility is to not use mem charge for error queue, this is\nwhat I implemented in this patch.\n\nNote: this reverts commit 29030374\n(net: fix sk_forward_alloc corruptions), since we dont need to lock\nsocket anymore.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7489aec8eed4f2f1eb3b4d35763bd3ea30b32ef5", "tree": "fe2450679dc217183421e606b3912641545596bd", "parents": [ "c936e8bd1de2fa50c49e3df6fa5036bf07870b67" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon May 31 16:41:35 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon May 31 16:41:35 2010 +0200" }, "message": "netfilter: xtables: stackptr should be percpu\n\ncommit f3c5c1bfd4 (netfilter: xtables: make ip_tables reentrant)\nintroduced a performance regression, because stackptr array is shared by\nall cpus, adding cache line ping pongs. (16 cpus share a 64 bytes cache\nline)\n\nFix this using alloc_percpu()\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-By: Jan Engelhardt \u003cjengelh@medozas.de\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "2903037400a26e7c0cc93ab75a7d62abfacdf485", "tree": "c29d8b3199d8fa52856e5edcd374411f962d7c11", "parents": [ "7dfde179c38056b91d51e60f3d50902387f27c84" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sat May 29 00:20:48 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat May 29 00:20:48 2010 -0700" }, "message": "net: fix sk_forward_alloc corruptions\n\nAs David found out, sock_queue_err_skb() should be called with socket\nlock hold, or we risk sk_forward_alloc corruption, since we use non\natomic operations to update this field.\n\nThis patch adds bh_lock_sock()/bh_unlock_sock() pair to three spots.\n(BH already disabled)\n\n1) skb_tstamp_tx() \n2) Before calling ip_icmp_error(), in __udp4_lib_err() \n3) Before calling ipv6_icmp_error(), in __udp6_lib_err()\n\nReported-by: Anton Blanchard \u003canton@samba.org\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6057fd78a8dcce6269f029b967051d5a2e9b0895", "tree": "4e7076b5790684068cf2f025d19fbac2b750cc7f", "parents": [ "e5e5cf4c71508ed38e921b31b438b8b349409f2a" ], "author": { "name": "Brian Haley", "email": "brian.haley@hp.com", "time": "Fri May 28 23:02:35 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 28 23:02:35 2010 -0700" }, "message": "IPv6: fix Mobile IPv6 regression\n\nCommit f4f914b5 (net: ipv6 bind to device issue) caused\na regression with Mobile IPv6 when it changed the meaning\nof fl-\u003eoif to become a strict requirement of the route\nlookup. Instead, only force strict mode when\nsk-\u003esk_bound_dev_if is set on the calling socket, getting\nthe intended behavior and fixing the regression.\n\nTested-by: Arnaud Ebalard \u003carno@natisbad.org\u003e\nSigned-off-by: Brian Haley \u003cbrian.haley@hp.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0aa68271510ae2b221d4b60892103837be63afe4", "tree": "f6d6a624a13ced851ea3036995813b1612200e01", "parents": [ "a47311380e094bb201be8a818370c73c3f52122c" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu May 27 16:14:30 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 28 01:57:17 2010 -0700" }, "message": "ipv6: Add GSO support on forwarding path\n\nCurrently we disallow GSO packets on the IPv6 forward path.\nThis patch fixes this.\n\nNote that I discovered that our existing GSO MTU checks (e.g.,\nIPv4 forwarding) are buggy in that they skip the check altogether,\nwhen they really should be checking gso_size + header instead.\n\nI have also been lazy here in that I haven\u0027t bothered to segment\nthe GSO packet by hand before generating an ICMP message. Someone\nshould add that to be 100% correct.\n\nReported-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8a74ad60a546b13bd1096b2a61a7a5c6fd9ae17c", "tree": "3110e7e59883597b5d0f617e8507e15b8f965f3f", "parents": [ "a56635a56f2afb3d22d9ce07e8f8d69537416b2d" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed May 26 19:20:18 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 27 00:30:53 2010 -0700" }, "message": "net: fix lock_sock_bh/unlock_sock_bh\n\nThis new sock lock primitive was introduced to speedup some user context\nsocket manipulation. But it is unsafe to protect two threads, one using\nregular lock_sock/release_sock, one using lock_sock_bh/unlock_sock_bh\n\nThis patch changes lock_sock_bh to be careful against \u0027owned\u0027 state.\nIf owned is found to be set, we must take the slow path.\nlock_sock_bh() now returns a boolean to say if the slow path was taken,\nand this boolean is used at unlock_sock_bh time to call the appropriate\nunlock function.\n\nAfter this change, BH are either disabled or enabled during the\nlock_sock_bh/unlock_sock_bh protected section. This might be misleading,\nso we rename these functions to lock_sock_fast()/unlock_sock_fast().\n\nReported-by: Anton Blanchard \u003canton@samba.org\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nTested-by: Anton Blanchard \u003canton@samba.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ed0f160ad674407adb3aba499444f71c83289c63", "tree": "39cff780164f55d6cda23018431ab553c4477f9e", "parents": [ "d938a702e5ce8909ea68be97566150507bfea4df" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Wed May 26 00:38:56 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 26 00:38:56 2010 -0700" }, "message": "ipmr: off by one in __ipmr_fill_mroute()\n\nThis fixes a smatch warning:\n\tnet/ipv4/ipmr.c +1917 __ipmr_fill_mroute(12) error: buffer overflow\n\t\u0027(mrt)-\u003evif_table\u0027 32 \u003c\u003d 32\n\nThe ipv6 version had the same issue.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "622ccdf107bcb49c4d8fb65512652566d4c8928a", "tree": "b25ec5eaade9307a516c87f49f091af25e134590", "parents": [ "f2344a131bccdbfc5338e17fa71a807dee7944fa" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue May 18 15:56:06 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 18 15:56:06 2010 -0700" }, "message": "ipv6: Never schedule DAD timer on dead address\n\nThis patch ensures that all places that schedule the DAD timer\nlook at the address state in a safe manner before scheduling the\ntimer. This ensures that we don\u0027t end up with pending timers\nafter deleting an address.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f2344a131bccdbfc5338e17fa71a807dee7944fa", "tree": "17d00515d1623679592068a304abf8bd88c46ee4", "parents": [ "4c5ff6a6fe794f102479db998c69054319279e3c" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue May 18 15:55:27 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 18 15:55:27 2010 -0700" }, "message": "ipv6: Use POSTDAD state\n\nThis patch makes use of the new POSTDAD state. This prevents\na race between DAD completion and failure.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4c5ff6a6fe794f102479db998c69054319279e3c", "tree": "07e2e4de160e3eb2dbbb3f7749314cd556671826", "parents": [ "e9d3e084975869754d16f639378675c353560be9" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue May 18 15:54:18 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 18 15:54:18 2010 -0700" }, "message": "ipv6: Use state_lock to protect ifa state\n\nThis patch makes use of the new state_lock to synchronise between\nupdates to the ifa state. This fixes the issue where a remotely\ntriggered address deletion (through DAD failure) coincides with a\nlocal administrative address deletion, causing certain actions to\nbe performed twice incorrectly.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e9d3e084975869754d16f639378675c353560be9", "tree": "3f933fea12746b24247ccec79cb4a1fbdf50833b", "parents": [ "e29f5dbc9e9719af158a960e5c1d16f32740ebc3" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue May 18 15:36:06 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 18 15:36:06 2010 -0700" }, "message": "ipv6: Replace inet6_ifaddr-\u003edead with state\n\nThis patch replaces the boolean dead flag on inet6_ifaddr with\na state enum. This allows us to roll back changes when deleting\nan address according to whether DAD has completed or not.\n\nThis patch only adds the state field and does not change the logic.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\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": "d19d56ddc88e7895429ef118db9c83c7bbe3ce6a", "tree": "c0db76f3527c88c95a8793c871f62d628fb3fd1d", "parents": [ "de213e5eedecdfb1b1eea7e6be28bc64cac5c078" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon May 17 22:36:55 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 17 22:36:55 2010 -0700" }, "message": "net: Introduce skb_tunnel_rx() helper\n\nskb rxhash should be cleared when a skb is handled by a tunnel before\nbeing delivered again, so that correct packet steering can take place.\n\nThere are other cleanups and accounting that we can factorize in a new\nhelper, skb_tunnel_rx()\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eedf042a63ffef050ebc015de19b52dc065e830b", "tree": "fe8a31b4ca2e36de74ce8c6b4ee66ac66deac6da", "parents": [ "820ae8a80eb59962aefbbd4908dfe144ec0f9edb" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Mon May 17 22:27:12 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 17 22:27:12 2010 -0700" }, "message": "ipv6: fix the bug of address check\n\nThe duplicate address check code got broken in the conversion\nto hlist (2.6.35). The earlier patch did not fix the case where\ntwo addresses match same hash value. Use two exit paths,\nrather than depending on state of loop variables (from macro).\n\nBased on earlier fix by Shan Wei.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nReviewed-by: Shan Wei \u003cshanwei@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0771275b25e84f568699a5d209c5e339ef83fa94", "tree": "4cd6a8f4c399d3e639e810aac87242060a860a24", "parents": [ "6811d58fc148c393f80a9f5a9db49d7e75cdc546" ], "author": { "name": "Florian Westphal", "email": "fw@strlen.de", "time": "Fri May 07 11:31:33 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 17 17:08:08 2010 -0700" }, "message": "ipv6 addrlabel: permit deletion of labels assigned to removed dev\n\nas addrlabels with an interface index are left alone when the\ninterface gets removed this results in addrlabels that can no\nlonger be removed.\n\nRestrict validation of index to adding new addrlabels.\n\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a465419b1febb603821f924805529cff89cafeed", "tree": "5131fa2dbf624ebeb6cf61bf4dc1bc9464fe0bbd", "parents": [ "3b098e2d7c693796cc4dffb07caa249fc0f70771" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sun May 16 00:36:33 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 16 00:36:33 2010 -0700" }, "message": "net: Introduce sk_route_nocaps\n\nTCP-MD5 sessions have intermittent failures, when route cache is\ninvalidated. ip_queue_xmit() has to find a new route, calls\nsk_setup_caps(sk, \u0026rt-\u003eu.dst), destroying the \n\nsk-\u003esk_route_caps \u0026\u003d ~NETIF_F_GSO_MASK\n\nthat MD5 desperately try to make all over its way (from\ntcp_transmit_skb() for example)\n\nSo we send few bad packets, and everything is fine when\ntcp_transmit_skb() is called again for this socket.\n\nSince ip_queue_xmit() is at a lower level than TCP-MD5, I chose to use a\nsocket field, sk_route_nocaps, containing bits to mask on sk_route_caps.\n\nReported-by: Bhaskar Dutta \u003cbhaskie@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": "e7874c996b8591f59d78efa519031dab5b58723b", "tree": "14aa8dea0c33de9d22ef8177fb242c9d80d693de", "parents": [ "4a6346d4ea63b5e1390babf22f1cc0f113d8082b", "736d58e3a2245ac2779fe0f278f8735bcf33ca8d" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 13 14:14:10 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 13 14:14:10 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6\n" }, { "commit": "736d58e3a2245ac2779fe0f278f8735bcf33ca8d", "tree": "7a0faa6b12ea56ae66dae40f8649649115247234", "parents": [ "654d0fbdc8fe1041918741ed5b6abc8ad6b4c1d8" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Thu May 13 15:16:27 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu May 13 15:16:27 2010 +0200" }, "message": "netfilter: remove unnecessary returns from void function()s\n\nThis patch removes from net/ 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\n[Patrick: changed to keep return statements in otherwise empty function bodies]\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "654d0fbdc8fe1041918741ed5b6abc8ad6b4c1d8", "tree": "6888917854682b983b17aecd82b5d8d7039175a9", "parents": [ "af5676039a9479e6ff42c6aab9fac1149ac9597f" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Thu May 13 15:02:08 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu May 13 15:02:08 2010 +0200" }, "message": "netfilter: cleanup printk messages\n\nMake sure all printk messages have a severity level.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "af5676039a9479e6ff42c6aab9fac1149ac9597f", "tree": "23286e7ee0f2fd28ba267e7488367ee84fd83322", "parents": [ "e94c67436efa22af7d8b7d19c885863246042543" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Thu May 13 15:00:20 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu May 13 15:00:20 2010 +0200" }, "message": "netfilter: change NF_ASSERT to WARN_ON\n\nChange netfilter asserts to standard WARN_ON. This has the\nbenefit of backtrace info and also causes netfilter errors\nto show up on kerneloops.org.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "bf47f4b0babe287f250dd720b41ecad9b8f7ac9b", "tree": "0829ef3bff455f98155b5cb0e91b71db36de3510", "parents": [ "0b9715e64f7d46a9620d4d5042a5e28f5595ed54", "5b285cac3570a935aaa28312c1ea28f9e01c5452" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 12 23:30:45 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 12 23:30:45 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/ipmr-2.6\n" }, { "commit": "278554bd6579206921f5d8a523649a7a57f8850d", "tree": "4e6c527daf0910e455b3aa72e2c96b0479e430be", "parents": [ "5a147e8bf982f9dd414c1dd751fe02c1942506b2", "cea0d767c29669bf89f86e4aee46ef462d2ebae8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 12 00:05:35 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 12 00:05:35 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tDocumentation/feature-removal-schedule.txt\n\tdrivers/net/wireless/ath/ar9170/usb.c\n\tdrivers/scsi/iscsi_tcp.c\n\tnet/ipv4/ipmr.c\n" }, { "commit": "cba7a98a474a4f2a9316473734ba76829191a78a", "tree": "28a0ab87dba93385353bedb76a26a1fc45b3a0c6", "parents": [ "d250fe91ae129bff0968e685cc9c466d3a5e3482", "4538506be386f9736b83bf9892f829adbbb70fea" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue May 11 18:59:21 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue May 11 18:59:21 2010 +0200" }, "message": "Merge branch \u0027master\u0027 of git://dev.medozas.de/linux\n" }, { "commit": "4538506be386f9736b83bf9892f829adbbb70fea", "tree": "3e3be09f45b3af19edc1143f2eb44ad1751ecfa7", "parents": [ "b4ba26119b06052888696491f614201817491a0d" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Sat Jul 04 12:50:00 2009 +0200" }, "committer": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Tue May 11 18:36:18 2010 +0200" }, "message": "netfilter: xtables: combine built-in extension structs\n\nPrepare the arrays for use with the multiregister function. The\nfuture layer-3 xt matches can then be easily added to it without\nneeding more (un)register code.\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\n" }, { "commit": "b4ba26119b06052888696491f614201817491a0d", "tree": "d6dc2a4e0f78641b5b64a1728322c81cbad09974", "parents": [ "62fc8051083a334578c3f4b3488808f210b4565f" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Tue Jul 07 20:54:30 2009 +0200" }, "committer": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Tue May 11 18:35:27 2010 +0200" }, "message": "netfilter: xtables: change hotdrop pointer to direct modification\n\nSince xt_action_param is writable, let\u0027s use it. The pointer to\n\u0027bool hotdrop\u0027 always worried (8 bytes (64-bit) to write 1 byte!).\nSurprisingly results in a reduction in size:\n\n text data bss filename\n5457066 692730 357892 vmlinux.o-prev\n5456554 692730 357892 vmlinux.o\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\n" }, { "commit": "62fc8051083a334578c3f4b3488808f210b4565f", "tree": "9f48eb26316b19b0b8c010d774f3c936315c1aa1", "parents": [ "4b560b447df83368df44bd3712c0c39b1d79ba04" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Tue Jul 07 20:42:08 2009 +0200" }, "committer": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Tue May 11 18:33:37 2010 +0200" }, "message": "netfilter: xtables: deconstify struct xt_action_param for matches\n\nIn future, layer-3 matches will be an xt module of their own, and\nneed to set the fragoff and thoff fields. Adding more pointers would\nneedlessy increase memory requirements (esp. so for 64-bit, where\npointers are wider).\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\n" }, { "commit": "4b560b447df83368df44bd3712c0c39b1d79ba04", "tree": "b445a292e8caf1bcbfb950f461af5f86e7263c01", "parents": [ "de74c16996287250f0d947663127f80c6beebd3c" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Sun Jul 05 19:43:26 2009 +0200" }, "committer": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Tue May 11 18:31:17 2010 +0200" }, "message": "netfilter: xtables: substitute temporary defines by final name\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\n" }, { "commit": "de74c16996287250f0d947663127f80c6beebd3c", "tree": "c7e77e254c5812c8561516dd668eaec732a89a0d", "parents": [ "ef53d702c3614fb919e8a8291033e3dbccfd1aea" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Sun Jul 05 18:26:37 2009 +0200" }, "committer": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Tue May 11 18:23:43 2010 +0200" }, "message": "netfilter: xtables: combine struct xt_match_param and xt_target_param\n\nThe structures carried - besides match/target - almost the same data.\nIt is possible to combine them, as extensions are evaluated serially,\nand so, the callers end up a little smaller.\n\n text data bss filename\n-15318 740 104 net/ipv4/netfilter/ip_tables.o\n+15286 740 104 net/ipv4/netfilter/ip_tables.o\n-15333 540 152 net/ipv6/netfilter/ip6_tables.o\n+15269 540 152 net/ipv6/netfilter/ip6_tables.o\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\n" }, { "commit": "5b285cac3570a935aaa28312c1ea28f9e01c5452", "tree": "a39d8602eb21eb4a721fda933fe21b0c79d3d383", "parents": [ "d1db275dd3f6e4182c4c4b4a1ac6287925d60569" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue May 11 14:40:56 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue May 11 14:40:56 2010 +0200" }, "message": "ipv6: ip6mr: add support for dumping routing tables over netlink\n\nThe ip6mr /proc interface (ip6_mr_cache) can\u0027t be extended to dump routes\nfrom any tables but the main table in a backwards compatible fashion since\nthe output format ends in a variable amount of output interfaces.\n\nIntroduce a new netlink interface to dump multicast routes from all tables,\nsimilar to the netlink interface for regular routes.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "d1db275dd3f6e4182c4c4b4a1ac6287925d60569", "tree": "b8edf6661661ff84785495e2e053ce908417a9ff", "parents": [ "6bd521433942d85e80f7a731a88cc91a327f38e0" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue May 11 14:40:55 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue May 11 14:40:55 2010 +0200" }, "message": "ipv6: ip6mr: support multiple tables\n\nThis patch adds support for multiple independant multicast routing instances,\nnamed \"tables\".\n\nUserspace multicast routing daemons can bind to a specific table instance by\nissuing a setsockopt call using a new option MRT6_TABLE. The table number is\nstored in the raw socket data and affects all following ip6mr setsockopt(),\ngetsockopt() and ioctl() calls. By default, a single table (RT6_TABLE_DFLT)\nis created with a default routing rule pointing to it. Newly created pim6reg\ndevices have the table number appended (\"pim6regX\"), with the exception of\ndevices created in the default table, which are named just \"pim6reg\" for\ncompatibility reasons.\n\nPackets are directed to a specific table instance using routing rules,\nsimilar to how regular routing rules work. Currently iif, oif and mark\nare supported as keys, source and destination addresses could be supported\nadditionally.\n\nExample usage:\n\n- bind pimd/xorp/... to a specific table:\n\nuint32_t table \u003d 123;\nsetsockopt(fd, SOL_IPV6, MRT6_TABLE, \u0026table, sizeof(table));\n\n- create routing rules directing packets to the new table:\n\n# ip -6 mrule add iif eth0 lookup 123\n# ip -6 mrule add oif eth0 lookup 123\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n\n" }, { "commit": "6bd521433942d85e80f7a731a88cc91a327f38e0", "tree": "e263e39fc6096ef77e2a1c22d5972447785b2aa5", "parents": [ "f30a77842129b5656360cc1f5db48a3fcfb64528" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue May 11 14:40:53 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue May 11 14:40:53 2010 +0200" }, "message": "ipv6: ip6mr: move mroute data into seperate structure\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "f30a77842129b5656360cc1f5db48a3fcfb64528", "tree": "3a01eac73fd0e86d3c7a976ab6bccca9878cd35c", "parents": [ "b5aa30b19121de49021fba57aa1f6e4c787fcf67" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue May 11 14:40:51 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue May 11 14:40:51 2010 +0200" }, "message": "ipv6: ip6mr: convert struct mfc_cache to struct list_head\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "b5aa30b19121de49021fba57aa1f6e4c787fcf67", "tree": "dbbf01015bda08d52750f37a797d49c7db1990a9", "parents": [ "c476efbcde5ba58b81ac752f4a894d6db8e17d94" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue May 11 14:40:50 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue May 11 14:40:50 2010 +0200" }, "message": "ipv6: ip6mr: remove net pointer from struct mfc6_cache\n\nNow that cache entries in unres_queue don\u0027t need to be distinguished by their\nnetwork namespace pointer anymore, we can remove it from struct mfc6_cache\nadd pass the namespace as function argument to the functions that need it.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "c476efbcde5ba58b81ac752f4a894d6db8e17d94", "tree": "69aea7351adf2ae537e4d6ec76e1cc0799a16593", "parents": [ "d250fe91ae129bff0968e685cc9c466d3a5e3482" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue May 11 14:40:48 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue May 11 14:40:48 2010 +0200" }, "message": "ipv6: ip6mr: move unres_queue and timer to per-namespace data\n\nThe unres_queue is currently shared between all namespaces. Following patches\nwill additionally allow to create multiple multicast routing tables in each\nnamespace. Having a single shared queue for all these users seems to excessive,\nmove the queue and the cleanup timer to the per-namespace data to unshare it.\n\nAs a side-effect, this fixes a bug in the seq file iteration functions: the\nfirst entry returned is always from the current namespace, entries returned\nafter that may belong to any namespace.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "1e4b1057121bc756b91758a434b504d2010f6088", "tree": "b016cf2c728289c7e36d9e4e488f30ab0bd0ae6e", "parents": [ "3b254c54ec46eb022cb26ee6ab37fae23f5f7d6a", "3ee943728fff536edaf8f59faa58aaa1aa7366e3" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon May 10 18:39:28 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon May 10 18:39:28 2010 +0200" }, "message": "Merge branch \u0027master\u0027 of /repos/git/net-next-2.6\n\nConflicts:\n\tnet/bridge/br_device.c\n\tnet/bridge/br_forward.c\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "d6bc0149d8f2300bffa03ea6fea3ca39744277a6", "tree": "5f9ecb7150071515e2b7f6557229cb7100549e53", "parents": [ "575400bf5d57f53a767bc215bd709e65e5b27a5c" ], "author": { "name": "Bjørn Mork", "email": "bjorn@mork.no", "time": "Thu May 06 03:44:35 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 06 21:50:17 2010 -0700" }, "message": "ipv6: udp: make short packet logging consistent with ipv4\n\nAdding addresses and ports to the short packet log message,\nlike ipv4/udp.c does it, makes these messages a lot more useful:\n\n[ 822.182450] UDPv6: short packet: From [2001:db8:ffb4:3::1]:47839 23715/178 to [2001:db8:ffb4:3:5054:ff:feff:200]:1234\n\nThis requires us to drop logging in case pskb_may_pull() fails,\nwhich also is consistent with ipv4/udp.c\n\nSigned-off-by: Bjørn Mork \u003cbjorn@mork.no\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d40a4de0be08f005814a4fddac748fe5353208ec", "tree": "82b5bf934623d92ec178ec62339e4ff29f23c25b", "parents": [ "7df9c43fbe470628a755dfd028e58fdd7ab9b44e" ], "author": { "name": "Brian Haley", "email": "brian.haley@hp.com", "time": "Mon May 03 15:44:27 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 05 21:32:40 2010 -0700" }, "message": "IPv6: fix IPV6_RECVERR handling of locally-generated errors\n\nI noticed when I added support for IPV6_DONTFRAG that if you set\nIPV6_RECVERR and tried to send a UDP packet larger than 64K to an\nIPv6 destination, you\u0027d correctly get an EMSGSIZE, but reading from\nMSG_ERRQUEUE returned the incorrect address in the cmsg:\n\nstruct msghdr:\n\t msg_name 0x7fff8f3c96d0\n\t msg_namelen 28\nstruct sockaddr_in6:\n\t sin6_family 10\n\t sin6_port 7639\n\t sin6_flowinfo 0\n\t sin6_addr ::ffff:38.32.0.0\n\t sin6_scope_id 0 ((null))\n\nIt should have returned this in my case:\n\nstruct msghdr:\n\t msg_name 0x7fffd866b510\n\t msg_namelen 28\nstruct sockaddr_in6:\n\t sin6_family 10\n\t sin6_port 7639\n\t sin6_flowinfo 0\n\t sin6_addr 2620:0:a09:e000:21f:29ff:fe57:f88b\n\t sin6_scope_id 0 ((null))\n\nThe problem is that ipv6_recv_error() assumes that if the error\nwasn\u0027t generated by ICMPv6, it\u0027s an IPv4 address sitting there,\nand proceeds to create a v4-mapped address from it.\n\nChange ipv6_icmp_error() and ipv6_local_error() to set skb-\u003eprotocol\nto htons(ETH_P_IPV6) so that ipv6_recv_error() knows the address\nsitting right after the extended error is IPv6, else it will\nincorrectly map the first octet into an IPv4-mapped IPv6 address\nin the cmsg structure returned in a recvmsg() call to obtain\nthe error.\n\nSigned-off-by: Brian Haley \u003cbrian.haley@hp.com\u003e\n\n--\nTo unsubscribe from this list: send the line \"unsubscribe netdev\" in\nthe body of a message to majordomo@vger.kernel.org\nMore majordomo info at http://vger.kernel.org/majordomo-info.html\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f935aa9e99d6ec74a50871c120e6b21de7256efb", "tree": "556229f3c69b2cc01f954266c286e7721d19276f", "parents": [ "1827d2e943eeb5cba0662f3e6edc342d6bd65ae6" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 03 23:42:27 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 03 23:42:27 2010 -0700" }, "message": "ipv6: Fix default multicast hops setting.\n\nAs per RFC 3493 the default multicast hops setting\nfor a socket should be \"1\" just like ipv4.\n\nIronically we have a IPV6_DEFAULT_MCASTHOPS macro\nit just wasn\u0027t being used.\n\nReported-by: Elliot Hughes \u003cenh@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4f70ecca9c57731b4acbe5043eb22e4416bd2368", "tree": "3b725168959ffd2b65152e27dbe3479f6e110dd3", "parents": [ "52a60ed2da716105de5f906a3630c475264b87d5" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon May 03 10:50:14 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 03 15:53:54 2010 -0700" }, "message": "net: rcu fixes\n\nAdd hlist_for_each_entry_rcu_bh() and\nhlist_for_each_entry_continue_rcu_bh() macros, and use them in\nipv6_get_ifaddr(), if6_get_first() and if6_get_next() to fix lockdeps\nwarnings.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nReviewed-by: \"Paul E. McKenney\" \u003cpaulmck@linux.vnet.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7ef527377b88ff05fb122a47619ea506c631c914", "tree": "2c2e774527d5f591b975834f43e8c6fd12fb38f2", "parents": [ "47d29646a2c1c147d8a7598aeac2c87dd71ed638", "1183f3838c588545592c042c0ce15015661ce7f2" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 02 21:43:40 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 02 22:02:06 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "ef53d702c3614fb919e8a8291033e3dbccfd1aea", "tree": "d237976bdef0ab6a863e3a3b82d13d6c302b6178", "parents": [ "c29c949288d343be0d5c4f3091bc87ac047e1a09" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Thu Jul 09 19:14:18 2009 +0200" }, "committer": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Sun May 02 14:13:03 2010 +0200" }, "message": "netfilter: xtables: dissolve do_match function\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\n" }, { "commit": "83d7eb2979cd3390c375470225dd2d8f2009bc70", "tree": "9f387e28439c113772af962c1b6da9a1f7731f32", "parents": [ "4b021628beb26238087812829cc080da47e4b236" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Fri Apr 30 16:42:08 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 30 16:42:08 2010 -0700" }, "message": "ipv6: cleanup: remove unneeded null check\n\nWe dereference \"sk\" unconditionally elsewhere in the function. \n\nThis was left over from: b30bd282 \"ip6_xmit: remove unnecessary NULL\nptr check\". According to that commit message, \"the sk argument to \nip6_xmit is never NULL nowadays since the skb-\u003epriority assigment \nexpects a valid socket.\"\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" } ], "next": "f84af32cbca70a3c6d30463dc08c7984af11c277" }