)]}' { "log": [ { "commit": "870be39258cf84b65accf629f5f9e816b1b8512e", "tree": "ef9ff9af22efbcddf0b9bb961ff0bb8edc414501", "parents": [ "337ac9d5218cc19f40fca13fa4deb3c658c4241b" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sat Oct 30 16:17:23 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Oct 30 16:17:23 2010 -0700" }, "message": "ipv6/udp: report SndbufErrors and RcvbufErrors\n\ncommit a18135eb9389 (Add UDP_MIB_{SND,RCV}BUFERRORS handling.)\nforgot to make the necessary changes in net/ipv6/proc.c to report\nadditional counters in /proc/net/snmp6\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "74b0b85b88aaa952023762e0280799aaae849841", "tree": "a3049c0efd6332785e2323581506c89d49c67538", "parents": [ "1933f0c09438ed8ccfee2281b814d9b26cef336c" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Wed Oct 27 05:43:53 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 27 14:20:08 2010 -0700" }, "message": "tunnels: Fix tunnels change rcu protection\n\nAfter making rcu protection for tunnels (ipip, gre, sit and ip6) a bug\nwas introduced into the SIOCCHGTUNNEL code.\n\nThe tunnel is first unlinked, then addresses change, then it is linked\nback probably into another bucket. But while changing the parms, the\nhash table is unlocked to readers and they can lookup the improper tunnel.\n\nRespective commits are b7285b79 (ipip: get rid of ipip_lock), 1507850b\n(gre: get rid of ipgre_lock), 3a43be3c (sit: get rid of ipip6_lock) and\n94767632 (ip6tnl: get rid of ip6_tnl_lock).\n\nThe quick fix is to wait for quiescent state to pass after unlinking,\nbut if it is inappropriate I can invent something better, just let me\nknow.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@openvz.org\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e0ad61ec867fdd262804afa7a68e11fc9930c2b9", "tree": "f59451cdfa2086757e55b18b87167b0fef3de2c1", "parents": [ "1c31720a74e19bb57f301350a3b03210fa2ba9e3" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Oct 25 21:02:28 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 27 11:37:31 2010 -0700" }, "message": "net: add __rcu annotations to protocol\n\nAdd __rcu annotations to :\n struct net_protocol *inet_protos\n struct net_protocol *inet6_protos\n\nAnd use appropriate casts to reduce sparse warnings if\nCONFIG_SPARSE_RCU_POINTER\u003dy\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "853dc2e03ddd0c49885ed55c48755d2b1073122a", "tree": "04269eb6d7e502ee4db2b3658b0eef22c67d34eb", "parents": [ "66c68bcc489fadd4f5e8839e966e3a366e50d1d5" ], "author": { "name": "Ursula Braun", "email": "ursula.braun@de.ibm.com", "time": "Sun Oct 24 23:06:43 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 27 11:37:30 2010 -0700" }, "message": "ipv6: fix refcnt problem related to POSTDAD state\n\nAfter running this bonding setup script\n modprobe bonding miimon\u003d100 mode\u003d0 max_bonds\u003d1\n ifconfig bond0 10.1.1.1/16\n ifenslave bond0 eth1\n ifenslave bond0 eth3\non s390 with qeth-driven slaves, modprobe -r fails with this message\n unregister_netdevice: waiting for bond0 to become free. Usage count \u003d 1\ndue to twice detection of duplicate address.\nProblem is caused by a missing decrease of ifp-\u003erefcnt in addrconf_dad_failure.\nAn extra call of in6_ifa_put(ifp) solves it.\nProblem has been introduced with commit f2344a131bccdbfc5338e17fa71a807dee7944fa.\n\nSigned-off-by: Ursula Braun \u003cursula.braun@de.ibm.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nAcked-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7a876b0efcba3804da3051313445fa7be751cab7", "tree": "2135dfa1c8ffa8807e831d0817f49a31caf22cc2", "parents": [ "aed65501e8c072b52c5b4dc807cd938659329673" ], "author": { "name": "Glenn Wurster", "email": "gwurster@scs.carleton.ca", "time": "Mon Sep 27 07:10:10 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 26 12:35:13 2010 -0700" }, "message": "IPv6: Temp addresses are immediately deleted.\n\nThere is a bug in the interaction between ipv6_create_tempaddr and\naddrconf_verify. Because ipv6_create_tempaddr uses the cstamp and tstamp\nfrom the public address in creating a private address, if we have not\nreceived a router advertisement in a while, tstamp + temp_valid_lft might be\n\u003c now. If this happens, the new address is created inside\nipv6_create_tempaddr, then the loop within addrconf_verify starts again and\nthe address is immediately deleted. We are left with no temporary addresses\non the interface, and no more will be created until the public IP address is\nupdated. To avoid this, set the expiry time to be the minimum of the time\nleft on the public address or the config option PLUS the current age of the\npublic interface.\n\nSigned-off-by: Glenn Wurster \u003cgwurster@scs.carleton.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "aed65501e8c072b52c5b4dc807cd938659329673", "tree": "c604168d37323a2ca02faee256cb0d21e9ccf578", "parents": [ "ded85aa86bff953190cb893fceeecaadcab53a80" ], "author": { "name": "Glenn Wurster", "email": "gwurster@scs.carleton.ca", "time": "Mon Sep 27 07:04:30 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 26 12:35:12 2010 -0700" }, "message": "IPv6: Create temporary address if none exists.\n\nIf privacy extentions are enabled, but no current temporary address exists,\nthen create one when we get a router advertisement.\n\nSigned-off-by: Glenn Wurster \u003cgwurster@scs.carleton.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7932c2e55c707350ac166effea2f49afe2e47400", "tree": "875bba102f539fc138c4d8979e620f02d5c8ed07", "parents": [ "10d8c4638c5a797baad5846a3447c0ccca8986a3" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 26 09:08:53 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 26 09:08:53 2010 -0700" }, "message": "netfilter: Add missing CONFIG_SYSCTL checks in ipv6\u0027s nf_conntrack_reasm.c\n\nReported-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0d7da9ddd9a4eb7808698d04b98bf9d62d02649b", "tree": "b170122c08d47be35a056782be54573ba19fe0b0", "parents": [ "1c87733d0682547050ccccb400cdac425fa43b39" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Oct 25 03:47:05 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 25 14:18:28 2010 -0700" }, "message": "net: add __rcu annotation to sk_filter\n\nAdd __rcu annotation to :\n (struct sock)-\u003esk_filter\n\nAnd use appropriate rcu primitives to reduce sparse warnings if\nCONFIG_SPARSE_RCU_POINTER\u003dy\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f6318e558806c925029dc101f14874be9f9fa78f", "tree": "995a09d340c55a01a4d1b6235c3a8efea6b8a14f", "parents": [ "6f0bcf152582e7403155627a38e07bf3ef7f3cf5" ], "author": { "name": "KOVACS Krisztian", "email": "hidden@balabit.hu", "time": "Sun Oct 24 23:38:32 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 25 13:58:36 2010 -0700" }, "message": "netfilter: fix module dependency issues with IPv6 defragmentation, ip6tables and xt_TPROXY\n\nOne of the previous tproxy related patches split IPv6 defragmentation and\nconnection tracking, but did not correctly add Kconfig stanzas to handle the\nnew dependencies correctly. This patch fixes that by making the config options\nmirror the setup we have for IPv4: a distinct config option for defragmentation\nthat is automatically selected by both connection tracking and\nxt_TPROXY/xt_socket.\n\nThe patch also changes the #ifdefs enclosing IPv6 specific code in xt_socket\nand xt_TPROXY: we only compile these in case we have ip6tables support enabled.\n\nSigned-off-by: KOVACS Krisztian \u003chidden@balabit.hu\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6f0bcf152582e7403155627a38e07bf3ef7f3cf5", "tree": "0dafb9ea61fa01bb8850ee2bcce97b98c23a7c8f", "parents": [ "3cc77ec74e1583b50b8405114cdbd6b8ebb8c474" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sun Oct 24 21:33:16 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 25 13:09:45 2010 -0700" }, "message": "tunnels: add _rcu annotations\n\n(struct ip6_tnl)-\u003enext is rcu protected :\n(struct ip_tunnel)-\u003enext is rcu protected :\n(struct xfrm6_tunnel)-\u003enext is rcu protected :\n\nadd __rcu annotation and proper rcu primitives.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b889416b54c90f59276537debd92cb4e84b5f550", "tree": "2f4280710cc870e794f270c5978a957ae0c0fce6", "parents": [ "0561cf3dbff1f37c0d374fb1b824ef3a117c85e0" ], "author": { "name": "Balazs Scheidler", "email": "bazsi@balabit.hu", "time": "Sat Oct 23 04:48:14 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Oct 24 16:07:50 2010 -0700" }, "message": "tproxy: Add missing CAP_NET_ADMIN check to ipv6 side\n\nIP_TRANSPARENT requires root (more precisely CAP_NET_ADMIN privielges)\nfor IPV6.\n\nHowever as I see right now this check was missed from the IPv6\nimplementation.\n\nAcked-by: YOSHIFUJI Hideaki \u003cyoshfuji@linux-ipv6.org\u003e\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7e223de84b73c621b90755dc4d8c8128e673b529", "tree": "557da4e39468f85b12e2ab051e9caa28e6a3cb17", "parents": [ "d618222352ac95ff9a21f1fc1018fffeb8952194" ], "author": { "name": "Anders Franzen", "email": "anders.franzen@ericsson.com", "time": "Tue Oct 19 03:50:47 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Oct 24 15:23:36 2010 -0700" }, "message": "ip6_tunnel dont update the mtu on the route.\n\nThe ip6_tunnel device did not unset the flag,\nIFF_XMIT_DST_RELEASE. This will make the dev layer\nto release the dst before calling the tunnel.\nThe tunnel will not update any mtu/pmtu info, since\nit does not have a dst on the skb.\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9941fb62762253774cc6177d0b9172ece5133fe1", "tree": "641fc2b376e2f84c7023aa0cd8b9d76f954cc3a1", "parents": [ "a5190b4eea1f1c53ee26b3d1176441cafa8e7f79", "3b1a1ce6f418cb7ab35eb55c8a6575987a524e30" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 21 08:21:34 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 21 08:21:34 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6\n" }, { "commit": "0a513f6af962525ed4b3395f8c8d5daae8682aa9", "tree": "2f08f18708b6ec4f2621b98c0095b9698993d45d", "parents": [ "6c46862280c5f55eda7750391bc65cd7e08c7535" ], "author": { "name": "Balazs Scheidler", "email": "bazsi@balabit.hu", "time": "Thu Oct 21 16:10:03 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Oct 21 16:10:03 2010 +0200" }, "message": "tproxy: allow non-local binds of IPv6 sockets if IP_TRANSPARENT is enabled\n\nSigned-off-by: Balazs Scheidler \u003cbazsi@balabit.hu\u003e\nSigned-off-by: KOVACS Krisztian \u003chidden@balabit.hu\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "6c46862280c5f55eda7750391bc65cd7e08c7535", "tree": "51d670eebe49ff8f6c3f903f77d44230849f7583", "parents": [ "aa976fc011efa1f0e3290c6c9addf7c20757f885" ], "author": { "name": "Balazs Scheidler", "email": "bazsi@balabit.hu", "time": "Thu Oct 21 16:08:28 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Oct 21 16:08:28 2010 +0200" }, "message": "tproxy: added tproxy sockopt interface in the IPV6 layer\n\nSupport for IPV6_RECVORIGDSTADDR sockopt for UDP sockets were contributed by\nHarry Mason.\n\nSigned-off-by: Balazs Scheidler \u003cbazsi@balabit.hu\u003e\nSigned-off-by: KOVACS Krisztian \u003chidden@balabit.hu\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "aa976fc011efa1f0e3290c6c9addf7c20757f885", "tree": "93e692330e1d8e3e366bb0fec71b394c5e79ee93", "parents": [ "88440ae70eda83d0cc94148d404f4990c9f1289c" ], "author": { "name": "Balazs Scheidler", "email": "bazsi@balabit.hu", "time": "Thu Oct 21 16:05:41 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Oct 21 16:05:41 2010 +0200" }, "message": "tproxy: added udp6_lib_lookup function\n\nJust like with IPv4, we need access to the UDP hash table to look up local\nsockets, but instead of exporting the global udp_table, export a lookup\nfunction.\n\nSigned-off-by: Balazs Scheidler \u003cbazsi@balabit.hu\u003e\nSigned-off-by: KOVACS Krisztian \u003chidden@balabit.hu\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "88440ae70eda83d0cc94148d404f4990c9f1289c", "tree": "1eb2d41db913c3e18e0846c756c317a6a6db7203", "parents": [ "e97c3e278e951501c2f385de70c3ceacdea78c4a" ], "author": { "name": "Balazs Scheidler", "email": "bazsi@balabit.hu", "time": "Thu Oct 21 16:04:33 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Oct 21 16:04:33 2010 +0200" }, "message": "tproxy: added const specifiers to udp lookup functions\n\nThe parameters for various UDP lookup functions were non-const, even though\nthey could be const. TProxy has some const references and instead of\ndowncasting it, I added const specifiers along the path.\n\nSigned-off-by: Balazs Scheidler \u003cbazsi@balabit.hu\u003e\nSigned-off-by: KOVACS Krisztian \u003chidden@balabit.hu\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "e97c3e278e951501c2f385de70c3ceacdea78c4a", "tree": "1794d174ef487cff2ff135f8ca4c795c847f41ed", "parents": [ "093d282321daeb19c107e5f1f16d7f68484f3ade" ], "author": { "name": "Balazs Scheidler", "email": "bazsi@balabit.hu", "time": "Thu Oct 21 16:03:43 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Oct 21 16:03:43 2010 +0200" }, "message": "tproxy: split off ipv6 defragmentation to a separate module\n\nLike with IPv4, TProxy needs IPv6 defragmentation but does not\nrequire connection tracking. Since defragmentation was coupled\nwith conntrack, I split off the two, creating an nf_defrag_ipv6 module,\nsimilar to the already existing nf_defrag_ipv4.\n\nSigned-off-by: Balazs Scheidler \u003cbazsi@balabit.hu\u003e\nSigned-off-by: KOVACS Krisztian \u003chidden@balabit.hu\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "093d282321daeb19c107e5f1f16d7f68484f3ade", "tree": "36e9eed23573068819bf67a91caac6ebf60d0d7c", "parents": [ "6006db84a91838813cdad8a6622a4e39efe9ea47" ], "author": { "name": "Balazs Scheidler", "email": "bazsi@balabit.hu", "time": "Thu Oct 21 13:06:43 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Oct 21 13:06:43 2010 +0200" }, "message": "tproxy: fix hash locking issue when using port redirection in __inet_inherit_port()\n\nWhen __inet_inherit_port() is called on a tproxy connection the wrong locks are\nheld for the inet_bind_bucket it is added to. __inet_inherit_port() made an\nimplicit assumption that the listener\u0027s port number (and thus its bind bucket).\nUnfortunately, if you\u0027re using the TPROXY target to redirect skbs to a\ntransparent proxy that assumption is not true anymore and things break.\n\nThis patch adds code to __inet_inherit_port() so that it can handle this case\nby looking up or creating a new bind bucket for the child socket and updates\ncallers of __inet_inherit_port() to gracefully handle __inet_inherit_port()\nfailing.\n\nReported by and original patch from Stephen Buck \u003cstephen.buck@exinda.com\u003e.\nSee http://marc.info/?t\u003d128169268200001\u0026r\u003d1\u0026w\u003d2 for the original discussion.\n\nSigned-off-by: KOVACS Krisztian \u003chidden@balabit.hu\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "6f747aca5e61778190d1e27bdc469f49149f0230", "tree": "127de8b153a05437add3b959f10eea831466781e", "parents": [ "191cc6877408348e90f4adb64726b60a93246b8b" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Fri Oct 15 05:15:59 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 21 03:09:45 2010 -0700" }, "message": "xfrm6: make xfrm6_tunnel_free_spi local\n\nFunction only defined and used in one file.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "76b6717bc6ccb715b04e36efc26566a6313ede5f", "tree": "eecbb09c5775cd3f092cc91e5f15c251c25d3b82", "parents": [ "a91fd267e327ca7599654b4e9ed7b62c5adaccee" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Mon Oct 18 11:13:30 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon Oct 18 11:13:30 2010 +0200" }, "message": "netfilter: fix kconfig unmet dependency warning\n\nFix netfilter kconfig unmet dependencies warning \u0026 spell out\n\"compatible\" while there.\n\nwarning: (IP_NF_TARGET_TTL \u0026\u0026 NET \u0026\u0026 INET \u0026\u0026 NETFILTER \u0026\u0026 IP_NF_IPTABLES \u0026\u0026 NETFILTER_ADVANCED || IP6_NF_TARGET_HL \u0026\u0026 NET \u0026\u0026 INET \u0026\u0026 IPV6 \u0026\u0026 NETFILTER \u0026\u0026 IP6_NF_IPTABLES \u0026\u0026 NETFILTER_ADVANCED) selects NETFILTER_XT_TARGET_HL which has unmet direct dependencies ((IP_NF_MANGLE || IP6_NF_MANGLE) \u0026\u0026 NETFILTER_ADVANCED)\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "10da66f7552b3c7966c2f4f1f72009fb0b5539ec", "tree": "517c39912a0aea9d4da3c3915c78e832dfbba855", "parents": [ "874ffa8f72444d6253d2669fed304875c128f86b" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Oct 13 08:22:03 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Oct 16 11:13:23 2010 -0700" }, "message": "fib: avoid false sharing on fib_table_hash\n\nWhile doing profile analysis, I found fib_hash_table was sometime in a\ncache line shared by a possibly often written kernel structure.\n\n(CONFIG_IP_ROUTE_MULTIPATH || !CONFIG_IPV6_MULTIPLE_TABLES)\n\nIt\u0027s hard to detect because not easily reproductible.\n\nMake sure we allocate a full cache line to keep this shared in all cpus\ncaches.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2c1c00040af3d187b7d602dd53b5adbbf3a4caa4", "tree": "88611bd6da79d83621ec56b7093f999795c31580", "parents": [ "725a4a465c943ab0f91fcffc3846acbcdb704aac" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Oct 13 02:45:40 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Oct 16 11:13:21 2010 -0700" }, "message": "fib6: use FIB_LOOKUP_NOREF in fib6_rule_lookup()\n\nAvoid two atomic ops on found rule in fib6_rule_lookup()\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "243bf6e29eef642de0ff62f1ebf58bc2396d6d6e", "tree": "79f4eb37b594d320d4750e04ce6e16a7d62177f0", "parents": [ "87a2e70db62fec7348c6e5545eb7b7650c33d81b" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Wed Oct 13 16:28:00 2010 +0200" }, "committer": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Wed Oct 13 18:00:46 2010 +0200" }, "message": "netfilter: xtables: resolve indirect macros 3/3\n" }, { "commit": "87a2e70db62fec7348c6e5545eb7b7650c33d81b", "tree": "3aa5dcd79bf7d331c4a69a3a9b1c5b01f00233ad", "parents": [ "12b00c2c025b8af697d9a022ea2e928cad889ef1" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Wed Oct 13 16:11:22 2010 +0200" }, "committer": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Wed Oct 13 18:00:41 2010 +0200" }, "message": "netfilter: xtables: resolve indirect macros 2/3\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\n" }, { "commit": "12b00c2c025b8af697d9a022ea2e928cad889ef1", "tree": "9de3f3a1ed8d79052fdd9abe7d72bed594de6140", "parents": [ "eecc545856c8a0f27783a440d25f4ceaa1f95ce8" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Wed Oct 13 15:56:56 2010 +0200" }, "committer": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Wed Oct 13 18:00:36 2010 +0200" }, "message": "netfilter: xtables: resolve indirect macros 1/3\n\nMany of the used macros are just there for userspace compatibility.\nSubstitute the in-kernel code to directly use the terminal macro\nand stuff the defines into #ifndef __KERNEL__ sections.\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\n" }, { "commit": "fc66f95c68b6d4535a0ea2ea15d5cf626e310956", "tree": "ac3a7f08ad741a67ff683bf93e5669ddcae95ed7", "parents": [ "0ed8ddf4045fcfcac36bad753dc4046118c603ec" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri Oct 08 06:37:34 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 11 13:06:53 2010 -0700" }, "message": "net dst: use a percpu_counter to track entries\n\nstruct dst_ops tracks number of allocated dst in an atomic_t field,\nsubject to high cache line contention in stress workload.\n\nSwitch to a percpu_counter, to reduce number of time we need to dirty a\ncentral location. Place it on a separate cache line to avoid dirtying\nread only fields.\n\nStress test :\n\n(Sending 160.000.000 UDP frames,\nIP route cache disabled, dual E5540 @2.53GHz,\n32bit kernel, FIB_TRIE, SLUB/NUMA)\n\nBefore:\n\nreal 0m51.179s\nuser 0m15.329s\nsys 10m15.942s\n\nAfter:\n\nreal\t0m45.570s\nuser\t0m15.525s\nsys\t9m56.669s\n\nWith a small reordering of struct neighbour fields, subject of a\nfollowing patch, (to separate refcnt from other read mostly fields)\n\nreal\t0m41.841s\nuser\t0m15.261s\nsys\t8m45.949s\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d6bf781712a1d25cc8987036b3a48535b331eb91", "tree": "cf83ab68ef2519576578d8336a43cc13cd375cde", "parents": [ "110b2499370c401cdcc7c63e481084467291d556" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Oct 04 06:15:44 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 05 14:54:36 2010 -0700" }, "message": "net neigh: RCU conversion of neigh hash table\n\nDavid\n\nThis is the first step for RCU conversion of neigh code.\n\nNext patches will convert hash_buckets[] and \"struct neighbour\" to RCU\nprotected objects.\n\nThanks\n\n[PATCH net-next] net neigh: RCU conversion of neigh hash table\n\nInstead of storing hash_buckets, hash_mask and hash_rnd in \"struct\nneigh_table\", a new structure is defined :\n\nstruct neigh_hash_table {\n struct neighbour **hash_buckets;\n unsigned int hash_mask;\n __u32 hash_rnd;\n struct rcu_head rcu;\n};\n\nAnd \"struct neigh_table\" has an RCU protected pointer to such a\nneigh_hash_table.\n\nThis means the signature of (*hash)() function changed: We need to add a\nthird parameter with the actual hash_rnd value, since this is not\nanymore a neigh_table field.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "caf586e5f23cebb2a68cbaf288d59dbbf2d74052", "tree": "5c0dfcf5a14c55501f9225835c83abddb8d1876e", "parents": [ "a00eac0c459abecb539fb2a2abd3122dd7ca5d4a" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Sep 30 21:06:55 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 05 14:47:55 2010 -0700" }, "message": "net: add a core netdev-\u003erx_dropped counter\n\nIn various situations, a device provides a packet to our stack and we\ndrop it before it enters protocol stack :\n- softnet backlog full (accounted in /proc/net/softnet_stat)\n- bad vlan tag (not accounted)\n- unknown/unregistered protocol (not accounted)\n\nWe can handle a per-device counter of such dropped frames at core level,\nand automatically adds it to the device provided stats (rx_dropped), so\nthat standard tools can be used (ifconfig, ip link, cat /proc/net/dev)\n\nThis is a generalization of commit 8990f468a (net: rx_dropped\naccounting), thus reverting it.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c61393ea83573ff422af505b6fd49ef9ec9b91ca", "tree": "4dbaf967e7293618205622776d553e37ec0a2f3e", "parents": [ "1df9916e46451533463f227e6be57cc2cfca4c5f" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Mon Oct 04 20:17:53 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 05 00:47:39 2010 -0700" }, "message": "ipv6: make __ipv6_isatap_ifid static\n\nAnother exported symbol only used in one file\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "21a180cda012e1f93e362dd4a9b0bfd3d8c92940", "tree": "0e0d10baa3fdcd8ffbc6881076ff1695808dad9d", "parents": [ "c7d4426a98a5f6654cd0b4b33d9dab2e77192c18", "51e97a12bef19b7e43199fc153cf9bd5f2140362" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 04 11:56:38 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 04 11:56:38 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tnet/ipv4/Kconfig\n\tnet/ipv4/tcp_timer.c\n" }, { "commit": "a8defca048fd11eb2d1a17ab61a60a856292dd4e", "tree": "b486460fd1f2310cd4572bd36c126a3fa8b3a5c5", "parents": [ "0c200d935346fe0ebde9b6dffbb683dddd166fb9" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Oct 04 20:56:05 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon Oct 04 20:56:05 2010 +0200" }, "message": "netfilter: ipt_LOG: add bufferisation to call printk() once\n\nipt_LOG \u0026 ip6t_LOG use lot of calls to printk() and use a lock in a hope\nseveral cpus wont mix their output in syslog.\n\nprintk() being very expensive [1], its better to call it once, on a\nprebuilt and complete line. Also, with mixed IPv4 and IPv6 trafic,\nseparate IPv4/IPv6 locks dont avoid garbage.\n\nI used an allocation of a 1024 bytes structure, sort of seq_printf() but\nwith a fixed size limit.\nUse a static buffer if dynamic allocation failed.\n\nEmit a once time alert if buffer size happens to be too short.\n\n[1]: printk() has various features like printk_delay()...\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "ae878ae280bea286ff2b1e1cb6e609dd8cb4501d", "tree": "06aee50c978db50558ef9b0d80790d75156b1feb", "parents": [ "173e79fb70a98b5b223f8dc09c22990d777bdd78" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Sun Oct 03 14:49:00 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Oct 03 14:49:00 2010 -0700" }, "message": "net: Fix IPv6 PMTU disc. w/ asymmetric routes\n\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8560f2266b36adb43238f1f9fd13958dd031901c", "tree": "da92b380a566f5e2daba65678b874f0f2c4df3cb", "parents": [ "153f0943382e9ae0bff7caa110a1a4656088d0d4" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Sep 28 03:23:34 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 29 13:25:52 2010 -0700" }, "message": "ip6tnl: percpu stats accounting\n\nMaintain per_cpu tx_bytes, tx_packets, rx_bytes, rx_packets.\n\nOther seldom used fields are kept in netdev-\u003estats structure, possibly\nunsafe.\n\nThis is a preliminary work to support lockless transmit path, and\ncorrect RX stats, that are already unsafe.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8df40d1033d64597dcf1efd4f7547e817f7a953b", "tree": "b6ec7503d4d38c53d1123b184df7acad9a1debe4", "parents": [ "dd4080ee575db1a2d0f40538aed5aa7662a06c54" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Sep 28 02:53:41 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 29 13:25:37 2010 -0700" }, "message": "sit: enable lockless xmits\n\nSIT tunnels can benefit from lockless xmits, using NETIF_F_LLTX\n\nBench on a 16 cpus machine (dual E5540 cpus), 16 threads sending\n10000000 UDP frames via one sit tunnel (size:220 bytes per frame)\n\nBefore patch :\n\nreal\t3m15.399s\nuser\t0m9.185s\nsys\t51m55.403s\n\n75029.00 87.5% _raw_spin_lock vmlinux\n 1090.00 1.3% dst_release vmlinux\n 902.00 1.1% dev_queue_xmit vmlinux\n 627.00 0.7% sock_wfree vmlinux\n 613.00 0.7% ip6_push_pending_frames ipv6.ko\n 505.00 0.6% __ip_route_output_key vmlinux\n\nAfter patch:\n\nreal\t1m1.387s\nuser\t0m12.489s\nsys\t15m58.868s\n\n28239.00 23.3% dst_release vmlinux\n13570.00 11.2% ip6_push_pending_frames ipv6.ko\n13118.00 10.8% ip6_append_data ipv6.ko\n 7995.00 6.6% __ip_route_output_key vmlinux\n 7924.00 6.5% sk_dst_check vmlinux\n 5015.00 4.1% udpv6_sendmsg ipv6.ko\n 3594.00 3.0% sock_alloc_send_pskb vmlinux\n 3135.00 2.6% sock_wfree vmlinux\n 3055.00 2.5% ip6_sk_dst_lookup ipv6.ko\n 2473.00 2.0% ip_finish_output vmlinux\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "dd4080ee575db1a2d0f40538aed5aa7662a06c54", "tree": "7e8627bf0bb37ada382b5d34d15073c4fcfb2366", "parents": [ "fada5636fe41fd1423fe4e6af7b9f609378acde6" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Sep 28 02:17:58 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 29 13:25:21 2010 -0700" }, "message": "sit: fix percpu stats accounting\n\ncommit 15fc1f7056ebd (sit: percpu stats accounting) forgot the fallback\ntunnel case (sit0), and can crash pretty fast.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ab79ad14a2d51e95f0ac3cef7cd116a57089ba82", "tree": "bfe0887548935354c671103e9718965e208db652", "parents": [ "4465b469008bc03b98a1b8df4e9ae501b6c69d4b" ], "author": { "name": "Maciej Żenczykowski", "email": "maze@google.com", "time": "Mon Sep 27 00:07:02 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Sep 28 23:38:15 2010 -0700" }, "message": "ipv6: Implement Any-IP support for IPv6.\n\nAnyIP is the capability to receive packets and establish incoming\nconnections on IPs we have not explicitly configured on the machine.\n\nAn example use case is to configure a machine to accept all incoming\ntraffic on eth0, and leave the policy of whether traffic for a given IP\nshould be delivered to the machine up to the load balancer.\n\nCan be setup as follows:\n ip -6 rule from all iif eth0 lookup 200\n ip -6 route add local default dev lo table 200\n(in this case for all IPv6 addresses)\n\nSigned-off-by: Maciej Żenczykowski \u003cmaze@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "15fc1f7056ebdc57e23f99077fec89e63e6fa941", "tree": "a2c08d2a77cec6255a5718ed296592b1fc0d33ed", "parents": [ "3c97af99a5aa17feaebb4eb0f85f51ab6c055797" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Sep 27 00:38:18 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 27 21:30:44 2010 -0700" }, "message": "sit: percpu stats accounting\n\nMaintain per_cpu tx_bytes, tx_packets, rx_bytes, rx_packets.\n\nOther seldom used fields are kept in netdev-\u003estats structure, possibly\nunsafe.\n\nThis is a preliminary work to support lockless transmit path, and\ncorrect RX stats, that are already unsafe.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7e1b33e5ea392dfc984fc63b76ca75acbf249dcd", "tree": "00fbab440aabca3123b999da42901a7261203c11", "parents": [ "b3de7559afbb7a8a35b4be975a6adf6c5e3cdca0" ], "author": { "name": "Ulrich Weber", "email": "uweber@astaro.com", "time": "Mon Sep 27 15:02:18 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 27 15:02:18 2010 -0700" }, "message": "ipv6: add IPv6 to neighbour table overflow warning\n\nIPv4 and IPv6 have separate neighbour tables, so\nthe warning messages should be distinguishable.\n\n[ Add a suitable message prefix on the ipv4 side as well -DaveM ]\n\nSigned-off-by: Ulrich Weber \u003cuweber@astaro.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e40051d134f7ee95c8c1f7a3471e84eafc9ab326", "tree": "88eb44e49a75721ae926665a2c42f08badac9d07", "parents": [ "42099d7a3941d4aaf853caac92b3ae76149fc6e7", "2cc6d2bf3d6195fabcf0febc192c01f99519a8f3" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 27 01:03:03 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 27 01:03:03 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/qlcnic/qlcnic_init.c\n\tnet/ipv4/ip_output.c\n" }, { "commit": "2cc6d2bf3d6195fabcf0febc192c01f99519a8f3", "tree": "6fbbaa255617783eda308a00a21065bc99ad0d21", "parents": [ "bc68580d41b131396054a1a04a7df4948555ed97" ], "author": { "name": "Neil Horman", "email": "nhorman@tuxdriver.com", "time": "Fri Sep 24 09:55:52 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Sep 26 19:09:25 2010 -0700" }, "message": "ipv6: add a missing unregister_pernet_subsys call\n\nClean up a missing exit path in the ipv6 module init routines. In\naddrconf_init we call ipv6_addr_label_init which calls register_pernet_subsys\nfor the ipv6_addr_label_ops structure. But if module loading fails, or if the\nipv6 module is removed, there is no corresponding unregister_pernet_subsys call,\nwhich leaves a now-bogus address on the pernet_list, leading to oopses in\nsubsequent registrations. This patch cleans up both the failed load path and\nthe unload path. Tested by myself with good results.\n\nSigned-off-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\n\n include/net/addrconf.h | 1 +\n net/ipv6/addrconf.c | 11 ++++++++---\n net/ipv6/addrlabel.c | 5 +++++\n 3 files changed, 14 insertions(+), 3 deletions(-)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a02cec2155fbea457eca8881870fd2de1a4c4c76", "tree": "cfbfc4b32bfe10f9cd803d46c31607d13f1858f5", "parents": [ "6a08d194ee40806e0ccd5f36ed768e64cbfc979f" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Sep 22 20:43:57 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 23 14:33:39 2010 -0700" }, "message": "net: return operator cleanup\n\nChange \"return (EXPR);\" to \"return EXPR;\"\n\nreturn is not a function, parentheses are not required.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3d13008e7345fa7a79d8f6438150dc15d6ba6e9d", "tree": "a36caa5636e4030419ca8907642e75c0cd565143", "parents": [ "7e96dc7045bff8758804b047c0dfb6868f182500" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Sep 21 08:47:45 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Sep 21 15:05:50 2010 -0700" }, "message": "ip: fix truesize mismatch in ip fragmentation\n\nSpecial care should be taken when slow path is hit in ip_fragment() :\n\nWhen walking through frags, we transfert truesize ownership from skb to\nfrags. Then if we hit a slow_path condition, we must undo this or risk\nuncharging frags-\u003etruesize twice, and in the end, having negative socket\nsk_wmem_alloc counter, or even freeing socket sooner than expected.\n\nMany thanks to Nick Bowler, who provided a very clean bug report and\ntest program.\n\nThanks to Jarek for reviewing my first patch and providing a V2\n\nWhile Nick bisection pointed to commit 2b85a34e911 (net: No more\nexpensive sock_hold()/sock_put() on each tx), underlying bug is older\n(2.6.12-rc5)\n\nA side effect is to extend work done in commit b2722b1c3a893e\n(ip_fragment: also adjust skb-\u003etruesize for packets not owned by a\nsocket) to ipv6 as well.\n\nReported-and-bisected-by: Nick Bowler \u003cnbowler@elliptictech.com\u003e\nTested-by: Nick Bowler \u003cnbowler@elliptictech.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nCC: Patrick McHardy \u003ckaber@trash.net\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": "8990f468ae9010ab0af4be8f51bf7ab833a67202", "tree": "e84ad358ed67da6011b1e20f3d8039d1f9f07e4a", "parents": [ "462fb2af9788a82a534f8184abfde31574e1cfa0" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Sep 20 00:12:11 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 20 10:08:58 2010 -0700" }, "message": "net: rx_dropped accounting\n\nUnder load, netif_rx() can drop incoming packets but administrators dont\nhave a chance to spot which device needs some tuning (RPS activation for\nexample)\n\nThis patch adds rx_dropped accounting in vlans and tunnels.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "94767632623c7bf5b16a0cf963ec93a8ad9acca4", "tree": "2d6f3328ac632de5b4cd5c35a79a8bc270f091fe", "parents": [ "caeda9b926c608702c99f3432aae2c24298c3c1d" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Sep 15 20:25:34 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 16 21:58:44 2010 -0700" }, "message": "ip6tnl: get rid of ip6_tnl_lock\n\nAs RTNL is held while doing tunnels inserts and deletes, we can remove\nip6_tnl_lock spinlock. My initial RCU conversion was conservative and\nconverted the rwlock to spinlock, with no RTNL requirement.\n\nUse appropriate rcu annotations and modern lockdep checks 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": "3a43be3c328ff42327da0b141de360dc4587aab7", "tree": "669c86867533e70dfe3a2aa52e17802aeb2e60bf", "parents": [ "1507850b400492fdedc3064d3b8db5e9a1c871e3" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Sep 15 11:35:10 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 15 19:29:47 2010 -0700" }, "message": "sit: get rid of ipip6_lock\n\nAs RTNL is held while doing tunnels inserts and deletes, we can remove\nipip6_lock spinlock. My initial RCU conversion was conservative and\nconverted the rwlock to spinlock, with no RTNL requirement.\n\nUse appropriate rcu annotations and modern lockdep checks 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": "e548833df83c3554229eff0672900bfe958b45fd", "tree": "85efc4a76dc356593d6d394776aeb845dc580fb6", "parents": [ "cbd9da7be869f676afc204e1a664163778c770bd", "053d8f6622701f849fda2ca2c9ae596c13599ba9" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 09 22:27:33 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 09 22:27:33 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tnet/mac80211/main.c\n" }, { "commit": "49d61e2390c92bd226fc395a6165eb5a65ae4de6", "tree": "d5c6e07e51999aca2a461c7087b7a01461c66ba8", "parents": [ "f39234d60617d37818b30991e6794643ce220296" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Sep 09 05:33:43 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 09 15:02:39 2010 -0700" }, "message": "tunnels: missing rcu_assign_pointer()\n\nxfrm4_tunnel_register() \u0026 xfrm6_tunnel_register() should\nuse rcu_assign_pointer() to make sure previous writes\n(to handler-\u003enext) are committed to memory before chain\ninsertion.\n\nderegister functions dont need a particular barrier.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "719f835853a92f6090258114a72ffe41f09155cd", "tree": "a077b05397bf07a096be7f07b50375c5ed918ac2", "parents": [ "ae2688d59b5f861dc70a091d003773975d2ae7fb" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Sep 08 05:08:44 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 08 21:45:01 2010 -0700" }, "message": "udp: add rehash on connect()\n\ncommit 30fff923 introduced in linux-2.6.33 (udp: bind() optimisation)\nadded a secondary hash on UDP, hashed on (local addr, local port).\n\nProblem is that following sequence :\n\nfd \u003d socket(...)\nconnect(fd, \u0026remote, ...)\n\nnot only selects remote end point (address and port), but also sets\nlocal address, while UDP stack stored in secondary hash table the socket\nwhile its local address was INADDR_ANY (or ipv6 equivalent)\n\nSequence is :\n - autobind() : choose a random local port, insert socket in hash tables\n [while local address is INADDR_ANY]\n - connect() : set remote address and port, change local address to IP\n given by a route lookup.\n\nWhen an incoming UDP frame comes, if more than 10 sockets are found in\nprimary hash table, we switch to secondary table, and fail to find\nsocket because its local address changed.\n\nOne solution to this problem is to rehash datagram socket if needed.\n\nWe add a new rehash(struct socket *) method in \"struct proto\", and\nimplement this method for UDP v4 \u0026 v6, using a common helper.\n\nThis rehashing only takes care of secondary hash table, since primary\nhash (based on local port only) is not changed.\n\nReported-by: Krzysztof Piotr Oledzki \u003cole@ans.pl\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nTested-by: Krzysztof Piotr Oledzki \u003cole@ans.pl\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e0386005ff2a729998735e10769d99e1acbc2dd1", "tree": "c04134571b728581d9692fb16dffcdd38d52dbda", "parents": [ "92e32eaee288ee2e838fe76680cbaeaea25643c6" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Sep 08 21:31:35 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 08 21:31:35 2010 -0700" }, "message": "net: inet_add_protocol() can use cmpxchg()\n\nUse cmpxchg() to get rid of spinlocks in inet_add_protocol() and\nfriends.\n\ninet_protos[] \u0026 inet6_protos[] are moved to read_mostly section\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1ee89bd0fe72e381c8e4ef887d53c19c8adc6c93", "tree": "3a73d6913b51dc91114443c5af2a1d44c59735c6", "parents": [ "70789d7052239992824628db8133de08dc78e593" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Fri Sep 03 05:13:07 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Sep 07 13:57:21 2010 -0700" }, "message": "netfilter: discard overlapping IPv6 fragment\n\nRFC5722 prohibits reassembling IPv6 fragments when some data overlaps.\n\nBug spotted by Zhang Zuotao \u003czuotao.zhang@6wind.com\u003e.\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "70789d7052239992824628db8133de08dc78e593", "tree": "c1fb08a04f4f3a266165405d2f5d606ddff30479", "parents": [ "deabc772f39405054a438d711f408d2d94d26d96" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Fri Sep 03 05:13:05 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Sep 07 13:57:21 2010 -0700" }, "message": "ipv6: discard overlapping fragment\n\nRFC5722 prohibits reassembling fragments when some data overlaps.\n\nBug spotted by Zhang Zuotao \u003czuotao.zhang@6wind.com\u003e.\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c3bccac2fa76f1619dfe4fb7b9bee69de7f066d8", "tree": "f2271f01bae9c3d5c0557a550d62757b0061bf63", "parents": [ "65e9b62d4503849b10bedfc29bff0473760cc597" ], "author": { "name": "Thomas Graf", "email": "tgraf@infradead.org", "time": "Fri Sep 03 03:04:20 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Sep 03 09:43:14 2010 -0700" }, "message": "ipv6: add special mode forwarding\u003d2 to send RS while configured as router\n\nSimilar to accepting router advertisement, the IPv6 stack does not send router\nsolicitations if forwarding is enabled.\n\nThis patch enables this behavior to be overruled by setting forwarding to the\nspecial value 2.\n\nSigned-off-by: Thomas Graf \u003ctgraf@infradead.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "65e9b62d4503849b10bedfc29bff0473760cc597", "tree": "74fb61b4a345ed9ce022d21c4973c056c5516f08", "parents": [ "bc8acf2c8c3e43fcc192762a9f964b3e9a17748b" ], "author": { "name": "Thomas Graf", "email": "tgraf@infradead.org", "time": "Fri Sep 03 02:59:14 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Sep 03 09:43:13 2010 -0700" }, "message": "ipv6: add special mode accept_ra\u003d2 to accept RA while configured as router\n\nThe current IPv6 behavior is to not accept router advertisements while\nforwarding, i.e. configured as router.\n\nThis does make sense, a router is typically not supposed to be auto\nconfigured. However there are exceptions and we should allow the\ncurrent behavior to be overwritten.\n\nTherefore this patch enables the user to overrule the \"if forwarding\nenabled then don\u0027t listen to RAs\" rule by setting accept_ra to the\nspecial value of 2.\n\nAn alternative would be to ignore the forwarding switch alltogether\nand solely accept RAs based on the value of accept_ra. However, I\nfound that if not intended, accepting RAs as a router can lead to\nstrange unwanted behavior therefore we it seems wise to only do so\nif the user explicitely asks for this behavior.\n\nSigned-off-by: Thomas Graf \u003ctgraf@infradead.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "875168a9330d3aa6481ce62ce8fa77c7be0c75fb", "tree": "137a2d264cf960c8f6cc1a8961704cc1062014e7", "parents": [ "064270132602c6e11482439e0e257f208cae79c0" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Aug 30 11:07:25 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 01 10:57:53 2010 -0700" }, "message": "net: tunnels should use rcu_dereference\n\ntunnel4_handlers, tunnel64_handlers, tunnel6_handlers and\ntunnel46_handlers are protected by RCU, but we dont use appropriate rcu\nprimitives to scan them. rcu_lock() is already held by caller.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3ff2cfa55fb35bb5ea4490fbc82bb3c6771c121b", "tree": "4f67088e323cd49b6748e15fba8951eabb80c308", "parents": [ "6dcd814bd08bc7989f7f3eac9bbe8b20aec0182a" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Aug 30 10:27:10 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 30 13:50:46 2010 -0700" }, "message": "ipv6: struct xfrm6_tunnel in read_mostly section\n\ntunnel6_handlers chain being scanned for each incoming packet,\nmake sure it doesnt share an often dirtied cache line.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6dcd814bd08bc7989f7f3eac9bbe8b20aec0182a", "tree": "e8fcde2ef93efa62437aff893477098a1bf8b6a0", "parents": [ "c274f29120eff7852bb2370ae6f05f46de75edbc" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Aug 30 07:04:14 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 30 13:50:45 2010 -0700" }, "message": "net: struct xfrm_tunnel in read_mostly section\n\ntunnel4_handlers chain being scanned for each incoming packet,\nmake sure it doesnt share an often dirtied cache line.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cca77b7c81876d819a5806f408b3c29b5b61a815", "tree": "722c5777a1a96d1d0228c58a6fcbd09c45c8ae56", "parents": [ "6a6d01d374d03bd2f90030200cb78567444addc4" ], "author": { "name": "Florian Westphal", "email": "fw@strlen.de", "time": "Mon Aug 23 14:41:22 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 23 14:41:22 2010 -0700" }, "message": "netfilter: fix CONFIG_COMPAT support\n\ncommit f3c5c1bfd430858d3a05436f82c51e53104feb6b\n(netfilter: xtables: make ip_tables reentrant) forgot to\nalso compute the jumpstack size in the compat handlers.\n\nResult is that \"iptables -I INPUT -j userchain\" turns into -j DROP.\n\nReported by Sebastian Roesner on #netfilter, closes\nhttp://bugzilla.netfilter.org/show_bug.cgi?id\u003d669.\n\nNote: arptables change is compile-tested only.\n\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nTested-by: Mikael Pettersson \u003cmikpe@it.uu.se\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "21dc330157454046dd7c494961277d76e1c957fe", "tree": "4f030efa8d82f7eb9676acd4cfc74921a6d29972", "parents": [ "2d4833aae65589ba4317dd325fe20c8b25c14173" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 23 00:13:46 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 23 00:13:46 2010 -0700" }, "message": "net: Rename skb_has_frags to skb_has_frag_list\n\nSKBs can be \"fragmented\" in two ways, via a page array (called\nskb_shinfo(skb)-\u003efrags[]) and via a list of SKBs (called\nskb_shinfo(skb)-\u003efrag_list).\n\nSince skb_has_frags() tests the latter, it\u0027s name is confusing\nsince it sounds more like it\u0027s testing the former.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "001389b9581c13fe5fc357a0f89234f85af4215d", "tree": "fdf6e017a99229c90d3075b35d7f62edee924c8e", "parents": [ "5ca6f7c85159a5ca7e637b1d9f79f0d9bc56e5dc" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Aug 16 10:22:10 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 17 15:12:14 2010 -0700" }, "message": "netfilter: {ip,ip6,arp}_tables: avoid lockdep false positive\n\nAfter commit 24b36f019 (netfilter: {ip,ip6,arp}_tables: dont block\nbottom half more than necessary), lockdep can raise a warning\nbecause we attempt to lock a spinlock with BH enabled, while\nthe same lock is usually locked by another cpu in a softirq context.\n\nDisable again BH to avoid these lockdep warnings.\n\nReported-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nDiagnosed-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f3d3f616e35db2ceeb11564eafd50759bb5bca8a", "tree": "b01acb2248fec1e2ca48ad7e4644d9136c8c6d36", "parents": [ "2f09a4d5daaa36690d506fafda9c24f2be866f6b" ], "author": { "name": "Min Zhang", "email": "mzhang@mvista.com", "time": "Sat Aug 14 22:42:51 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 14 22:42:51 2010 -0700" }, "message": "ipv6: remove sysctl jiffies conversion on gc_elasticity and min_adv_mss\n\nsysctl output ipv6 gc_elasticity and min_adv_mss as values divided by\nHZ. However, they are not in unit of jiffies, since ip6_rt_min_advmss\nrefers to packet size and ip6_rt_fc_elasticity is used as scaler as in\nexpire\u003e\u003eip6_rt_gc_elasticity, so replace the jiffies conversion\nhandler will regular handler for them.\n\nThis has impact on scripts that are currently working assuming the\ndivide by HZ, will yield different results with this patch in place.\n\nSigned-off-by: Min Zhang \u003cmzhang@mvista.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "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" } ], "next": "62522d36d74a843e78d17f2dffc90468c6762803" }