)]}' { "log": [ { "commit": "508827ff0ac3981d420edac64a70de7f4e304d38", "tree": "b0cee8ddef9f0ceab68c388e4ae46b7295eb2cb5", "parents": [ "2c3c3d02f28801d7ad2da4952b2c7ca6621ef221", "72e2240f181871675d3a979766330c91d48a1673" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 05 02:06:47 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 05 02:06:47 2009 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/tokenring/tmspci.c\n\tdrivers/net/ucc_geth_mii.c\n" }, { "commit": "fe7ca2e1e847b65c12d245cbf402af89da96888a", "tree": "aec65ae7a12d3c700f8c7f855024058e80075779", "parents": [ "4a8fd2cfdad4d043a1fadba2f3f340945d966825" ], "author": { "name": "Brian Haley", "email": "brian.haley@hp.com", "time": "Wed Mar 04 03:18:11 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 04 03:19:08 2009 -0800" }, "message": "IPv6: add \"disable\" module parameter support to ipv6.ko\n\nAdd \"disable\" module parameter support to ipv6.ko by specifying\n\"disable\u003d1\" on module load. We just do the minimum of initializing\ninetsw6[] so calls from other modules to inet6_register_protosw()\nwon\u0027t OOPs, then bail out. No IPv6 addresses or sockets can be\ncreated as a result, and a reboot is required to enable IPv6.\n\nSigned-off-by: Brian Haley \u003cbrian.haley@hp.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "176c39af29bc4edaf37f663553eeaacd47b5bc9c", "tree": "03395c5761d2ed623f5705493eaa5deef416959d", "parents": [ "b325fddb7f869e6c95a88dc6573220f162e5b89f" ], "author": { "name": "Daniel Lezcano", "email": "dlezcano@fr.ibm.com", "time": "Tue Mar 03 01:06:45 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 03 01:06:45 2009 -0800" }, "message": "netns: fix addrconf_ifdown kernel panic\n\nWhen a network namespace is destroyed the network interfaces are\nall unregistered, making addrconf_ifdown called by the netdevice\nnotifier. \nIn the other hand, the addrconf exit method does a loop on the network\ndevices and does addrconf_ifdown on each of them. But the ordering of \nthe netns subsystem is not right because it uses the register_pernet_device\ninstead of register_pernet_subsys. If we handle the loopback as\nany network device, we can safely use register_pernet_subsys.\n\nBut if we use register_pernet_subsys, the addrconf exit method will do\nexactly what was already done with the unregistering of the network\ndevices. So in definitive, this code is pointless.\n\nI removed the netns addrconf exit method and moved the code to the\naddrconf cleanup function.\n\nSigned-off-by: Daniel Lezcano \u003cdlezcano@fr.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b325fddb7f869e6c95a88dc6573220f162e5b89f", "tree": "ebbde90999700f15e2196edd76351519a2a484b2", "parents": [ "5a5990d3090b03745a9548a6f5edef02095675cf" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Thu Feb 26 06:55:31 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 03 00:47:47 2009 -0800" }, "message": "ipv6: Fix sysctl unregistration deadlock\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "aa4abc9bcce0d2a7ec189e897f8f8c58ca04643b", "tree": "22ef88d84a2e06380bb6a853c3ba28657e4e5f92", "parents": [ "814c01dc7c533033b4e99981a2e24a6195bfb43c", "52c0326beaa3cb0049d0f1c51c6ad5d4a04e4430" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Mar 01 21:35:16 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Mar 01 21:35:16 2009 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/wireless/iwlwifi/iwl-tx.c\n\tnet/8021q/vlan_core.c\n\tnet/core/dev.c\n" }, { "commit": "3f53a38131a4e7a053c0aa060aba0411242fb6b9", "tree": "123310cd7b3677ace9ab77daebd86f30ca280cc4", "parents": [ "0c9a3aaaf30e1d1994de58c554ef97a719e20892" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@openvz.org", "time": "Thu Feb 26 03:35:13 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 26 03:35:13 2009 -0800" }, "message": "ipv6: don\u0027t use tw net when accounting for recycled tw\n\nWe already have a valid net in that place, but this is not just a\ncleanup - the tw pointer can be NULL there sometimes, thus causing\nan oops in NET_NS\u003dy case.\n\nThe same place in ipv4 code already works correctly using existing \nnet, rather than tw\u0027s one.\n\nThe bug exists since 2.6.27.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@openvz.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f11c179eea77b8afc2fb7cb4b9a8815b85e3c16f", "tree": "9edf1e86fbb91815f31d7728820d098041f03bb9", "parents": [ "4545a3f2765bb7d2d93468a8ffa578ac87a2c5c7", "0c9a3aaaf30e1d1994de58c554ef97a719e20892" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 25 00:02:05 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 25 00:02:05 2009 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/wireless/orinoco/orinoco.c\n" }, { "commit": "bb80087a9440178bcd8363dc27a486f34786fec3", "tree": "f69c7a104077c7638261aad75b3b0e554964e273", "parents": [ "26d94b46d09c97adb3c78c744c195e74ede699b2" ], "author": { "name": "Wei Yongjun", "email": "yjwei@cn.fujitsu.com", "time": "Tue Feb 24 23:37:19 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 24 23:37:19 2009 -0800" }, "message": "sit: used time_before for comparing jiffies\n\nThe functions time_before is more robust for comparing\njiffies against other values.\n\nSigned-off-by: Wei Yongjun \u003cyjwei@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "800d55f146098c5ffd1914d7eef2fd4a6d558b1d", "tree": "ced8debeb88c78eb677c7842ea312be09caf21de", "parents": [ "1ce85fe402137824246bad03ff85f3913d565c17" ], "author": { "name": "Wei Yongjun", "email": "yjwei@cn.fujitsu.com", "time": "Mon Feb 23 21:45:33 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 24 23:33:52 2009 -0800" }, "message": "ipv6: Remove some pointless conditionals before kfree_skb()\n\nRemove some pointless conditionals before kfree_skb().\n\nThe semantic match that finds the problem is as follows:\n(http://www.emn.fr/x-info/coccinelle/)\n\n// \u003csmpl\u003e\n@@\nexpression E;\n@@\n- if (E)\n- \tkfree_skb(E);\n+ kfree_skb(E);\n// \u003c/smpl\u003e\n\nSigned-off-by: Wei Yongjun \u003cyjwei@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1ce85fe402137824246bad03ff85f3913d565c17", "tree": "3a54c150e9616709a8f65270cd1f4aeecac4d48e", "parents": [ "4fb0a54a55d34c28dc53c39567ce171166572699" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue Feb 24 23:18:28 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 24 23:18:28 2009 -0800" }, "message": "netlink: change nlmsg_notify() return value logic\n\nThis patch changes the return value of nlmsg_notify() as follows:\n\nIf NETLINK_BROADCAST_ERROR is set by any of the listeners and\nan error in the delivery happened, return the broadcast error;\nelse if there are no listeners apart from the socket that\nrequested a change with the echo flag, return the result of the\nunicast notification. Thus, with this patch, the unicast\nnotification is handled in the same way of a broadcast listener\nthat has set the NETLINK_BROADCAST_ERROR socket flag.\n\nThis patch is useful in case that the caller of nlmsg_notify()\nwants to know the result of the delivery of a netlink notification\n(including the broadcast delivery) and take any action in case\nthat the delivery failed. For example, ctnetlink can drop packets\nif the event delivery failed to provide reliable logging and\nstate-synchronization at the cost of dropping packets.\n\nThis patch also modifies the rtnetlink code to ignore the return\nvalue of rtnl_notify() in all callers. The function rtnl_notify()\n(before this patch) returned the error of the unicast notification\nwhich makes rtnl_set_sk_err() reports errors to all listeners. This\nis not of any help since the origin of the change (the socket that\nrequested the echoing) notices the ENOBUFS error if the notification\nfails and should resync itself.\n\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\nAcked-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "66da8c529ad4d330a268ac08aa101b87c5c911ff", "tree": "76296f538f5190eed12ec0b9eae740a7ff96a72a", "parents": [ "54037505a5278ce85df66531f384109ad94947e3" ], "author": { "name": "Hannes Eder", "email": "hannes@hanneseder.net", "time": "Sat Feb 21 23:37:10 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Feb 21 23:37:10 2009 -0800" }, "message": "ipv6: fix sparse warning: Using plain integer as NULL pointer\n\nFix this sparse warning:\n net/ipv6/xfrm6_state.c:72:26: warning: Using plain integer as NULL pointer\n\nSigned-off-by: Hannes Eder \u003channes@hanneseder.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4aa3b2ee1945ed082430ae1fb988d60eef64ca07", "tree": "f4e28cbe6c8c89e08b69b2bee95f89e3eb2bf884", "parents": [ "4667ba15119fea265b79502a019a2e75b8c9dfe1" ], "author": { "name": "Eric Leblond", "email": "eric@inl.fr", "time": "Wed Feb 18 15:28:46 2009 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Wed Feb 18 15:28:46 2009 +0100" }, "message": "netfilter: nf_conntrack_ipv6: fix nf_log_packet message in icmpv6 conntrack\n\nThis patch fixes a trivial typo that was adding a new line at end of\nthe nf_log_packet() prefix. It also make the logging conditionnal by\nadding a LOG_INVALID test.\n\nSigned-off-by: Eric Leblond \u003ceric@inl.fr\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "0ecc103aec454288cbaa5a33d8960ab3467e8a11", "tree": "d911ae41c303a575913b8aca2a49f4acaaf0fc93", "parents": [ "0012985d184b7b9d4513eacd35771715471e06ef", "4906f9985e310fc01f956256b0d58ac28b0dcb19" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Feb 09 23:22:21 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Feb 09 23:22:21 2009 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/gianfar.c\n" }, { "commit": "20461c1740cac5e02733221c9f653098a703f55a", "tree": "7478b8942eeb22a5ae52a7d80b58f19f39fb5da6", "parents": [ "8707bdd48ab705a459ac1b12014075a139d1d4f9" ], "author": { "name": "Noriaki TAKAMIYA", "email": "takamiya@po.ntts.co.jp", "time": "Mon Feb 09 15:01:19 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Feb 09 15:01:19 2009 -0800" }, "message": "IPv6: fix to set device name when new IPv6 over IPv6 tunnel device is created.\n\nWhen the user creates IPv6 over IPv6 tunnel, the device name created\nby the kernel isn\u0027t set to t-\u003eparm.name, which is referred as the\nresult of ioctl().\n\nSigned-off-by: Noriaki TAKAMIYA \u003ctakamiya@po.ntts.co.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3f9007135c1dc896db9a9e35920aafc65b157230", "tree": "ff164ddf28a24c7a780393fd91df2dad3e76318b", "parents": [ "a51f42f3c940e5582c40454ece066d033bc7e24f" ], "author": { "name": "Eric Leblond", "email": "eric@inl.fr", "time": "Mon Feb 09 14:33:20 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Feb 09 14:33:20 2009 -0800" }, "message": "netfilter: nf_conntrack_ipv6: don\u0027t track ICMPv6 negotiation message\n\nThis patch removes connection tracking handling for ICMPv6 messages\nrelated to Stateless Address Autoconfiguration, MLD, and MLDv2. They\ncan not be tracked because they are massively using multicast (on\npre-defined address). But they are not invalid and should not be\ndetected as such.\n\nSigned-off-by: Eric Leblond \u003ceric@inl.fr\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a51f42f3c940e5582c40454ece066d033bc7e24f", "tree": "9a9a55148d032468b0b4910de4d6680820f56d13", "parents": [ "b3df68f8f5a29888ae693fdb84ebabbc28ed9400" ], "author": { "name": "Eric Leblond", "email": "eric@inl.fr", "time": "Mon Feb 09 14:33:03 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Feb 09 14:33:03 2009 -0800" }, "message": "netfilter: fix tuple inversion for Node information request\n\nThe patch fixes a typo in the inverse mapping of Node Information\nrequest. Following draft-ietf-ipngwg-icmp-name-lookups-09, \"Querier\"\nsends a type 139 (ICMPV6_NI_QUERY) packet to \"Responder\" which answer\nwith a type 140 (ICMPV6_NI_REPLY) packet.\n\nSigned-off-by: Eric Leblond \u003ceric@inl.fr\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "409f0a9014fe24d906ba21aaccff80eb7f7304da", "tree": "8d9a6946d6cf1c5aab72651a193ff860651e5e65", "parents": [ "593721833d2a3987736467144ad062a709d3a72c", "0b492fce3d72d982a7981905f85484a1e1ba7fde" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Feb 07 02:52:44 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Feb 07 02:52:44 2009 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/wireless/iwlwifi/iwl-agn.c\n\tdrivers/net/wireless/iwlwifi/iwl3945-base.c\n" }, { "commit": "b5f348e5a41b39543c1c5efd661d7fd296dd5281", "tree": "b089d169aa873204d3945d2d6f4d395cfce08f49", "parents": [ "d73f08011bc30c03a2bcb1ccd880e4be84aea269" ], "author": { "name": "Ilpo Järvinen", "email": "ilpo.jarvinen@helsinki.fi", "time": "Fri Feb 06 23:48:01 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 06 23:48:01 2009 -0800" }, "message": "ipv6/addrconf: common code located\n\n$ codiff net/ipv6/addrconf.o net/ipv6/addrconf.o.new\nnet/ipv6/addrconf.c:\n addrconf_notify | -267\n1 function changed, 267 bytes removed\n\nnet/ipv6/addrconf.c:\n add_addr | +86\n1 function changed, 86 bytes added\n\nnet/ipv6/addrconf.o.new:\n2 functions changed, 86 bytes added, 267 bytes removed, diff: -181\n\nSigned-off-by: Ilpo Järvinen \u003cilpo.jarvinen@helsinki.fi\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d73f08011bc30c03a2bcb1ccd880e4be84aea269", "tree": "a9f8c8ccff850775c43e541a803e26c85aea48ed", "parents": [ "910d30b704542b49f83881a4832d8414c6c3d9c3" ], "author": { "name": "Ilpo Järvinen", "email": "ilpo.jarvinen@helsinki.fi", "time": "Fri Feb 06 23:47:37 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 06 23:47:37 2009 -0800" }, "message": "ipv6/ndisc: join error paths\n\nSigned-off-by: Ilpo Järvinen \u003cilpo.jarvinen@helsinki.fi\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "684de409acff8b1fe8bf188d75ff2f99c624387d", "tree": "f8792653579a6a6a88634c7d73e794943c3a38d4", "parents": [ "a23f4bbd8d27ac8ddc5d71ace1f91bb503f0469a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 06 00:49:55 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 06 00:49:55 2009 -0800" }, "message": "ipv6: Disallow rediculious flowlabel option sizes.\n\nJust like PKTINFO, limit the options area to 64K.\n\nBased upon report by Eric Sesterhenn and analysis by\nRoland Dreier.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0178b695fd6b40a62a215cbeb03dd51ada3bb5e0", "tree": "122ac633fa8ad71ac58e7228efc51a639f44466a", "parents": [ "12402b5b7a2aa7ebed246db4570a5eb905fe79ea" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Feb 05 15:15:50 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 05 15:15:50 2009 -0800" }, "message": "ipv6: Copy cork options in ip6_append_data\n\nAs the options passed to ip6_append_data may be ephemeral, we need\nto duplicate it for corking. This patch applies the simplest fix\nwhich is to memdup all the relevant bits.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15", "tree": "99e5b423473097756353d038f922b2623f3edd2a", "parents": [ "1bded710a574f20d41bc9e7fb531301db282d623", "fb53fde9762432d091dac209bdf4f3f850117c55" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 03 00:15:35 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 03 00:15:35 2009 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/Kconfig\n" }, { "commit": "09640e6365c679b5642b1c41b6d7078f51689ddf", "tree": "a2b80c153bd23fe59db8c6994fda29923819fcea", "parents": [ "ee437770c42088b9b653e8b3bf28a61fa647f84e" ], "author": { "name": "Harvey Harrison", "email": "harvey.harrison@gmail.com", "time": "Sun Feb 01 00:45:17 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Feb 01 00:45:17 2009 -0800" }, "message": "net: replace uses of __constant_{endian}\n\nBase versions handle constant folding now.\n\nSigned-off-by: Harvey Harrison \u003charvey.harrison@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5d6e430d3bafe743b18dc443189093bf532e91ed", "tree": "efc2aac6a7f1581332f79df69d4389bcc7aa079f", "parents": [ "905db44087855e3c1709f538ecdc22fd149cadd8" ], "author": { "name": "Dave Jones", "email": "davej@redhat.com", "time": "Sat Jan 31 00:51:49 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 31 00:51:49 2009 -0800" }, "message": "ipv6: compile fix for ip6mr.c\n\nnet/ipv6/ip6mr.c: In function \u0027pim6_rcv\u0027:\nnet/ipv6/ip6mr.c:368: error: implicit declaration of function \u0027csum_ipv6_magic\u0027\n\nSigned-off-by: Dave Jones \u003cdavej@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "05bee4737774881e027bfd9a8b5c40a7d68f6325", "tree": "5fd32eb8fe345d2d30e85910beac241a4439e8cd", "parents": [ "80595d59ba9917227856e663da249c2276a8628d", "905db44087855e3c1709f538ecdc22fd149cadd8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 30 14:31:07 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 30 14:31:07 2009 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/e1000/e1000_main.c\n" }, { "commit": "86911732d3996a9da07914b280621450111bb6da", "tree": "e787240d5ba869ddf4d0adfc3f9c69e0372e96ef", "parents": [ "5d0d9be8ef456afc6c3fb5f8aad06ef19b704b05" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Jan 29 14:19:50 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 29 16:33:03 2009 -0800" }, "message": "gro: Avoid copying headers of unmerged packets\n\nUnfortunately simplicity isn\u0027t always the best. The fraginfo\ninterface turned out to be suboptimal. The problem was quite\nobvious. For every packet, we have to copy the headers from\nthe frags structure into skb-\u003ehead, even though for 99% of the\npackets this part is immediately thrown away after the merge.\n\nLRO didn\u0027t have this problem because it directly read the headers\nfrom the frags structure.\n\nThis patch attempts to address this by creating an interface\nthat allows GRO to access the headers in the first frag without\nhaving to copy it. Because all drivers that use frags place the\nheaders in the first frag this optimisation should be enough.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a4e6db07984529847c6ad8bc616485e721dcb809", "tree": "24f5367b42ce03d8feccb24925bffe6eb09bca4a", "parents": [ "1d6e55f195128813f96458203a9fa14204f9251e" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 27 22:41:03 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 27 22:41:03 2009 -0800" }, "message": "ipv6: Make mc_forwarding sysctl read-only.\n\nThe kernel manages this value internally, as necessary, as\nVIFs are added/removed and as multicast routers are registered\nand deregistered.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1d6e55f195128813f96458203a9fa14204f9251e", "tree": "8fb8d332a9d5a0df98401f0b49a86173a0c3f25a", "parents": [ "6c06a478c9e59d1584a5dc1b2b3519bae5d6546a" ], "author": { "name": "Thomas Goff", "email": "thomas.goff@boeing.com", "time": "Tue Jan 27 22:39:59 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 27 22:39:59 2009 -0800" }, "message": "IPv6: Fix multicast routing bugs.\n\nThis patch addresses the IPv6 multicast routing issues described\nbelow. It was tested with XORP 1.4/1.5 as the IPv6 PIM-SM routing\ndaemon against FreeBSD peers.\n\nnet/ipv6/ip6_input.c:\n\n - Don\u0027t try to forward link-local multicast packets.\n\n - Don\u0027t reset skb2-\u003edev before calling ip6_mr_input() so packets can\n be identified as coming from the PIM register vif properly.\n\nnet/ipv6/ip6mr.c:\n\n - Fix incoming PIM register messages processing:\n\n * The IPv6 pseudo-header should be included when checksumming PIM\n messages (RFC 4601 section 4.9; RFC 3973 section 4.7.1).\n\n * Packets decapsulated from PIM register messages should have\n skb-\u003eprotocol ETH_P_IPV6.\n\n - Enable/disable IPv6 multicast forwarding on the corresponding\n interface when a routing daemon adds/removes a multicast virtual\n interface.\n\n - Remove incorrect skb_pull() to fix userspace signaling.\n\n - Enable/disable global IPv6 multicast forwarding when an IPv6\n multicast routing socket is opened/closed.\n\nnet/ipv6/route.c:\n\n - Don\u0027t use strict routing logic for packets decapsulated from PIM\n register messages (similar to disabling rp_filter for the IPv4\n case).\n\nSigned-off-by: Thomas Goff \u003cthomas.goff@boeing.com\u003e\nReviewed-by: Fred Templin \u003cfred.l.templin@boeing.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6c06a478c9e59d1584a5dc1b2b3519bae5d6546a", "tree": "130d7b956340a81fd27e7724c73178d3e3f49a61", "parents": [ "94cd3e6cbebf85903b4d53ed2147bdb4c6e08625" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Tue Jan 27 22:30:19 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 27 22:30:19 2009 -0800" }, "message": "net: fix xfrm reverse flow lookup for icmp6\n\nThis patch fixes the xfrm reverse flow lookup for icmp6 so that icmp6 packets\ndon\u0027t get lost over ipsec tunnels. Similar patch is in RHEL5 kernel for a quite\nlong time and I do not see why it isn\u0027t in mainline.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nAcked-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ebad18e93fbc6bc63ee734edbc0eb38ac6b919c0", "tree": "fb8eb7b04eb3b304f0a104b1c3d2ffa5642dc55a", "parents": [ "0d1cfd20cc5f785d5345d249d4b6a6f84b29e6a6" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Sat Jan 17 19:46:16 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 20 14:44:01 2009 -0800" }, "message": "gro: Fix handling of complete checksums in IPv6\n\nWe need to perform skb_postpull_rcsum after pulling the IPv6\nheader in order to maintain the correctness of the complete\nchecksum.\n\nThis patch also adds a missing iph reload after pulling.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7891cc818967e186be68caac32d84bfd0a3f0bd2", "tree": "e8ac3bb46c043f7fd2a39d80e0b61ff7db30fb5c", "parents": [ "33966dd0e2f68f26943cd9ee93ec6abbc6547a8e" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Jan 13 22:17:51 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 13 22:17:51 2009 -0800" }, "message": "ipv6: Fix fib6_dump_table walker leak\n\nWhen a fib6 table dump is prematurely ended, we won\u0027t unlink\nits walker from the list. This causes all sorts of grief for\nother users of the list later.\n\nReported-by: Chris Caputo \u003cccaputo@alt.net\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "71320afcdb33b3f0b754ba1fac6a8c77aa469041", "tree": "cb613b91b48e46c282ee3ee9feeca29f7cf84178", "parents": [ "d61ba9fd55b52a10b8e0ffd39bbc33587d3bfc8d" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon Jan 12 00:06:07 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 12 21:18:35 2009 -0800" }, "message": "netfilter 06/09: nf_conntrack: fix ICMP/ICMPv6 timeout sysctls on big-endian\n\nAn old bug crept back into the ICMP/ICMPv6 conntrack protocols: the timeout\nvalues are defined as unsigned longs, the sysctl\u0027s maxsize is set to\nsizeof(unsigned int). Use unsigned int for the timeout values as in the\nother conntrack protocols.\n\nReported-by: Jean-Mickael Guerin \u003cjean-mickael.guerin@6wind.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d9e8a3a5b8298a3c814ed37ac5756e6f67b6be41", "tree": "ffa1cf8b367b3f32155f6336d7b86b781a368019", "parents": [ "2150edc6c5cf00f7adb54538b9ea2a3e9cedca3f", "b9bdcbba010c2e49c8f837ea7a49fe006b636f41" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 09 11:52:14 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 09 11:52:14 2009 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (22 commits)\n ioat: fix self test for multi-channel case\n dmaengine: bump initcall level to arch_initcall\n dmaengine: advertise all channels on a device to dma_filter_fn\n dmaengine: use idr for registering dma device numbers\n dmaengine: add a release for dma class devices and dependent infrastructure\n ioat: do not perform removal actions at shutdown\n iop-adma: enable module removal\n iop-adma: kill debug BUG_ON\n iop-adma: let devm do its job, don\u0027t duplicate free\n dmaengine: kill enum dma_state_client\n dmaengine: remove \u0027bigref\u0027 infrastructure\n dmaengine: kill struct dma_client and supporting infrastructure\n dmaengine: replace dma_async_client_register with dmaengine_get\n atmel-mci: convert to dma_request_channel and down-level dma_slave\n dmatest: convert to dma_request_channel\n dmaengine: introduce dma_request_channel and private channels\n net_dma: convert to dma_find_channel\n dmaengine: provide a common \u0027issue_pending_all\u0027 implementation\n dmaengine: centralize channel allocation, introduce dma_find_channel\n dmaengine: up-level reference counting to the module level\n ...\n" }, { "commit": "5fbbf5f648a9c4ef99276854f05b2255d1b004d3", "tree": "59c9ae762c3df2800e894001b3de58c5f1972486", "parents": [ "ce279e6ec91c49f2c5f59f7492e19d39edbf8bbd", "56cf391a9462a4897ea660a6af3662dda5ae8c84" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 08 14:25:41 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 08 14:25:41 2009 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (84 commits)\n wimax: fix kernel-doc for debufs_dentry member of struct wimax_dev\n net: convert pegasus driver to net_device_ops\n bnx2x: Prevent eeprom set when driver is down\n net: switch kaweth driver to netdevops\n pcnet32: round off carrier watch timer\n i2400m/usb: wrap USB power saving in #ifdef CONFIG_PM\n wimax: testing for rfkill support should also test for CONFIG_RFKILL_MODULE\n wimax: fix kconfig interactions with rfkill and input layers\n wimax: fix \u0027#ifndef CONFIG_BUG\u0027 layout to avoid warning\n r6040: bump release number to 0.20\n r6040: warn about MAC address being unset\n r6040: check PHY status when bringing interface up\n r6040: make printks consistent with DRV_NAME\n gianfar: Fixup use of BUS_ID_SIZE\n mlx4_en: Returning real Max in get_ringparam\n mlx4_en: Consider inline packets on completion\n netdev: bfin_mac: enable bfin_mac net dev driver for BF51x\n qeth: convert to net_device_ops\n vlan: add neigh_setup\n dm9601: warn on invalid mac address\n ...\n" }, { "commit": "684f2176015b313ab59cecf574117969cf638f28", "tree": "e87c2285d35f7f308c9046940d4efadb9b6ad11a", "parents": [ "787e9208360117835101f513f7db593dc2525cf8" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Jan 08 10:41:23 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 08 10:41:23 2009 -0800" }, "message": "tcp6: Add GRO support\n\nThis patch adds GRO support for TCP over IPv6. The code is exactly\nthe same as the IPv4 version except for the pseudo-header checksum\ncomputation.\n\nNote that I\u0027ve removed the unused tcphdr argument from tcp_v6_check\nrather than invent a bogus value for GRO.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "787e9208360117835101f513f7db593dc2525cf8", "tree": "fa72092999629c535abb1457a7a4b6c3ae67de6d", "parents": [ "d9d6f46b42294754f8d4ed743124ae8bb8e01fba" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Jan 08 10:40:57 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 08 10:40:57 2009 -0800" }, "message": "ipv6: Add GRO support\n\nThis patch adds GRO support for IPv6. IPv6 GRO supports extension\nheaders in the same way as GSO (by using the same infrastructure).\nIt\u0027s also simpler compared to IPv4 since we no longer have to worry\nabout fragmentation attributes or header checksums.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c19a28e1193a6c854738d609ae9b2fe2f6e6bea4", "tree": "79a354f827a5d3656be3f55d18d31265750d9d06", "parents": [ "f15659628b43b27c20447c731456c39cbec973e9" ], "author": { "name": "Fernando Carrijo", "email": "fcarrijo@yahoo.com.br", "time": "Wed Jan 07 18:09:08 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 08 08:31:14 2009 -0800" }, "message": "remove lots of double-semicolons\n\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: Theodore Ts\u0027o \u003ctytso@mit.edu\u003e\nAcked-by: Mark Fasheh \u003cmfasheh@suse.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: James Morris \u003cjmorris@namei.org\u003e\nAcked-by: Casey Schaufler \u003ccasey@schaufler-ca.com\u003e\nAcked-by: Takashi Iwai \u003ctiwai@suse.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f67b45999205164958de4ec0658d51fa4bee066d", "tree": "2fc3c2e833fdfea2f029dca05d5401ba9ae63229", "parents": [ "2ba05622b8b143b0c95968ba59bddfbd6d2f2559" ], "author": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 06 11:38:15 2009 -0700" }, "committer": { "name": "Dan Williams", "email": "dan.j.williams@intel.com", "time": "Tue Jan 06 11:38:15 2009 -0700" }, "message": "net_dma: convert to dma_find_channel\n\nUse the general-purpose channel allocation provided by dmaengine.\n\nReviewed-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Dan Williams \u003cdan.j.williams@intel.com\u003e\n\n\n" }, { "commit": "914d11647b6d6fe81bdf0c059612ee36282b8cee", "tree": "8d37925767cf7ba112a6d1ba21d3340e067c0d33", "parents": [ "22604c866889c4b2e12b73cbf1683bda1b72a313" ], "author": { "name": "Ilpo Järvinen", "email": "ilpo.jarvinen@helsinki.fi", "time": "Sun Jan 04 17:27:31 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 04 17:27:31 2009 -0800" }, "message": "ipv6: IPV6_PKTINFO relied userspace providing correct length\n\nSigned-off-by: Ilpo Järvinen \u003cilpo.jarvinen@helsinki.fi\u003e\nReported-by: Eric Sesterhenn \u003csnakebyte@gmx.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "14deae41566b5cdd992c01d0069518ced5227c83", "tree": "d15c3dfabdc3ccf10997487c29df35fa58387e55", "parents": [ "eb4dea5853046727bfbb579f0c9a8cae7369f7c6" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 04 16:04:39 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 04 16:04:39 2009 -0800" }, "message": "ipv6: Fix sporadic sendmsg -EINVAL when sending to multicast groups.\n\nThanks to excellent diagnosis by Eduard Guzovsky.\n\nThe core problem is that on a network with lots of active\nmulticast traffic, the neighbour cache can fill up. If\nwe try to allocate a new route and thus neighbour cache\nentry, the bog-standard GC attempt the neighbour layer does\nin ineffective because route entries hold a reference\nto the existing neighbour entries and GC can only liberate\nentries with no references.\n\nIPV4 already has a way to handle this, by doing a route cache\nGC in such situations (when neigh attach returns -ENOBUFS).\n\nSo simply mimick this on the ipv6 side.\n\nTested-by: Eduard Guzovsky \u003ceguzovsky@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eb4dea5853046727bfbb579f0c9a8cae7369f7c6", "tree": "79e18d6284494ab63a890885b0eecce9431a9597", "parents": [ "0f23174aa8c1aa7a2a6050a72a60d290ef9ee578" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon Dec 29 23:04:08 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 29 23:04:08 2008 -0800" }, "message": "net: Fix percpu counters deadlock\n\nWhen we converted the protocol atomic counters such as the orphan\ncount and the total socket count deadlocks were introduced due to\nthe mismatch in BH status of the spots that used the percpu counter\noperations.\n\nBased on the diagnosis and patch by Peter Zijlstra, this patch\nfixes these issues by disabling BH where we may be in process\ncontext.\n\nReported-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nTested-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0191b625ca5a46206d2fb862bb08f36f2fcb3b31", "tree": "454d1842b1833d976da62abcbd5c47521ebe9bd7", "parents": [ "54a696bd07c14d3b1192d03ce7269bc59b45209a", "eb56092fc168bf5af199d47af50c0d84a96db898" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 28 12:49:40 2008 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Dec 28 12:49:40 2008 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1429 commits)\n net: Allow dependancies of FDDI \u0026 Tokenring to be modular.\n igb: Fix build warning when DCA is disabled.\n net: Fix warning fallout from recent NAPI interface changes.\n gro: Fix potential use after free\n sfc: If AN is enabled, always read speed/duplex from the AN advertising bits\n sfc: When disabling the NIC, close the device rather than unregistering it\n sfc: SFT9001: Add cable diagnostics\n sfc: Add support for multiple PHY self-tests\n sfc: Merge top-level functions for self-tests\n sfc: Clean up PHY mode management in loopback self-test\n sfc: Fix unreliable link detection in some loopback modes\n sfc: Generate unique names for per-NIC workqueues\n 802.3ad: use standard ethhdr instead of ad_header\n 802.3ad: generalize out mac address initializer\n 802.3ad: initialize ports LACPDU from const initializer\n 802.3ad: remove typedef around ad_system\n 802.3ad: turn ports is_individual into a bool\n 802.3ad: turn ports is_enabled into a bool\n 802.3ad: make ntt bool\n ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.\n ...\n\nFixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due\nto the conversion to %pI (in this networking merge) and the addition of\ndoing IPv6 addresses (from the earlier merge of CIFS).\n" }, { "commit": "cbacc2c7f066a1e01b33b0e27ae5efbf534bc2db", "tree": "90d1093131d2a3543a8b3b1f3364e7c6f4081a93", "parents": [ "4a6908a3a050aacc9c3a2f36b276b46c0629ad91", "74192246910ff4fb95309ba1a683215644beeb62" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Dec 25 11:40:09 2008 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Dec 25 11:40:09 2008 +1100" }, "message": "Merge branch \u0027next\u0027 into for-linus\n" }, { "commit": "9f690db7ff4cb32493c0b0b13334cc4f5fd49a6b", "tree": "c4f3dfb17ba368dffc5da8a8ffe575e0f99065e7", "parents": [ "f250dcdac111a8369220b8e192eae6c56dc1098a" ], "author": { "name": "Yang Hongyang", "email": "yanghy@cn.fujitsu.com", "time": "Tue Dec 16 02:08:29 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 16 02:08:29 2008 -0800" }, "message": "ipv6: fix the outgoing interface selection order in udpv6_sendmsg()\n\n1.When no interface is specified in an IPV6_PKTINFO ancillary data\n item, the interface specified in an IPV6_PKTINFO sticky optionis \n is used.\n\nRFC3542:\n6.7. Summary of Outgoing Interface Selection\n\n This document and [RFC-3493] specify various methods that affect the\n selection of the packet\u0027s outgoing interface. This subsection\n summarizes the ordering among those in order to ensure deterministic\n behavior.\n\n For a given outgoing packet on a given socket, the outgoing interface\n is determined in the following order:\n\n 1. if an interface is specified in an IPV6_PKTINFO ancillary data\n item, the interface is used.\n\n 2. otherwise, if an interface is specified in an IPV6_PKTINFO sticky\n option, the interface is used.\n\nSigned-off-by: Yang Hongyang \u003cyanghy@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f250dcdac111a8369220b8e192eae6c56dc1098a", "tree": "cf42e186985643e9c7fbb7c3c3e3fb18d174874b", "parents": [ "b24a2516d10751d7ed5afb58420df25370c9dffb" ], "author": { "name": "Yang Hongyang", "email": "yanghy@cn.fujitsu.com", "time": "Tue Dec 16 02:07:45 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 16 02:07:45 2008 -0800" }, "message": "ipv6: fix the return interface index when get it while no message is received\n\nWhen get receiving interface index while no message is received,\nthe the value seted with setsockopt() should be returned.\n\nRFC 3542:\n Issuing getsockopt() for the above options will return the sticky\n option value i.e., the value set with setsockopt(). If no sticky\n option value has been set getsockopt() will return the following\n values:\n\n - For the IPV6_PKTINFO option, it will return an in6_pktinfo\n structure with ipi6_addr being in6addr_any and ipi6_ifindex being\n zero.\n\nSigned-off-by: Yang Hongyang \u003cyanghy@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b24a2516d10751d7ed5afb58420df25370c9dffb", "tree": "cffcf4fc47c4da696e3426424e6ccac7b789e917", "parents": [ "bc02ff95fe4ebd3e5ee7455c0aa6f76ebe39ebca" ], "author": { "name": "Yang Hongyang", "email": "yanghy@cn.fujitsu.com", "time": "Tue Dec 16 02:06:23 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 16 02:06:23 2008 -0800" }, "message": "ipv6: Add IPV6_PKTINFO sticky option support to setsockopt()\n\nThere are three reasons for me to add this support:\n1.When no interface is specified in an IPV6_PKTINFO ancillary data\n item, the interface specified in an IPV6_PKTINFO sticky optionis \n is used.\n\nRFC3542:\n6.7. Summary of Outgoing Interface Selection\n\n This document and [RFC-3493] specify various methods that affect the\n selection of the packet\u0027s outgoing interface. This subsection\n summarizes the ordering among those in order to ensure deterministic\n behavior.\n\n For a given outgoing packet on a given socket, the outgoing interface\n is determined in the following order:\n\n 1. if an interface is specified in an IPV6_PKTINFO ancillary data\n item, the interface is used.\n\n 2. otherwise, if an interface is specified in an IPV6_PKTINFO sticky\n option, the interface is used.\n\n2.When no IPV6_PKTINFO ancillary data is received,getsockopt() should \n return the sticky option value which set with setsockopt().\n\nRFC 3542:\n Issuing getsockopt() for the above options will return the sticky\n option value i.e., the value set with setsockopt(). If no sticky\n option value has been set getsockopt() will return the following\n values:\n\n3.Make the setsockopt implementation POSIX compliant.\n\nSigned-off-by: Yang Hongyang \u003cyanghy@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eb14f019597cd86c21a6c601d7e900f40030c2e7", "tree": "36fb2f36a1747f98988f87215db1eef3a71d45eb", "parents": [ "9a4a84294b0d60b8c287131478f743ba2bc68949", "a3dd15444baa9c7522c8457ab564c41219dfb44c" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 15 20:03:50 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 15 20:03:50 2008 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\n\tdrivers/net/e1000e/ich8lan.c\n" }, { "commit": "8da73b73ef29d537ba09f29393cd68707833e746", "tree": "b4281dcf12f6033774b81c05b24296922eeada28", "parents": [ "448eb71f40120a8fd11ebd58153c271c63e6f862" ], "author": { "name": "Ilpo Järvinen", "email": "ilpo.jarvinen@helsinki.fi", "time": "Sun Dec 14 23:15:49 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Dec 14 23:15:49 2008 -0800" }, "message": "ip6mr: use goto to common label instead of opencoding\n\nSigned-off-by: Ilpo Järvinen \u003cilpo.jarvinen@helsinki.fi\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "448eb71f40120a8fd11ebd58153c271c63e6f862", "tree": "a053aac189359d93c8ec32ba0a2d876e71863342", "parents": [ "5ce1bbb97bf1e6707102d30499e7feaa1e6a2134" ], "author": { "name": "Ilpo Järvinen", "email": "ilpo.jarvinen@helsinki.fi", "time": "Sun Dec 14 23:15:21 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Dec 14 23:15:21 2008 -0800" }, "message": "ipv6/mcast: join error paths using goto\n\nSigned-off-by: Ilpo Järvinen \u003cilpo.jarvinen@helsinki.fi\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5ce1bbb97bf1e6707102d30499e7feaa1e6a2134", "tree": "ea00308023d60ccdbf142e0fab92fe8bfc018934", "parents": [ "857a6e0a4d8db0bbee685ccc97c6bd7987e7aede" ], "author": { "name": "Ilpo Järvinen", "email": "ilpo.jarvinen@helsinki.fi", "time": "Sun Dec 14 23:13:48 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Dec 14 23:13:48 2008 -0800" }, "message": "xfrm6_tunnel: join error paths using goto\n\nSigned-off-by: Ilpo Järvinen \u003cilpo.jarvinen@helsinki.fi\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8229efdaef1e7913ae1712c0ba752f267e5fcd5e", "tree": "ba85dabf90f17b1b735fb8dda4b9bb11c5cd445d", "parents": [ "8b90fc7e5b43aaef941044a4785a42439015b539" ], "author": { "name": "Benjamin Thery", "email": "benjamin.thery@bull.net", "time": "Wed Dec 10 16:30:15 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 10 16:30:15 2008 -0800" }, "message": "netns: ip6mr: enable namespace support in ipv6 multicast forwarding code\n\nThis last patch makes the appropriate changes to use and propagate the\nnetwork namespace where needed in IPv6 multicast forwarding code.\n\nThis consists mainly in replacing all the remaining init_net occurences\nwith current netns pointer retrieved from sockets, net devices or \nmfc6_caches depending on the routines\u0027 contexts.\n\nSome routines receive a new \u0027struct net\u0027 parameter to propagate the current\nnetns:\n* ip6mr_get_route\n* ip6mr_cache_report\n* ip6mr_cache_find\n* ip6mr_cache_unresolved\n* mif6_add/mif6_delete\n* ip6mr_mfc_add/ip6mr_mfc_delete\n* ip6mr_reg_vif\n\nAll the IPv6 multicast forwarding variables moved to struct netns_ipv6 by\nthe previous patches are now referenced in the correct namespace.\n\nChangelog:\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n* Take into account the net associated to mfc6_cache when matching entries in\n mfc_unres_queue list.\n* Call mroute_clean_tables() in ip6mr_net_exit() to free memory allocated\n per-namespace.\n* Call dev_net_set() in ip6mr_reg_vif() to initialize dev-\u003end_net \n correctly.\n\nSigned-off-by: Benjamin Thery \u003cbenjamin.thery@bull.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8b90fc7e5b43aaef941044a4785a42439015b539", "tree": "8a04eaf58a725db5bafb6c5e3a1bc67764558ad0", "parents": [ "950d5704e5daa1f90bcd75b99163491e7b249169" ], "author": { "name": "Benjamin Thery", "email": "benjamin.thery@bull.net", "time": "Wed Dec 10 16:29:48 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 10 16:29:48 2008 -0800" }, "message": "netns: ip6mr: declare ip6mr /proc/net entries per-namespace\n\nDeclare IPv6 multicast forwarding /proc/net entries per-namespace:\n/proc/net/ip6_mr_vif\n/proc/net/ip6_mr_cache\n\nChangelog\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\nV2:\n* In routine ipmr_mfc_seq_idx(), only match entries belonging to current\n netns in mfc_unres_queue list.\n\nSigned-off-by: Benjamin Thery \u003cbenjamin.thery@bull.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "950d5704e5daa1f90bcd75b99163491e7b249169", "tree": "c46302160f4364dfc6e66c73c0c9910a9329810a", "parents": [ "a21f3f997c73ced682129aedd372bb6b53041510" ], "author": { "name": "Benjamin Thery", "email": "benjamin.thery@bull.net", "time": "Wed Dec 10 16:29:24 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 10 16:29:24 2008 -0800" }, "message": "netns: ip6mr: declare reg_vif_num per-namespace\n\nPreliminary work to make IPv6 multicast forwarding netns-aware.\n\nDeclare variable \u0027reg_vif_num\u0027 per-namespace, moves into struct netns_ipv6.\n\nAt the moment, this variable is only referenced in init_net.\n\nSigned-off-by: Benjamin Thery \u003cbenjamin.thery@bull.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a21f3f997c73ced682129aedd372bb6b53041510", "tree": "f236a2ef74036df4929f99350316096c6603a3ae", "parents": [ "4045e57c19bee150370390545ee8a933b3f7a18d" ], "author": { "name": "Benjamin Thery", "email": "benjamin.thery@bull.net", "time": "Wed Dec 10 16:28:44 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 10 16:28:44 2008 -0800" }, "message": "netns: ip6mr: declare mroute_do_assert and mroute_do_pim per-namespace\n\nPreliminary work to make IPv6 multicast forwarding netns-aware.\n\nDeclare IPv6 multicast forwarding variables \u0027mroute_do_assert\u0027 and\n\u0027mroute_do_pim\u0027 per-namespace in struct netns_ipv6.\n\nAt the moment, these variables are only referenced in init_net.\n\nSigned-off-by: Benjamin Thery \u003cbenjamin.thery@bull.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4045e57c19bee150370390545ee8a933b3f7a18d", "tree": "a4744efeed6819eff5acd9c13ca0fafe71df144d", "parents": [ "4a6258a0e33d042e4c84d9dec25d45ddb40a70b3" ], "author": { "name": "Benjamin Thery", "email": "benjamin.thery@bull.net", "time": "Wed Dec 10 16:27:21 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 10 16:27:21 2008 -0800" }, "message": "netns: ip6mr: declare counter cache_resolve_queue_len per-namespace\n\nPreliminary work to make IPv6 multicast forwarding netns-aware.\n\nDeclare variable cache_resolve_queue_len per-namespace: moves it into\nstruct netns_ipv6.\n\nThis variable counts the number of unresolved cache entries queued in the\nlist mfc_unres_queue. This list is kept global to all netns as the number\nof entries per namespace is limited to 10 (hardcoded in routine \nip6mr_cache_unresolved).\nEntries belonging to different namespaces in mfc_unres_queue will be\nidentified by matching the mfc_net member introduced previously in \nstruct mfc6_cache.\n\nKeeping this list global to all netns, also allows us to keep a single\ntimer (ipmr_expire_timer) to handle their expiration.\nIn some places cache_resolve_queue_len value was tested for arming \nor deleting the timer. These tests were equivalent to testing \nmfc_unres_queue value instead and are replaced in this patch.\n\nAt the moment, cache_resolve_queue_len is only referenced in init_net.\n\nSigned-off-by: Benjamin Thery \u003cbenjamin.thery@bull.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4a6258a0e33d042e4c84d9dec25d45ddb40a70b3", "tree": "5cc24a8d367593b039c32a0d1fa4a64730673542", "parents": [ "58701ad41105638baa0b38ffe9ac5b10469c1fd3" ], "author": { "name": "Benjamin Thery", "email": "benjamin.thery@bull.net", "time": "Wed Dec 10 16:24:07 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 10 16:24:07 2008 -0800" }, "message": "netns: ip6mr: dynamically allocate mfc6_cache_array\n\nPreliminary work to make IPv6 multicast forwarding netns-aware.\n\nDynamically allocates IPv6 multicast forwarding cache, mfc6_cache_array,\nand moves it to struct netns_ipv6. \n\nAt the moment, mfc6_cache_array is only referenced in init_net.\n\nReplace \u0027ARRAY_SIZE(mfc6_cache_array)\u0027 with mfc6_cache_array size: MFC6_LINES.\n\nSigned-off-by: Benjamin Thery \u003cbenjamin.thery@bull.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "58701ad41105638baa0b38ffe9ac5b10469c1fd3", "tree": "cb76329caa1cc86fb89c7ef6d81bf924d86699ad", "parents": [ "4e16880cb4225bfa68878ad5b2a9ded53657d054" ], "author": { "name": "Benjamin Thery", "email": "benjamin.thery@bull.net", "time": "Wed Dec 10 16:22:34 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 10 16:22:34 2008 -0800" }, "message": "netns: ip6mr: store netns in struct mfc6_cache\n\nThis patch stores into struct mfc6_cache the network namespace each\nmfc6_cache belongs to. The new member is mfc6_net.\n\nmfc6_net is assigned at cache allocation and doesn\u0027t change during\nthe rest of the cache entry life.\n\nThis will help to retrieve the current netns around the IPv6 multicast\nforwarding code.\n\nAt the moment, all mfc6_cache are allocated in init_net.\n\nChangelog:\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n* Use write_pnet()/read_pnet() to set and get mfc6_net.\n\nSigned-off-by: Benjamin Thery \u003cbenjamin.thery@bull.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4e16880cb4225bfa68878ad5b2a9ded53657d054", "tree": "6a8c15e47fe33edede4c4bd79c05dabc5ca2f79c", "parents": [ "bd91b8bf372911c1e4d66d6bb44fe409349a6791" ], "author": { "name": "Benjamin Thery", "email": "benjamin.thery@bull.net", "time": "Wed Dec 10 16:15:08 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 10 16:15:08 2008 -0800" }, "message": "netns: ip6mr: dynamically allocates vif6_table\n\nPreliminary work to make IPv6 multicast forwarding netns-aware.\n\nDynamically allocates interface table vif6_table and moves it to \nstruct netns_ipv6, and updates MIF_EXISTS() macro. \n\nAt the moment, vif6_table is only referenced in init_net.\n\nSigned-off-by: Benjamin Thery \u003cbenjamin.thery@bull.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bd91b8bf372911c1e4d66d6bb44fe409349a6791", "tree": "18a79fc3c86ad833523562d7b73a9a557207b51b", "parents": [ "5eaa65b240c5eb7bf2235eb9dd177c83e6e3832c" ], "author": { "name": "Benjamin Thery", "email": "benjamin.thery@bull.net", "time": "Wed Dec 10 16:07:08 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 10 16:07:08 2008 -0800" }, "message": "netns: ip6mr: allocate mroute6_socket per-namespace.\n\nPreliminary work to make IPv6 multicast forwarding netns-aware.\n\nMake IPv6 multicast forwarding mroute6_socket per-namespace,\nmoves it into struct netns_ipv6.\n\nAt the moment, mroute6_socket is only referenced in init_net.\n\nSigned-off-by: Benjamin Thery \u003cbenjamin.thery@bull.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "24fc7b86dc0470616803be2f921c8cd5c459175d", "tree": "0bcb5ae6211c642eb2f8a6e150243ac7c44da1eb", "parents": [ "fbf0229e946deb9e6c711f9eaa5c8d670c3a28fd" ], "author": { "name": "Jan Sembera", "email": "jsembera@suse.cz", "time": "Tue Dec 09 15:48:32 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 09 15:48:32 2008 -0800" }, "message": "ipv6: silence log messages for locally generated multicast\n\nThis patch fixes minor annoyance during transmission of unsolicited\nneighbor advertisements from userspace to multicast addresses (as\nfar as I can see in RFC, this is allowed and the similar functionality\nfor IPv4 has been in arping for a long time).\n\nOutgoing multicast packets get reinserted into local processing as if they\nare received from the network. The machine thus sees its own NA and fills\nthe logs with error messages. This patch removes the message if NA has been\ngenerated locally.\n\nSigned-off-by: Jan Sembera \u003cjsembera@suse.cz\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "36cbac5909d227c4de31fb93e1dd99c839c9cb6f", "tree": "c718f49479bb3de88f50681c0357c1add9e5a989", "parents": [ "df66f858074370a7ac7b21af2940e7a3a6af17c2" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Wed Dec 03 22:27:25 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 03 22:27:25 2008 -0800" }, "message": "net/ipv6/ip6mr.c: Use kmem_cache_zalloc, remove memset\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "999890b21a8eff7559a140fcbd2cd4b34e685c76", "tree": "83f0c7fbb43e562c40cce760666d69de653abcf0", "parents": [ "1ea472e2dedcf23d5f31c63fc790cccfab93c0de" ], "author": { "name": "Benjamin Thery", "email": "benjamin.thery@bull.net", "time": "Wed Dec 03 22:22:16 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 03 22:22:16 2008 -0800" }, "message": "net: /proc/net/ip_mr_cache, display Iif as a signed short\n\nToday, iproute2 fails to show multicast forwarding unresolved cache\nentries while scanning /proc/net/ip_mr_cache.\n\nIndeed, it expects to see -1 in \u0027Iif\u0027 column to identify unresolved\nentries but the kernel outputs 65535. It\u0027s a signed/unsigned issue:\n\n\u0027Iif\u0027, the source interface, is retrieved from member mfc_parent in\nstruct mfc_cache. mfc_parent is a vifi_t: unsigned short, but is\ndisplayed in ipmr_mfc_seq_show() as \"%-3d\", signed integer.\n\nIn unresolevd entries, the 65535 value (0xFFFF) comes from this define:\n#define ALL_VIFS ((vifi_t)(-1))\n\nThat may explains why the guy who added support for this in iproute2\nthought a -1 should be expected.\n\nI don\u0027t know if this must be fixed in kernel or in iproute2. Who is\nright? What is the correct API? How was it designed originally?\n\nI let you decide if it should goes in the kernel or be fixed in iproute2.\n\nSigned-off-by: Benjamin Thery \u003cbenjamin.thery@bull.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1ea472e2dedcf23d5f31c63fc790cccfab93c0de", "tree": "1886e87c59bc3efe9edee6f2473d5a2ad5b22e9e", "parents": [ "9de6d99a7559d20f7ababd1cacdc61ee5315f3c1" ], "author": { "name": "Benjamin Thery", "email": "benjamin.thery@bull.net", "time": "Wed Dec 03 22:21:47 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 03 22:21:47 2008 -0800" }, "message": "net: fix /proc/net/ip_mr_cache display - V2\n\n/proc/net/ip_mr_cache and /proc/net/ip6_mr_cache displays garbage when\nshowing unresolved mfc_cache entries.\n\n[root@qemu tests]# cat /proc/net/ip_mr_cache\nGroup Origin Iif Pkts Bytes Wrong Oifs\n014C00EF 010014AC 1 10 10050 0 2:1 3:1\n024C00EF 010014AC 65535 514 2 -559067475\n\nThe first line is correct. It is a resolved cache entry, 10 packets used it...\nThe second line represents an unresolved entry, and the columns Pkts(4th),\nBytes(5th) and Wrong(6th) just show garbage.\n\nIn struct mfc_cache, there\u0027s an union to store data for resolved and\nunresolved cases. And what ipmr_mfc_seq_show() is printing in these \ncolumns for the unresolved entries is some bytes from mfc_cache.mfc_un.res.\nBad.\n(eg. In our case -559067475 is in fact 0xdead4ead which is the spinlock\nmagic from mfc_cache.mfc_un.unres.unresolved.lock.magic).\n\nThis patch replaces the garbage data written in these columns for the\nunresolved entries by \u00270\u0027 (zeros) which is more correct.\nThis change doesn\u0027t break the ABI.\n\nAlso, mfc-\u003emfc_un.res.pkt, mfc-\u003emfc_un.res.bytes, mfc-\u003emfc_un.res.wrong_if\nare unsigned long.\n\nIt applies on top of net-next-2.6.\n\nThe patch for net-2.6 is slightly different because of the NIP6_FMT to\n%pI6 conversion that was made in the seq_printf.\n\nChangelog:\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\nV2:\n* Instead of breaking the ABI by suppressing the columns that have no\n meaning for unresolved entries, fill them with 0 values.\n\nSigned-off-by: Benjamin Thery \u003cbenjamin.thery@bull.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ec98ce480ada787f2cfbd696980ff3564415505b", "tree": "1a4d644b38f9f1e4b4e086fde0b195df4a92cf84", "parents": [ "3496f92beb9aa99ef21fccc154a36c7698e9c538", "feaf3848a813a106f163013af6fcf6c4bfec92d9" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Dec 04 17:16:36 2008 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Dec 04 17:16:36 2008 +1100" }, "message": "Merge branch \u0027master\u0027 into next\n\nConflicts:\n\tfs/nfsd/nfs4recover.c\n\nManually fixed above to use new creds API functions, e.g.\nnfs4_save_creds().\n\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "ed77a89c30fa03dcb234a84ddea710b3fb7b62da", "tree": "69f3e2c2bbf2fdd4f742e891441f01307d1d1f49", "parents": [ "475ad8e2172d7f8b73af5532a8dad265b51339c2", "d6e8cc6cc7ac77b0f9118f78c453a2e834e62709" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 28 02:19:15 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 28 02:19:15 2008 -0800" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6\n\nConflicts:\n\n\tnet/netfilter/nf_conntrack_netlink.c\n" }, { "commit": "1748376b6626acf59c24e9592ac67b3fe2a0e026", "tree": "65a28205daf1ca92e31389440764fc407365014e", "parents": [ "c1b56878fb68e9c14070939ea4537ad4db79ffae" ], "author": { "name": "Eric Dumazet", "email": "dada1@cosmosbay.com", "time": "Tue Nov 25 21:16:35 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 25 21:16:35 2008 -0800" }, "message": "net: Use a percpu_counter for sockets_allocated\n\nInstead of using one atomic_t per protocol, use a percpu_counter\nfor \"sockets_allocated\", to reduce cache line contention on\nheavy duty network servers. \n\nNote : We revert commit (248969ae31e1b3276fc4399d67ce29a5d81e6fd9\nnet: af_unix can make unix_nr_socks visbile in /proc),\nsince it is not anymore used after sock_prot_inuse_add() addition\n\nSigned-off-by: Eric Dumazet \u003cdada1@cosmosbay.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "59c9940ed0ef026673cac52f2eaed77af7d486da", "tree": "d7d4e38e693178f16000eaa5ae03f415f3197f7a", "parents": [ "4fb236bac9fc7d51e2267866de6d4c30e549d2f8" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Tue Nov 25 17:59:52 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 25 17:59:52 2008 -0800" }, "message": "netns xfrm: per-netns MIBs\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4fb236bac9fc7d51e2267866de6d4c30e549d2f8", "tree": "e3d024fe85be93a81553a910f556b818c8a85496", "parents": [ "7013ec30e0e2bc5b1e602e19a4e0668f9b7c0a72" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Tue Nov 25 17:59:27 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 25 17:59:27 2008 -0800" }, "message": "netns xfrm: AH/ESP in netns!\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n\n" }, { "commit": "fbda33b2b85941c1ae3a0d89522dec5c1b1bd98c", "tree": "f35036a6faf4fa549e45ff2b0407344e17cf9455", "parents": [ "c5b3cf46eabe6e7459125fc6e2033b4222665017" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Tue Nov 25 17:56:49 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 25 17:56:49 2008 -0800" }, "message": "netns xfrm: -\u003eget_saddr in netns\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c5b3cf46eabe6e7459125fc6e2033b4222665017", "tree": "a968ad567906d7b45270b9e91d534493f8a1a38d", "parents": [ "db983c1144884cab10d6397532f4bf05eb0c01d2" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Tue Nov 25 17:51:25 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 25 17:51:25 2008 -0800" }, "message": "netns xfrm: -\u003edst_lookup in netns\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "db983c1144884cab10d6397532f4bf05eb0c01d2", "tree": "ebb86abdaeb916191424407881d52635019502cf", "parents": [ "7067802e262457a9737521e5669b622028b2283a" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Tue Nov 25 17:51:01 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 25 17:51:01 2008 -0800" }, "message": "netns xfrm: KM reporting in netns\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ddcfd79680c1dc74eb5f24aa70785c11bf7eec8f", "tree": "f1d762f6b1cf6bcec289fe558a26dcb4e37ffb29", "parents": [ "3dd0b4997a1d4f3a3666e400cc75b0279ce96849" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Tue Nov 25 17:37:23 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 25 17:37:23 2008 -0800" }, "message": "netns xfrm: dst garbage-collecting in netns\n\nPass netns pointer to struct xfrm_policy_afinfo::garbage_collect()\n\n\t[This needs more thoughts on what to do with dst_ops]\n\t[Currently stub to init_net]\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "52479b623d3d41df84c499325b6a8c7915413032", "tree": "196f303f296b53dc89a05954d9c03226a9b4158b", "parents": [ "cdcbca7c1f1946758cfacb69bc1c7eeaccb11e2d" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Tue Nov 25 17:35:18 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 25 17:35:18 2008 -0800" }, "message": "netns xfrm: lookup in netns\n\nPass netns to xfrm_lookup()/__xfrm_lookup(). For that pass netns\nto flow_cache_lookup() and resolver callback.\n\nTake it from socket or netdevice. Stub DECnet to init_net.\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "221df1ed33c9284fc7a6f6e47ca7f8d5f3665d43", "tree": "1961ab9f9061b595e10449a24e7275d91f422de2", "parents": [ "0e6024519b4da2d9413b97be1de8122d5709ccc1" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Tue Nov 25 17:30:50 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 25 17:30:50 2008 -0800" }, "message": "netns xfrm: state lookup in netns\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "673c09be457bb23aa0eaaa79804cbb342210d195", "tree": "9948d1859bbcd07316f5cea239b86845d6061570", "parents": [ "d62ddc21b674b5ac1466091ff3fbf7baa53bc92c" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Tue Nov 25 17:15:16 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 25 17:15:16 2008 -0800" }, "message": "netns xfrm: add struct xfrm_state::xs_net\n\nTo avoid unnecessary complications with passing netns around.\n\n* set once, very early after allocating\n* once set, never changes\n\nFor a while create every xfrm_state in init_net.\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "55205d400efe3260e29ad26dd64c992cec2efafd", "tree": "753b7a7a12ed1dba60399f6b6f7793873ed68788", "parents": [ "dc0a0011cfa8ff01b86859006f4db3656c9a896b" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Nov 25 16:50:30 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 25 16:50:30 2008 -0800" }, "message": "ipv6: fix warning in net/ipv6/ip6_flowlabel.c\n\nthis warning:\n\n net/ipv6/ip6_flowlabel.c: In function ‘ipv6_flowlabel_opt’:\n net/ipv6/ip6_flowlabel.c:467: warning: ‘err’ may be used uninitialized in this function\n\ntriggers because GCC does not recognize the (correct) error flow\nbetween fl_create() and \u0027err\u0027.\n\nAnnotate it.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9f40ac713c49fb6ca655550b620edc85c445d743", "tree": "f6d4de1eecff24c1b629a44e028be4e9783e5486", "parents": [ "5f145e44ae09f629d25536b2947a91e9c01bddcb" ], "author": { "name": "Eric Leblond", "email": "eric@inl.fr", "time": "Tue Nov 25 12:18:11 2008 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Nov 25 12:18:11 2008 +0100" }, "message": "netfilter: nfmark IPV6 routing in OUTPUT, mangle, NFQUEUE\n\nThis patch let nfmark to be evaluated for routing decision for OUTPUT\npacket, in mangle table, when process paquet in NFQUEUE. This patch is\nan IPv6 port of Laurent Licour IPv4 one.\n\nSigned-off-by: Eric Leblond \u003ceric@inl.fr\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "fb7e06748c29c08a9f5ca057a780b65acbb91c27", "tree": "9f55582d2e12561fc8930d50f4ab3a6f802b2156", "parents": [ "6daad37230ab02bb593d179d704079d4b5912bd7" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Tue Nov 25 01:05:54 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 25 01:05:54 2008 -0800" }, "message": "xfrm: remove useless forward declarations\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6daad37230ab02bb593d179d704079d4b5912bd7", "tree": "42b08ba70a788dea44af80c49584f23d08e12a44", "parents": [ "69d728baf620839d1a3c874eecac316729f89de4" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Tue Nov 25 01:05:09 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 25 01:05:09 2008 -0800" }, "message": "ah4/ah6: remove useless NULL assignments\n\nstruct will be kfreed in a moment, so...\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "be77e5930725c3e77bcc0fb1def28e016080d0a1", "tree": "f0bfe670f5ef785567db3b65afc244b7664200c1", "parents": [ "c25eb3bfb97294d0543a81230fbc237046b4b84c" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Sun Nov 23 17:26:26 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 23 17:26:26 2008 -0800" }, "message": "net: fix tunnels in netns after ndo_ changes\n\ndev_net_set() should be the very first thing after alloc_netdev().\n\n\"ndo_\" changes turned simple assignment (which is OK to do before netns\nassignment) into quite non-trivial operation (which is not OK, init_net was\nused). This leads to incomplete initialisation of tunnel device in netns.\n\nBUG: unable to handle kernel NULL pointer dereference at 00000004\nIP: [\u003cc02efdb5\u003e] ip6_tnl_exit_net+0x37/0x4f\n*pde \u003d 00000000 \nOops: 0000 [#1] PREEMPT DEBUG_PAGEALLOC\nlast sysfs file: /sys/class/net/lo/operstate\n\nPid: 10, comm: netns Not tainted (2.6.28-rc6 #1) \nEIP: 0060:[\u003cc02efdb5\u003e] EFLAGS: 00010246 CPU: 0\nEIP is at ip6_tnl_exit_net+0x37/0x4f\nEAX: 00000000 EBX: 00000020 ECX: 00000000 EDX: 00000003\nESI: c5caef30 EDI: c782bbe8 EBP: c7909f50 ESP: c7909f48\n DS: 007b ES: 007b FS: 0000 GS: 0000 SS: 0068\nProcess netns (pid: 10, ti\u003dc7908000 task\u003dc7905780 task.ti\u003dc7908000)\nStack:\n c03e75e0 c7390bc8 c7909f60 c0245448 c7390bd8 c7390bf0 c7909fa8 c012577a\n 00000000 00000002 00000000 c0125736 c782bbe8 c7909f90 c0308fe3 c782bc04\n c7390bd4 c0245406 c084b718 c04f0770 c03ad785 c782bbe8 c782bc04 c782bc0c\nCall Trace:\n [\u003cc0245448\u003e] ? cleanup_net+0x42/0x82\n [\u003cc012577a\u003e] ? run_workqueue+0xd6/0x1ae\n [\u003cc0125736\u003e] ? run_workqueue+0x92/0x1ae\n [\u003cc0308fe3\u003e] ? schedule+0x275/0x285\n [\u003cc0245406\u003e] ? cleanup_net+0x0/0x82\n [\u003cc0125ae1\u003e] ? worker_thread+0x81/0x8d\n [\u003cc0128344\u003e] ? autoremove_wake_function+0x0/0x33\n [\u003cc0125a60\u003e] ? worker_thread+0x0/0x8d\n [\u003cc012815c\u003e] ? kthread+0x39/0x5e\n [\u003cc0128123\u003e] ? kthread+0x0/0x5e\n [\u003cc0103b9f\u003e] ? kernel_thread_helper+0x7/0x10\nCode: db e8 05 ff ff ff 89 c6 e8 dc 04 f6 ff eb 08 8b 40 04 e8 38 89 f5 ff 8b 44 9e 04 85 c0 75 f0 43 83 fb 20 75 f2 8b 86 84 00 00 00 \u003c8b\u003e 40 04 e8 1c 89 f5 ff e8 98 04 f6 ff 89 f0 e8 f8 63 e6 ff 5b \nEIP: [\u003cc02efdb5\u003e] ip6_tnl_exit_net+0x37/0x4f SS:ESP 0068:c7909f48\n---[ end trace 6c2f2328fccd3e0c ]---\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c25eb3bfb97294d0543a81230fbc237046b4b84c", "tree": "6c9deabfb12f4d31f280cfcfe7e7580a2089931c", "parents": [ "8c862c23e2563e6aedfc6c4aa6827cadb83f2414" ], "author": { "name": "Eric Dumazet", "email": "dada1@cosmosbay.com", "time": "Sun Nov 23 17:22:55 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 23 17:22:55 2008 -0800" }, "message": "net: Convert TCP/DCCP listening hash tables to use RCU\n\nThis is the last step to be able to perform full RCU lookups\nin __inet_lookup() : After established/timewait tables, we\nadd RCU lookups to listening hash table.\n\nThe only trick here is that a socket of a given type (TCP ipv4,\nTCP ipv6, ...) can now flight between two different tables\n(established and listening) during a RCU grace period, so we\nmust use different \u0027nulls\u0027 end-of-chain values for two tables.\n\nWe define a large value :\n\n#define LISTENING_NULLS_BASE (1U \u003c\u003c 29)\n\nSo that slots in listening table are guaranteed to have different\nend-of-chain values than slots in established table. A reader can\nstill detect it finished its lookup in the right chain.\n\nSigned-off-by: Eric Dumazet \u003cdada1@cosmosbay.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cf005b1d0e34d8c964347331c43de089c674a5a1", "tree": "c766e3fec0fa742ec38c2419bce4035e03424425", "parents": [ "6c0bce37ffc8f000a516fadf6dee84579c4c8f9b" ], "author": { "name": "Qinghuang Feng", "email": "qhfeng.kernel@gmail.com", "time": "Fri Nov 21 17:15:03 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 21 17:15:03 2008 -0800" }, "message": "net: remove redundant argument comments\n\nRemove redundant argument comments in files of net/*\n\nSigned-off-by: Qinghuang Feng \u003cqhfeng.kernel@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9db66bdcc83749affe61c61eb8ff3cf08f42afec", "tree": "81bb20e4f569d3b44731498428277db9d77fa7a9", "parents": [ "b8c26a33c8b6f0a150e9cb38ed80b890be55395c" ], "author": { "name": "Eric Dumazet", "email": "dada1@cosmosbay.com", "time": "Thu Nov 20 20:39:09 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 20 20:39:09 2008 -0800" }, "message": "net: convert TCP/DCCP ehash rwlocks to spinlocks\n\nNow TCP \u0026 DCCP use RCU lookups, we can convert ehash rwlocks to spinlocks.\n\n/proc/net/tcp and other seq_file \u0027readers\u0027 can safely be converted to \u0027writers\u0027.\n\nThis should speedup writers, since spin_lock()/spin_unlock()\nonly use one atomic operation instead of two for write_lock()/write_unlock()\n\nSigned-off-by: Eric Dumazet \u003cdada1@cosmosbay.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1326c3d5a4b792a2b15877feb7fb691f8945d203", "tree": "ec87c30b83541f2f96c864e4fc7096fcec9490b3", "parents": [ "23a12b14715e2dcd34dc8002927263ad3437344c" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Thu Nov 20 20:33:56 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 20 20:33:56 2008 -0800" }, "message": "ipv6: convert tunnels to net_device_ops\n\nLike IPV4, convert the tunnel virtual devices to use net_device_ops.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "007c3838d9fdcc8fdaea87e4879ec3759f016ed5", "tree": "67f09220e48797dc2799a7db6b0b4f5cc8a99ac3", "parents": [ "aa18e9e88c863a58f6ea63eeee0e740be071fdcf" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Thu Nov 20 20:28:35 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 20 20:28:35 2008 -0800" }, "message": "ipmr: convert ipmr virtual interface to net_device_ops\n\nConvert to new network device ops interface.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6ab33d51713d6d60c7677c0d020910a8cb37e513", "tree": "546c2ff099b2757e75cf34ddace874f1220f740e", "parents": [ "7be6065b39c3f1cfa796667eac1a2170465acc91", "13d428afc007fcfcd6deeb215618f54cf9c0cae6" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 20 16:44:00 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 20 16:44:00 2008 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\n\tdrivers/net/ixgbe/ixgbe_main.c\n\tinclude/net/mac80211.h\n\tnet/phonet/af_phonet.c\n" }, { "commit": "5ece6c2ddd6f7da9e95dc325c742c0f5afbcecbe", "tree": "cf8ebb119403f92df8a296002b9316c9fa38a8a6", "parents": [ "a849854fc7e200d5e5a437dec9c1d0e8b105e50f" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Thu Nov 20 04:20:10 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 20 04:20:10 2008 -0800" }, "message": "net: fix tiny output corruption of /proc/net/snmp6\n\nBecause \"name\" is static, it can be occasionally be filled with\nsomewhat garbage if two processes read /proc/net/snmp6.\n\nAlso, remove useless casts and \"-1\" -- snprintf() correctly terminates it\u0027s\noutput.\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eedd726efbc439dbed94fb8577e5533a986b341f", "tree": "5980fdeb7ad34e2cd3623fe8d3a477121c1e8dbb", "parents": [ "3aa4614da741f10b09559a5675c79e2eff5cccd8" ], "author": { "name": "Benjamin Thery", "email": "benjamin.thery@bull.net", "time": "Thu Nov 20 04:16:12 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 20 04:16:12 2008 -0800" }, "message": "ipv6: use seq_release_private for ip6mr.c /proc entries\n\nIn ip6mr.c, /proc entries /proc/net/ip6_mr_cache and /proc/net/ip6_mr_vif\nare opened with seq_open_private(), thus seq_release_private() should be \nused to release them.\nShould fix a small memory leak.\n\nSigned-off-by: Benjamin Thery \u003cbenjamin.thery@bull.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "61d3015808d877eb4ea225b5924feb128b0c1bc7", "tree": "55e7ca8fd9ead7df7be4b8cdbd1530a95550a2ea", "parents": [ "b0ceb560a4119f187dc50da655be389cb54ae4f9" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Thu Nov 20 09:58:08 2008 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Nov 20 09:58:08 2008 +0100" }, "message": "netfilter: ip6table_filter: merge LOCAL_IN and FORWARD hooks\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "5caea4ea7088e80ac5410d04660346094608b909", "tree": "fad95133683c002d24ff5de7fb756dad806b41ed", "parents": [ "d8b83c57a7e497cba9b5cb156e63176323035785" ], "author": { "name": "Eric Dumazet", "email": "dada1@cosmosbay.com", "time": "Thu Nov 20 00:40:07 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 20 00:40:07 2008 -0800" }, "message": "net: listening_hash get a spinlock per bucket\n\nThis patch prepares RCU migration of listening_hash table for\nTCP/DCCP protocols.\n\nlistening_hash table being small (32 slots per protocol), we add\na spinlock for each slot, instead of a single rwlock for whole table.\n\nThis should reduce hold time of readers, and writers concurrency.\n\nSigned-off-by: Eric Dumazet \u003cdada1@cosmosbay.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5bc3eb7e2f0026f246d939851109df99e8e9f64a", "tree": "6da63169e066a07db21cc5268ac97ceb4c366c1c", "parents": [ "54a30c975b6b27c0c9268461b647576b146d39bb" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Wed Nov 19 21:52:05 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 19 22:42:41 2008 -0800" }, "message": "ip: convert to net_device_ops for ioctl\n\nConvert to net_device_ops function table pointer for ioctl.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "07f0757a6808f2f36a0e58c3a54867ccffdb8dc9", "tree": "e04b573c3f1471ff21c6b2499682a620f4db7eae", "parents": [ "a7a0d6a87b70f7b2bab5281fc0fd443772bd0795" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Wed Nov 19 15:44:53 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 19 15:44:53 2008 -0800" }, "message": "include/net net/ - csum_partial - remove unnecessary casts\n\nThe first argument to csum_partial is const void *\ncasts to char/u8 * are not necessary\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "198d6ba4d7f48c94f990f4604f0b3d73925e0ded", "tree": "56bbdf8ba2553c23c8099da9344a8f1d1aba97ab", "parents": [ "9a57f7fabd383920585ed8b74eacd117c6551f2d", "7f0f598a0069d1ab072375965a4b69137233169c" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 18 23:38:23 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 18 23:38:23 2008 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\n\tdrivers/isdn/i4l/isdn_net.c\n\tfs/cifs/connect.c\n" }, { "commit": "f3a5c547012a09f38f7c27b17a8e3150b69cd259", "tree": "4d1d47382a4a445fc7ef7431bcf5d06b7cca8539", "parents": [ "e50a906e0200084f04f8f3b7c3a14b0442d1347f", "4e14e833ac3b97a4aa8803eea49f899adc5bb5f4" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Tue Nov 18 18:52:37 2008 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Tue Nov 18 18:52:37 2008 +1100" }, "message": "Merge branch \u0027master\u0027 into next\n\nConflicts:\n\tfs/cifs/misc.c\n\nMerge to resolve above, per the patch below.\n\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n\ndiff --cc fs/cifs/misc.c\nindex ec36410,addd1dc..0000000\n--- a/fs/cifs/misc.c\n+++ b/fs/cifs/misc.c\n@@@ -347,13 -338,13 +338,13 @@@ header_assemble(struct smb_hdr *buffer\n \t\t/* BB Add support for establishing new tCon and SMB Session */\n \t\t/* with userid/password pairs found on the smb session */\n \t\t/*\tfor other target tcp/ip addresses \t\tBB */\n -\t\t\t\tif (current-\u003efsuid !\u003d treeCon-\u003eses-\u003elinux_uid) {\n +\t\t\t\tif (current_fsuid() !\u003d treeCon-\u003eses-\u003elinux_uid) {\n \t\t\t\t\tcFYI(1, (\"Multiuser mode and UID \"\n \t\t\t\t\t\t \"did not match tcon uid\"));\n- \t\t\t\t\tread_lock(\u0026GlobalSMBSeslock);\n- \t\t\t\t\tlist_for_each(temp_item, \u0026GlobalSMBSessionList) {\n- \t\t\t\t\t\tses \u003d list_entry(temp_item, struct cifsSesInfo, cifsSessionList);\n+ \t\t\t\t\tread_lock(\u0026cifs_tcp_ses_lock);\n+ \t\t\t\t\tlist_for_each(temp_item, \u0026treeCon-\u003eses-\u003eserver-\u003esmb_ses_list) {\n+ \t\t\t\t\t\tses \u003d list_entry(temp_item, struct cifsSesInfo, smb_ses_list);\n -\t\t\t\t\t\tif (ses-\u003elinux_uid \u003d\u003d current-\u003efsuid) {\n +\t\t\t\t\t\tif (ses-\u003elinux_uid \u003d\u003d current_fsuid()) {\n \t\t\t\t\t\t\tif (ses-\u003eserver \u003d\u003d treeCon-\u003eses-\u003eserver) {\n \t\t\t\t\t\t\t\tcFYI(1, (\"found matching uid substitute right smb_uid\"));\n \t\t\t\t\t\t\t\tbuffer-\u003eUid \u003d ses-\u003eSuid;\n" }, { "commit": "3ab5aee7fe840b5b1b35a8d1ac11c3de5281e611", "tree": "468296b7be813643248d4ca67497d6ddb6934fc6", "parents": [ "88ab1932eac721c6e7336708558fa5ed02c85c80" ], "author": { "name": "Eric Dumazet", "email": "dada1@cosmosbay.com", "time": "Sun Nov 16 19:40:17 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 16 19:40:17 2008 -0800" }, "message": "net: Convert TCP \u0026 DCCP hash tables to use RCU / hlist_nulls\n\nRCU was added to UDP lookups, using a fast infrastructure :\n- sockets kmem_cache use SLAB_DESTROY_BY_RCU and dont pay the\n price of call_rcu() at freeing time.\n- hlist_nulls permits to use few memory barriers.\n\nThis patch uses same infrastructure for TCP/DCCP established\nand timewait sockets.\n\nThanks to SLAB_DESTROY_BY_RCU, no slowdown for applications\nusing short lived TCP connections. A followup patch, converting\nrwlocks to spinlocks will even speedup this case.\n\n__inet_lookup_established() is pretty fast now we dont have to\ndirty a contended cache line (read_lock/read_unlock)\n\nOnly established and timewait hashtable are converted to RCU\n(bind table and listen table are still using traditional locking)\n\nSigned-off-by: Eric Dumazet \u003cdada1@cosmosbay.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "88ab1932eac721c6e7336708558fa5ed02c85c80", "tree": "c8788a1e3de08100bca341fa4180adfe5d02880f", "parents": [ "bbaffaca4810de1a25e32ecaf836eeaacc7a3d11" ], "author": { "name": "Eric Dumazet", "email": "dada1@cosmosbay.com", "time": "Sun Nov 16 19:39:21 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 16 19:39:21 2008 -0800" }, "message": "udp: Use hlist_nulls in UDP RCU code\n\nThis is a straightforward patch, using hlist_nulls infrastructure.\n\nRCUification already done on UDP two weeks ago.\n\nUsing hlist_nulls permits us to avoid some memory barriers, both\nat lookup time and delete time.\n\nPatch is large because it adds new macros to include/net/sock.h.\nThese macros will be used by TCP \u0026 DCCP in next patch.\n\nSigned-off-by: Eric Dumazet \u003cdada1@cosmosbay.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2b828925652340277a889cbc11b2d0637f7cdaf7", "tree": "32fcb3d3e466fc419fad2d3717956a5b5ad3d35a", "parents": [ "3a3b7ce9336952ea7b9564d976d068a238976c9d", "58e20d8d344b0ee083febb18c2b021d2427e56ca" ], "author": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Nov 14 11:29:12 2008 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Nov 14 11:29:12 2008 +1100" }, "message": "Merge branch \u0027master\u0027 into next\n\nConflicts:\n\tsecurity/keys/internal.h\n\tsecurity/keys/process_keys.c\n\tsecurity/keys/request_key.c\n\nFixed conflicts above by using the non \u0027tsk\u0027 versions.\n\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "d76b0d9b2d87cfc95686e148767cbf7d0e22bdc0", "tree": "1a2956614018d245facb256ffb8662568cdabcd4", "parents": [ "1d045980e1eff4800472f0e81df9460640c8eee9" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Fri Nov 14 10:39:25 2008 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Nov 14 10:39:25 2008 +1100" }, "message": "CRED: Use creds in file structs\n\nAttach creds to file structs and discard f_uid/f_gid.\n\nfile_operations::open() methods (such as hppfs_open()) should use file-\u003ef_cred\nrather than current_cred(). At the moment file-\u003ef_cred will be current_cred()\nat this point.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nReviewed-by: James Morris \u003cjmorris@namei.org\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "f82b359023c8b7b343edef6c63322b900d9e74a1", "tree": "2fe3f9e51692be430b2b98df7136a8cc3a0da62e", "parents": [ "734004072e05ae81c3cdd0a04ee37868fb09b71e" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Fri Nov 14 10:39:07 2008 +1100" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Fri Nov 14 10:39:07 2008 +1100" }, "message": "CRED: Wrap task credential accesses in the IPv6 protocol\n\nWrap access to task credentials so that they can be separated more easily from\nthe task_struct during the introduction of COW creds.\n\nChange most current-\u003e(|e|s|fs)[ug]id to current_(|e|s|fs)[ug]id().\n\nChange some task-\u003ee?[ug]id to task_e?[ug]id(). In some places it makes more\nsense to use RCU directly rather than a convenient wrapper; these will be\naddressed by later patches.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nReviewed-by: James Morris \u003cjmorris@namei.org\u003e\nAcked-by: Serge Hallyn \u003cserue@us.ibm.com\u003e\nCc: netdev@vger.kernel.org\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "6e093d9dfffc9a02cd54d36904c62f705f09900a", "tree": "b9250d24821ffa8edb55fee50e0d695afd23a6f9", "parents": [ "b2af2c1d3e4ddeea9d02c46d0df0c322cc7b7061" ], "author": { "name": "Brian Haley", "email": "brian.haley@hp.com", "time": "Wed Nov 12 22:59:21 2008 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 12 22:59:21 2008 -0800" }, "message": "ipv6: routing header fixes\n\nThis patch fixes two bugs:\n\n1. setsockopt() of anything but a Type 2 routing header should return\nEINVAL instead of EPERM. Noticed by Shan Wei\n(shanwei@cn.fujitsu.com).\n\n2. setsockopt()/sendmsg() of a Type 2 routing header with invalid\nlength or segments should return EINVAL. These values are statically\nfixed in RFC 3775, unlike the variable Type 0 was.\n\nSigned-off-by: Brian Haley \u003cbrian.haley@hp.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" } ], "next": "6bb3ce25d05f2990c8a19adaf427531430267c1f" }