)]}' { "log": [ { "commit": "9bbc052d5e63512b0ce4e201ea97e12fba9fda82", "tree": "30433e20961b73e571c081869d1ea52c92c7b15a", "parents": [ "0d4420a90b51abdea71585f571bad6d789ff8eb7", "93bbce1ad0cd788190dd7d6c17d289f771fe3d0d" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 10 15:04:35 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 10 15:04:35 2011 -0700" }, "message": "Merge branch \u0027pablo/nf-2.6-updates\u0027 of git://1984.lsi.us.es/net-2.6\n" }, { "commit": "43a4dea4c9d44baae38ddc14b9b6d86fde4c8b88", "tree": "af7ecb23077cf5b4ae1290f7d1ab5e901e7adb82", "parents": [ "e14a599335427f81bbb0008963e59aa9c6449dce" ], "author": { "name": "Steffen Klassert", "email": "steffen.klassert@secunet.com", "time": "Mon May 09 19:36:38 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 10 15:03:34 2011 -0700" }, "message": "xfrm: Assign the inner mode output function to the dst entry\n\nAs it is, we assign the outer modes output function to the dst entry\nwhen we create the xfrm bundle. This leads to two problems on interfamily\nscenarios. We might insert ipv4 packets into ip6_fragment when called\nfrom xfrm6_output. The system crashes if we try to fragment an ipv4\npacket with ip6_fragment. This issue was introduced with git commit\nad0081e4 (ipv6: Fragment locally generated tunnel-mode IPSec6 packets\nas needed). The second issue is, that we might insert ipv4 packets in\nnetfilter6 and vice versa on interfamily scenarios.\n\nWith this patch we assign the inner mode output function to the dst entry\nwhen we create the xfrm bundle. So xfrm4_output/xfrm6_output from the inner\nmode is used and the right fragmentation and netfilter functions are called.\nWe switch then to outer mode with the output_finish functions.\n\nSigned-off-by: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4319cc0cf5bb894b7368008cdf6dd20eb8868018", "tree": "5ca875d740316146cda6468fb992cf7ddf8ebf1f", "parents": [ "7a4f0761fce32ff4918a7c23b08db564ad33092d" ], "author": { "name": "Fernando Luis Vazquez Cao", "email": "fernando@oss.ntt.co.jp", "time": "Tue May 10 09:55:44 2011 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 10 09:55:44 2011 +0200" }, "message": "netfilter: IPv6: initialize TOS field in REJECT target module\n\nThe IPv6 header is not zeroed out in alloc_skb so we must initialize\nit properly unless we want to see IPv6 packets with random TOS fields\nfloating around. The current implementation resets the flow label\nbut this could be changed if deemed necessary.\n\nWe stumbled upon this issue when trying to apply a mangle rule to\nthe RST packet generated by the REJECT target module.\n\nSigned-off-by: Fernando Luis Vazquez Cao \u003cfernando@oss.ntt.co.jp\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "ff538818f4a82c4cf02d2d6bd6ac5c7360b9d41d", "tree": "e385bfa4e7c3e48c2c6c755987c3ba50d3d5aa98", "parents": [ "6c8c44462ac8ac3f95929328f0c56e9e8b6dd524" ], "author": { "name": "Lucian Adrian Grijincu", "email": "lucian.grijincu@gmail.com", "time": "Sun May 01 01:44:01 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 02 16:12:14 2011 -0700" }, "message": "sysctl: net: call unregister_net_sysctl_table where needed\n\nctl_table_headers registered with register_net_sysctl_table should\nhave been unregistered with the equivalent unregister_net_sysctl_table\n\nSigned-off-by: Lucian Adrian Grijincu \u003clucian.grijincu@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c0a56e64aec331f33ead29ba493ee184d9bdc840", "tree": "609d6b30b77dd7f129789d93e9d3fbc584791267", "parents": [ "3f602b08dec32c418fc391fc838db357aab84f8a" ], "author": { "name": "Steffen Klassert", "email": "steffen.klassert@secunet.com", "time": "Mon Apr 25 19:40:23 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 26 12:46:04 2011 -0700" }, "message": "esp6: Fix scatterlist initialization\n\nWhen we use IPsec extended sequence numbers, we may overwrite\nthe last scatterlist of the associated data by the scatterlist\nfor the skb. This patch fixes this by placing the scatterlist\nfor the skb right behind the last scatterlist of the associated\ndata. esp4 does it already like that.\n\nSigned-off-by: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\nAcked-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0972ddb2373d5e127aabdcabd8305eff0242cd0b", "tree": "6040853adf2a2aac1df2551e3e7695e902a03905", "parents": [ "8c61d9d611cb5b290f1b4ac57c4631acfd6e3b5a" ], "author": { "name": "Held Bernhard", "email": "berny156@gmx.de", "time": "Sun Apr 24 22:07:32 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 25 11:53:08 2011 -0700" }, "message": "net: provide cow_metrics() methods to blackhole dst_ops\n\nSince commit 62fa8a846d7d (net: Implement read-only protection and COW\u0027ing\nof metrics.) the kernel throws an oops.\n\n[ 101.620985] BUG: unable to handle kernel NULL pointer dereference at\n (null)\n[ 101.621050] IP: [\u003c (null)\u003e] (null)\n[ 101.621084] PGD 6e53c067 PUD 3dd6a067 PMD 0\n[ 101.621122] Oops: 0010 [#1] SMP\n[ 101.621153] last sysfs file: /sys/devices/virtual/ppp/ppp/uevent\n[ 101.621192] CPU 2\n[ 101.621206] Modules linked in: l2tp_ppp pppox ppp_generic slhc\nl2tp_netlink l2tp_core deflate zlib_deflate twofish_x86_64\ntwofish_common des_generic cbc ecb sha1_generic hmac af_key\niptable_filter snd_pcm_oss snd_mixer_oss snd_seq snd_seq_device loop\nsnd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_intel snd_hda_codec\nsnd_pcm snd_timer snd i2c_i801 iTCO_wdt psmouse soundcore snd_page_alloc\nevdev uhci_hcd ehci_hcd thermal\n[ 101.621552]\n[ 101.621567] Pid: 5129, comm: openl2tpd Not tainted 2.6.39-rc4-Quad #3\nGigabyte Technology Co., Ltd. G33-DS3R/G33-DS3R\n[ 101.621637] RIP: 0010:[\u003c0000000000000000\u003e] [\u003c (null)\u003e] (null)\n[ 101.621684] RSP: 0018:ffff88003ddeba60 EFLAGS: 00010202\n[ 101.621716] RAX: ffff88003ddb5600 RBX: ffff88003ddb5600 RCX:\n0000000000000020\n[ 101.621758] RDX: ffffffff81a69a00 RSI: ffffffff81b7ee61 RDI:\nffff88003ddb5600\n[ 101.621800] RBP: ffff8800537cd900 R08: 0000000000000000 R09:\nffff88003ddb5600\n[ 101.621840] R10: 0000000000000005 R11: 0000000000014b38 R12:\nffff88003ddb5600\n[ 101.621881] R13: ffffffff81b7e480 R14: ffffffff81b7e8b8 R15:\nffff88003ddebad8\n[ 101.621924] FS: 00007f06e4182700(0000) GS:ffff88007fd00000(0000)\nknlGS:0000000000000000\n[ 101.621971] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033\n[ 101.622005] CR2: 0000000000000000 CR3: 0000000045274000 CR4:\n00000000000006e0\n[ 101.622046] DR0: 0000000000000000 DR1: 0000000000000000 DR2:\n0000000000000000\n[ 101.622087] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7:\n0000000000000400\n[ 101.622129] Process openl2tpd (pid: 5129, threadinfo\nffff88003ddea000, task ffff88003de9a280)\n[ 101.622177] Stack:\n[ 101.622191] ffffffff81447efa ffff88007d3ded80 ffff88003de9a280\nffff88007d3ded80\n[ 101.622245] 0000000000000001 ffff88003ddebbb8 ffffffff8148d5a7\n0000000000000212\n[ 101.622299] ffff88003dcea000 ffff88003dcea188 ffffffff00000001\nffffffff81b7e480\n[ 101.622353] Call Trace:\n[ 101.622374] [\u003cffffffff81447efa\u003e] ? ipv4_blackhole_route+0x1ba/0x210\n[ 101.622415] [\u003cffffffff8148d5a7\u003e] ? xfrm_lookup+0x417/0x510\n[ 101.622450] [\u003cffffffff8127672a\u003e] ? extract_buf+0x9a/0x140\n[ 101.622485] [\u003cffffffff8144c6a0\u003e] ? __ip_flush_pending_frames+0x70/0x70\n[ 101.622526] [\u003cffffffff8146fbbf\u003e] ? udp_sendmsg+0x62f/0x810\n[ 101.622562] [\u003cffffffff813f98a6\u003e] ? sock_sendmsg+0x116/0x130\n[ 101.622599] [\u003cffffffff8109df58\u003e] ? find_get_page+0x18/0x90\n[ 101.622633] [\u003cffffffff8109fd6a\u003e] ? filemap_fault+0x12a/0x4b0\n[ 101.622668] [\u003cffffffff813fb5c4\u003e] ? move_addr_to_kernel+0x64/0x90\n[ 101.622706] [\u003cffffffff81405d5a\u003e] ? verify_iovec+0x7a/0xf0\n[ 101.622739] [\u003cffffffff813fc772\u003e] ? sys_sendmsg+0x292/0x420\n[ 101.622774] [\u003cffffffff810b994a\u003e] ? handle_pte_fault+0x8a/0x7c0\n[ 101.622810] [\u003cffffffff810b76fe\u003e] ? __pte_alloc+0xae/0x130\n[ 101.622844] [\u003cffffffff810ba2f8\u003e] ? handle_mm_fault+0x138/0x380\n[ 101.622880] [\u003cffffffff81024af9\u003e] ? do_page_fault+0x189/0x410\n[ 101.622915] [\u003cffffffff813fbe03\u003e] ? sys_getsockname+0xf3/0x110\n[ 101.622952] [\u003cffffffff81450c4d\u003e] ? ip_setsockopt+0x4d/0xa0\n[ 101.622986] [\u003cffffffff813f9932\u003e] ? sockfd_lookup_light+0x22/0x90\n[ 101.623024] [\u003cffffffff814b61fb\u003e] ? system_call_fastpath+0x16/0x1b\n[ 101.623060] Code: Bad RIP value.\n[ 101.623090] RIP [\u003c (null)\u003e] (null)\n[ 101.623125] RSP \u003cffff88003ddeba60\u003e\n[ 101.623146] CR2: 0000000000000000\n[ 101.650871] ---[ end trace ca3856a7d8e8dad4 ]---\n[ 101.651011] __sk_free: optmem leakage (160 bytes) detected.\n\nThe oops happens in dst_metrics_write_ptr()\ninclude/net/dst.h:124: return dst-\u003eops-\u003ecow_metrics(dst, p);\n\ndst-\u003eops-\u003ecow_metrics is NULL and causes the oops.\n\nProvide cow_metrics() methods, like we did in commit 214f45c91bb\n(net: provide default_advmss() methods to blackhole dst_ops)\n\nSigned-off-by: Held Bernhard \u003cberny156@gmx.de\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e965c05dabdabb85af0187952ccd75e43995c4b3", "tree": "10923ab7f6e5aaae3e432218d6492e07a7f83981", "parents": [ "e2a85aecebc03d165bc2dcd233deadd5dd97ea9f" ], "author": { "name": "Thomas Egerer", "email": "thomas.egerer@secunet.com", "time": "Wed Apr 20 22:56:02 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 21 17:24:08 2011 -0700" }, "message": "ipv6: Remove hoplimit initialization to -1\n\nThe changes introduced with git-commit a02e4b7d (\"ipv6: Demark default\nhoplimit as zero.\") missed to remove the hoplimit initialization. As a\nresult, ipv6_get_mtu interprets the return value of dst_metric_raw\n(-1) as 255 and answers ping6 with this hoplimit. This patche removes\nthe line such that ping6 is answered with the hoplimit value\nconfigured via sysctl.\n\nSigned-off-by: Thomas Egerer \u003cthomas.egerer@secunet.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a9cf73ea7ff78f52662c8658d93c226effbbedde", "tree": "07a723cb628f223e4f756f0cb02eeba8b6ee9c62", "parents": [ "10022a6c66e199d8f61d9044543f38785713cbbd" ], "author": { "name": "Shan Wei", "email": "shanwei@cn.fujitsu.com", "time": "Tue Apr 19 22:52:49 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 21 10:39:10 2011 -0700" }, "message": "ipv6: udp: fix the wrong headroom check\n\nAt this point, skb-\u003edata points to skb_transport_header.\nSo, headroom check is wrong.\n\nFor some case:bridge(UFO is on) + eth device(UFO is off),\nthere is no enough headroom for IPv6 frag head.\nBut headroom check is always false.\n\nThis will bring about data be moved to there prior to skb-\u003ehead,\nwhen adding IPv6 frag header to skb.\n\nSigned-off-by: Shan Wei \u003cshanwei@cn.fujitsu.com\u003e\nAcked-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3e8c806a08c7beecd972e7ce15c570b9aba64baa", "tree": "89b0b7bfc919ec8e7dc0866f16715bb626af0cc6", "parents": [ "91a403caf0f26c71ce4407fd235b2d6fb225fba9" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 13 12:01:14 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 13 12:01:14 2011 -0700" }, "message": "Revert \"tcp: disallow bind() to reuse addr/port\"\n\nThis reverts commit c191a836a908d1dd6b40c503741f91b914de3348.\n\nIt causes known regressions for programs that expect to be able to use\nSO_REUSEADDR to shutdown a socket, then successfully rebind another\nsocket to the same ID.\n\nPrograms such as haproxy and amavisd expect this to work.\n\nThis should fix kernel bugzilla 32832.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c44eaf41a5a423993932c9a9ad279ee132779b48", "tree": "3554fc0bfdcd97936417d6d001d00710d11e67e5", "parents": [ "4263a2f1dad8c8e7ce2352a0cbc882c2b0c044a9", "88edaa415966af965bb7eb7056d8b58145462c8e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 11 07:27:24 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 11 07:27:24 2011 -0700" }, "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: (34 commits)\n net: Add support for SMSC LAN9530, LAN9730 and LAN89530\n mlx4_en: Restoring RX buffer pointer in case of failure\n mlx4: Sensing link type at device initialization\n ipv4: Fix \"Set rt-\u003ert_iif more sanely on output routes.\"\n MAINTAINERS: add entry for Xen network backend\n be2net: Fix suspend/resume operation\n be2net: Rename some struct members for clarity\n pppoe: drop PPPOX_ZOMBIEs in pppoe_flush_dev\n dsa/mv88e6131: add support for mv88e6085 switch\n ipv6: Enable RFS sk_rxhash tracking for ipv6 sockets (v2)\n be2net: Fix a potential crash during shutdown.\n bna: Fix for handling firmware heartbeat failure\n can: mcp251x: Allow pass IRQ flags through platform data.\n smsc911x: fix mac_lock acquision before calling smsc911x_mac_read\n iwlwifi: accept EEPROM version 0x423 for iwl6000\n rt2x00: fix cancelling uninitialized work\n rtlwifi: Fix some warnings/bugs\n p54usb: IDs for two new devices\n wl12xx: fix potential buffer overflow in testmode nvs push\n zd1211rw: reset rx idle timer from tasklet\n ...\n" }, { "commit": "42933bac11e811f02200c944d8562a15f8ec4ff0", "tree": "fcdd9afe56eb0e746565ddd1f92f22d36678b843", "parents": [ "2b9accbee563f535046ff2cd382d0acaa92e130c", "25985edcedea6396277003854657b5f3cb31a628" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 07 11:14:49 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 07 11:14:49 2011 -0700" }, "message": "Merge branch \u0027for-linus2\u0027 of git://git.profusion.mobi/users/lucas/linux-2.6\n\n* \u0027for-linus2\u0027 of git://git.profusion.mobi/users/lucas/linux-2.6:\n Fix common misspellings\n" }, { "commit": "47482f132a689af168fae3055ff1899dfd032d3a", "tree": "07f64d971a4783a71b612602da42e7faf8b14dd5", "parents": [ "2d5d4154650459b61a8e7097d186a89d89dab8ed" ], "author": { "name": "Neil Horman", "email": "nhorman@tuxdriver.com", "time": "Wed Apr 06 13:07:09 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 06 13:07:09 2011 -0700" }, "message": "ipv6: Enable RFS sk_rxhash tracking for ipv6 sockets (v2)\n\nproperly record sk_rxhash in ipv6 sockets (v2)\n\nNoticed while working on another project that flows to sockets which I had open\non a test systems weren\u0027t getting steered properly when I had RFS enabled.\nLooking more closely I found that:\n\n1) The affected sockets were all ipv6\n2) They weren\u0027t getting steered because sk-\u003esk_rxhash was never set from the\nincomming skbs on that socket.\n\nThis was occuring because there are several points in the IPv4 tcp and udp code\nwhich save the rxhash value when a new connection is established. Those calls\nto sock_rps_save_rxhash were never added to the corresponding ipv6 code paths.\nThis patch adds those calls. Tested by myself to properly enable RFS\nfunctionalty on ipv6.\n\nChange notes:\nv2:\n\tFiltered UDP to only arm RFS on bound sockets (Eric Dumazet)\n\nSigned-off-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9d9305949778c41b92d4394a2f2a6bcdb1c41a9c", "tree": "d49d536ae8156ad9989dc7b26e3897f21e549b02", "parents": [ "738faca34335cd1d5d87fa7c58703139c7fa15bd", "96120d86fe302c006259baee9061eea9e1b9e486" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 05 14:21:11 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 05 14:21:11 2011 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6\n" }, { "commit": "738faca34335cd1d5d87fa7c58703139c7fa15bd", "tree": "983fc8212bc5828fe14541119783cff159508b58", "parents": [ "a14b289d4614bb3b25d0455d68f72f3c7b4cc8e8" ], "author": { "name": "Boris Ostrovsky", "email": "boris.ostrovsky@amd.com", "time": "Mon Apr 04 13:07:26 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 04 13:07:26 2011 -0700" }, "message": "ipv6: Don\u0027t pass invalid dst_entry pointer to dst_release().\n\nMake sure dst_release() is not called with error pointer. This is\nsimilar to commit 4910ac6c526d2868adcb5893e0c428473de862b5 (\"ipv4:\nDon\u0027t ip_rt_put() an error pointer in RAW sockets.\").\n\nSigned-off-by: Boris Ostrovsky \u003cboris.ostrovsky@amd.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0fae2e7740aca7e384c5f337f458897e7e337d58", "tree": "ff0767f2dc382ee8a62e324e441b671382f0433c", "parents": [ "31ad3dd64e689bc79dd819f8f134b9b025240eb8" ], "author": { "name": "Florian Westphal", "email": "fw@strlen.de", "time": "Mon Apr 04 17:00:54 2011 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon Apr 04 17:00:54 2011 +0200" }, "message": "netfilter: af_info: add \u0027strict\u0027 parameter to limit lookup to .oif\n\nipv6 fib lookup can set RT6_LOOKUP_F_IFACE flag to restrict search\nto an interface, but this flag cannot be set via struct flowi.\n\nAlso, it cannot be set via ip6_route_output: this function uses the\npassed sock struct to determine if this flag is required\n(by testing for nonzero sk_bound_dev_if).\n\nWork around this by passing in an artificial struct sk in case\n\u0027strict\u0027 argument is true.\n\nThis is required to replace the rt6_lookup call in xt_addrtype.c with\nnf_afinfo-\u003eroute().\n\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "31ad3dd64e689bc79dd819f8f134b9b025240eb8", "tree": "06d2a9afbea2b1b7973e416f18d4588df30fb91a", "parents": [ "a09d19779f3ffac6e16821accc2c1cc4df1b643a" ], "author": { "name": "Florian Westphal", "email": "fw@strlen.de", "time": "Mon Apr 04 16:56:29 2011 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon Apr 04 16:56:29 2011 +0200" }, "message": "netfilter: af_info: add network namespace parameter to route hook\n\nThis is required to eventually replace the rt6_lookup call in\nxt_addrtype.c with nf_afinfo-\u003eroute().\n\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "25985edcedea6396277003854657b5f3cb31a628", "tree": "f026e810210a2ee7290caeb737c23cb6472b7c38", "parents": [ "6aba74f2791287ec407e0f92487a725a25908067" ], "author": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Wed Mar 30 22:57:33 2011 -0300" }, "committer": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Thu Mar 31 11:26:23 2011 -0300" }, "message": "Fix common misspellings\n\nFixes generated by \u0027codespell\u0027 and manually reviewed.\n\nSigned-off-by: Lucas De Marchi \u003clucas.demarchi@profusion.mobi\u003e\n" }, { "commit": "93ca3bb5df9bc8b2c60485e1cc6507c3d7c8e1fa", "tree": "6ccf21f8d1e4431c6be79c265fb1f9a722308f63", "parents": [ "1459a3cc51d90d78027c7b5c1790e5d22751c8eb" ], "author": { "name": "Timo Teräs", "email": "timo.teras@iki.fi", "time": "Mon Mar 28 22:40:53 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 30 00:10:47 2011 -0700" }, "message": "net: gre: provide multicast mappings for ipv4 and ipv6\n\nMy commit 6d55cb91a0020ac0 (gre: fix hard header destination\naddress checking) broke multicast.\n\nThe reason is that ip_gre used to get ipgre_header() calls with\nzero destination if we have NOARP or multicast destination. Instead\nthe actual target was decided at ipgre_tunnel_xmit() time based on\nper-protocol dissection.\n\nInstead of allowing the \"abuse\" of -\u003eheader() calls with invalid\ndestination, this creates multicast mappings for ip_gre. This also\nfixes \"ip neigh show nud noarp\" to display the proper multicast\nmappings used by the gre device.\n\nReported-by: Doug Kehn \u003crdkehn@yahoo.com\u003e\nSigned-off-by: Timo Teräs \u003ctimo.teras@iki.fi\u003e\nAcked-by: Doug Kehn \u003crdkehn@yahoo.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3e49e6d520401e1d25ec8d366520aad2c01adc1c", "tree": "60dac2bdbce6b61524ac1f12468841470607c5ad", "parents": [ "f4e5bd4f5784c0608078805f29d4a4897ee482f7" ], "author": { "name": "Cesar Eduardo Barros", "email": "cesarb@cesarb.net", "time": "Sat Mar 26 05:10:30 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Mar 27 23:35:05 2011 -0700" }, "message": "net: use CHECKSUM_NONE instead of magic number\n\nTwo places in the kernel were doing skb-\u003eip_summed \u003d 0.\n\nChange both to skb-\u003eip_summed \u003d CHECKSUM_NONE, which is more readable.\n\nSigned-off-by: Cesar Eduardo Barros \u003ccesarb@cesarb.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9c7a4f9ce651383c73dfdff3d7e21d5f9572c4ec", "tree": "5286988a4c78be842ea164c24e1acf932d19b4a0", "parents": [ "db138908ccff404b9920f18f6244f4bff2368c04" ], "author": { "name": "Florian Westphal", "email": "fw@strlen.de", "time": "Tue Mar 22 19:17:36 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 22 19:17:36 2011 -0700" }, "message": "ipv6: ip6_route_output does not modify sk parameter, so make it const\n\nThis avoids explicit cast to avoid \u0027discards qualifiers\u0027\ncompiler warning in a netfilter patch that i\u0027ve been working on.\n\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9d2a8fa96a44ba242de3a6f56acaef7a40a97b97", "tree": "1fd01e0ef3da06d1508481aeb7c3c4994122dff9", "parents": [ "d5cd92448fded12c91f7574e49747c5f7d975a8d" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@aristanetworks.com", "time": "Mon Mar 21 18:23:34 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 21 18:23:34 2011 -0700" }, "message": "net ipv6: Fix duplicate /proc/sys/net/ipv6/neigh directory entries.\n\nWhen I was fixing issues with unregisgtering tables under /proc/sys/net/ipv6/neigh\nby adding a mount point it appears I missed a critical ordering issue, in the\nipv6 initialization. I had not realized that ipv6_sysctl_register is called\nat the very end of the ipv6 initialization and in particular after we call\nneigh_sysctl_register from ndisc_init.\n\n\"neigh\" needs to be initialized in ipv6_static_sysctl_register which is\nthe first ipv6 table to initialized, and definitely before ndisc_init.\nThis removes the weirdness of duplicate tables while still providing a\n\"neigh\" mount point which prevents races in sysctl unregistering.\n\nThis was initially reported at https://bugzilla.kernel.org/show_bug.cgi?id\u003d31232\nReported-by: sunkan@zappa.cx\nSigned-off-by: Eric W. Biederman \u003cebiederm@aristanetworks.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "db856674ac69e31946e56085239757cca3f7655f", "tree": "73fc82e92a119dcf1a0ce4e2ca45ef410165776f", "parents": [ "5c1aba467828bf0574ec5754c84884d573f590af" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sun Mar 20 15:40:06 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Sun Mar 20 15:40:06 2011 +0100" }, "message": "netfilter: xtables: fix reentrancy\n\ncommit f3c5c1bfd4308 (make ip_tables reentrant) introduced a race in\nhandling the stackptr restore, at the end of ipt_do_table()\n\nWe should do it before the call to xt_info_rdunlock_bh(), or we allow\ncpu preemption and another cpu overwrites stackptr of original one.\n\nA second fix is to change the underflow test to check the origptr value\ninstead of 0 to detect underflow, or else we allow a jump from different\nhooks.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Jan Engelhardt \u003cjengelh@medozas.de\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "e16b396ce314b2bcdfe6c173fe075bf8e3432368", "tree": "640f0f56f2ea676647af4eb42d32fa56be2ee549", "parents": [ "7fd23a24717a327a66f3c32d11a20a2f169c824f", "e6e8dd5055a974935af1398c8648d4a9359b0ecb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 18 10:37:40 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 18 10:37:40 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (47 commits)\n doc: CONFIG_UNEVICTABLE_LRU doesn\u0027t exist anymore\n Update cpuset info \u0026 webiste for cgroups\n dcdbas: force SMI to happen when expected\n arch/arm/Kconfig: remove one to many l\u0027s in the word.\n asm-generic/user.h: Fix spelling in comment\n drm: fix printk typo \u0027sracth\u0027\n Remove one to many n\u0027s in a word\n Documentation/filesystems/romfs.txt: fixing link to genromfs\n drivers:scsi Change printk typo initate -\u003e initiate\n serial, pch uart: Remove duplicate inclusion of linux/pci.h header\n fs/eventpoll.c: fix spelling\n mm: Fix out-of-date comments which refers non-existent functions\n drm: Fix printk typo \u0027failled\u0027\n coh901318.c: Change initate to initiate.\n mbox-db5500.c Change initate to initiate.\n edac: correct i82975x error-info reported\n edac: correct i82975x mci initialisation\n edac: correct commented info\n fs: update comments to point correct document\n target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c\n ...\n\nTrivial conflict in fs/eventpoll.c (spelling vs addition)\n" }, { "commit": "31111c26d976ca0f298312f08e44cdb078005b03", "tree": "ca08ef55b2ea91f9e69f8a78bb8b4363a1759b54", "parents": [ "0c0217b016ba8a970a6f6ab62ad0d858f39881ca", "2f5dc63123905a89d4260ab8ee08d19ec104db04" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 15 13:03:27 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 15 13:03:27 2011 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6\n\nConflicts:\n\tDocumentation/feature-removal-schedule.txt\n" }, { "commit": "6a8ab060779779de8aea92ce3337ca348f973f54", "tree": "bdd3ebda1c8b1e75c32f6fa115ada1dcef18f1f4", "parents": [ "78b79876761b86653df89c48a7010b5cbd41a84a" ], "author": { "name": "Vasiliy Kulikov", "email": "segoon@openwall.com", "time": "Tue Mar 15 13:37:13 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Mar 15 13:37:13 2011 +0100" }, "message": "ipv6: netfilter: ip6_tables: fix infoleak to userspace\n\nStructures ip6t_replace, compat_ip6t_replace, and xt_get_revision are\ncopied from userspace. Fields of these structs that are\nzero-terminated strings are not checked. When they are used as argument\nto a format string containing \"%s\" in request_module(), some sensitive\ninformation is leaked to userspace via argument of spawned modprobe\nprocess.\n\nThe first bug was introduced before the git epoch; the second was\nintroduced in 3bc3fe5e (v2.6.25-rc1); the third is introduced by\n6b7d31fc (v2.6.15-rc1). To trigger the bug one should have\nCAP_NET_ADMIN.\n\nSigned-off-by: Vasiliy Kulikov \u003csegoon@openwall.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "d212a4c29096484e5e83b5006e695add126260af", "tree": "00f5c3bcbc7560591820070364d78e21c241be34", "parents": [ "0dc49e9b28a7253ff05be2794d747f8ea5f1f423" ], "author": { "name": "Steffen Klassert", "email": "steffen.klassert@secunet.com", "time": "Tue Mar 08 00:07:51 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Mar 13 20:22:29 2011 -0700" }, "message": "esp6: Add support for IPsec extended sequence numbers\n\nThis patch adds IPsec extended sequence numbers support to esp6.\nWe use the authencesn crypto algorithm to handle esp with separate\nencryption/authentication algorithms.\n\nSigned-off-by: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\nAcked-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1ce3644ade9c865c755bf0f6a4e109b7bb6eb60f", "tree": "14ce0727337a43d1fa28432d01189d1a5f4269c7", "parents": [ "9736acf395d3608583a7be70f62800b494fa103c" ], "author": { "name": "Steffen Klassert", "email": "steffen.klassert@secunet.com", "time": "Tue Mar 08 00:06:31 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Mar 13 20:22:28 2011 -0700" }, "message": "xfrm: Use separate low and high order bits of the sequence numbers in xfrm_skb_cb\n\nTo support IPsec extended sequence numbers, we split the\noutput sequence numbers of xfrm_skb_cb in low and high order 32 bits\nand we add the high order 32 bits to the input sequence numbers.\nAll users are updated accordingly.\n\nSigned-off-by: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\nAcked-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1958b856c1a59c0f1e892b92debb8c9fe4f364dc", "tree": "679e060ad7c1e36ee2e5aec0c686921c66c9bc2c", "parents": [ "4c9483b2fb5d2548c3cc1fe03cdd4484ceeb5d1c" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 12 16:36:19 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 12 15:08:55 2011 -0800" }, "message": "net: Put fl6_* macros to struct flowi6 and use them again.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4c9483b2fb5d2548c3cc1fe03cdd4484ceeb5d1c", "tree": "c29c8070012cffb38fe249cf528589a675f622b1", "parents": [ "9cce96df5b76691712dba22e83ff5efe900361e1" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 12 16:22:43 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 12 15:08:54 2011 -0800" }, "message": "ipv6: Convert to use flowi6 where applicable.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7e1dc7b6f709dfc1a9ab4b320dbe723f45992693", "tree": "db3a0ae07fb469c7f809a448bc39563f98edfec5", "parents": [ "2032656e76b5355151effdff14de4a1a58643915" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 12 02:42:11 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 12 15:08:52 2011 -0800" }, "message": "net: Use flowi4 and flowi6 in xfrm layer.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "56bb8059e1a8bf291054c26367564dc302f6fd8f", "tree": "56ec5ae2c1856208ccf97a0cd6b21ab0587f34cf", "parents": [ "6281dcc94a96bd73017b2baa8fa83925405109ef" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 12 00:44:35 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 12 15:08:46 2011 -0800" }, "message": "net: Break struct flowi out into AF specific instances.\n\nNow we have struct flowi4, flowi6, and flowidn for each address\nfamily. And struct flowi is just a union of them all.\n\nIt might have been troublesome to convert flow_cache_uli_match() but\nas it turns out this function is completely unused and therefore can\nbe simply removed.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6281dcc94a96bd73017b2baa8fa83925405109ef", "tree": "8deee4d66d256d10ea25f66520eb96b1fade1545", "parents": [ "08704bcbf022786532b5f188935ab6619906049f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 12 00:43:55 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 12 15:08:46 2011 -0800" }, "message": "net: Make flowi ports AF dependent.\n\nCreate two sets of port member accessors, one set prefixed by fl4_*\nand the other prefixed by fl6_*\n\nThis will let us to create AF optimal flow instances.\n\nIt will work because every context in which we access the ports,\nwe have to be fully aware of which AF the flowi is anyways.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1d28f42c1bd4bb2363d88df74d0128b4da135b4a", "tree": "cb2e652fe79a2bc307e871bc2d3fa51cc8051e45", "parents": [ "ca116922afa8cc5ad46b00c0a637b1cde5ca478a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 12 00:29:39 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 12 15:08:44 2011 -0800" }, "message": "net: Put flowi_* prefix on AF independent members of struct flowi\n\nI intend to turn struct flowi into a union of AF specific flowi\nstructs. There will be a common structure that each variant includes\nfirst, much like struct sock_common.\n\nThis is the first step to move in that direction.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "78fbfd8a653ca972afe479517a40661bfff6d8c3", "tree": "9dccc5c16bf269d53d8499064ec95a998e84c646", "parents": [ "1561747ddf9d28185548687b11aae7074d6129c4" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 12 00:00:52 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 12 15:08:42 2011 -0800" }, "message": "ipv4: Create and use route lookup helpers.\n\nThe idea here is this minimizes the number of places one has to edit\nin order to make changes to how flows are defined and used.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "33175d84ee3fa29991adb80513683e010769e807", "tree": "3731f61cf82451b6892cf1368701e57e35d92908", "parents": [ "c5908939b2738bafe1b309bc2465cb9f2e6184c5", "6dfbd87a20a737641ef228230c77f4262434fa24" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 10 14:26:00 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 10 14:26:00 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/bnx2x/bnx2x_cmn.c\n" }, { "commit": "6dfbd87a20a737641ef228230c77f4262434fa24", "tree": "0ebffefdd7ded0a2919426c0b7b87bc63f3d321e", "parents": [ "bef6e7e76868ab454d5e83635a4a7a1961c74fb5" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Thu Mar 10 11:43:19 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 10 14:18:48 2011 -0800" }, "message": "ip6ip6: autoload ip6 tunnel\n\nAdd necessary alias to autoload ip6ip6 tunnel module.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bef6e7e76868ab454d5e83635a4a7a1961c74fb5", "tree": "1a7417b9dde942cc71f87c02688c6ac6b0e57a72", "parents": [ "dcbcdf22f500ac6e4ec06485341024739b9dc241", "9179746652faf0aba07b8b7f770dcf29892a24c6" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 10 14:00:44 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 10 14:00:44 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of /home/davem/src/GIT/linux-2.6/\n" }, { "commit": "7343ff31ebf01691ea4515d3126467434b9d22d6", "tree": "13c8180b8aeb82363c1e7b576372c23fa2d5f955", "parents": [ "03a14ab134f4811ab1475f07b1305ccaf38b690f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 09 19:55:25 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 09 19:55:25 2011 -0800" }, "message": "ipv6: Don\u0027t create clones of host routes.\n\nAddresses https://bugzilla.kernel.org/show_bug.cgi?id\u003d29252\nAddresses https://bugzilla.kernel.org/show_bug.cgi?id\u003d30462\n\nIn commit d80bc0fd262ef840ed4e82593ad6416fa1ba3fc4 (\"ipv6: Always\nclone offlink routes.\") we forced the kernel to always clone offlink\nroutes.\n\nThe reason we do that is to make sure we never bind an inetpeer to a\nprefixed route.\n\nThe logic turned on here has existed in the tree for many years,\nbut was always off due to a protecting CPP define. So perhaps\nit\u0027s no surprise that there is a logic bug here.\n\nThe problem is that we canot clone a route that is already a\nhost route (ie. has DST_HOST set). Because if we do, an identical\nentry already exists in the routing tree and therefore the\nip6_rt_ins() call is going to fail.\n\nThis sets off a series of failures and high cpu usage, because when\nip6_rt_ins() fails we loop retrying this operation a few times in\norder to handle a race between two threads trying to clone and insert\nthe same host route at the same time.\n\nFix this by simply using the route as-is when DST_HOST is set.\n\nReported-by: slash@ac.auone-net.jp\nReported-by: Ernst Sjöstrand \u003cernstp@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8909c9ad8ff03611c9c96c9a92656213e4bb495b", "tree": "10b023c05503a9f6a165a23b8e65d8f3e70fd42d", "parents": [ "a5abba989deceb731047425812d268daf7536575" ], "author": { "name": "Vasiliy Kulikov", "email": "segoon@openwall.com", "time": "Wed Mar 02 00:33:13 2011 +0300" }, "committer": { "name": "James Morris", "email": "jmorris@namei.org", "time": "Thu Mar 10 10:25:19 2011 +1100" }, "message": "net: don\u0027t allow CAP_NET_ADMIN to load non-netdev kernel modules\n\nSince a8f80e8ff94ecba629542d9b4b5f5a8ee3eb565c any process with\nCAP_NET_ADMIN may load any module from /lib/modules/. This doesn\u0027t mean\nthat CAP_NET_ADMIN is a superset of CAP_SYS_MODULE as modules are\nlimited to /lib/modules/**. However, CAP_NET_ADMIN capability shouldn\u0027t\nallow anybody load any module not related to networking.\n\nThis patch restricts an ability of autoloading modules to netdev modules\nwith explicit aliases. This fixes CVE-2011-1019.\n\nArnd Bergmann suggested to leave untouched the old pre-v2.6.32 behavior\nof loading netdev modules by name (without any prefix) for processes\nwith CAP_SYS_MODULE to maintain the compatibility with network scripts\nthat use autoloading netdev modules by aliases like \"eth0\", \"wlan0\".\n\nCurrently there are only three users of the feature in the upstream\nkernel: ipip, ip_gre and sit.\n\n root@albatros:~# capsh --drop\u003d$(seq -s, 0 11),$(seq -s, 13 34) --\n root@albatros:~# grep Cap /proc/$$/status\n CapInh:\t0000000000000000\n CapPrm:\tfffffff800001000\n CapEff:\tfffffff800001000\n CapBnd:\tfffffff800001000\n root@albatros:~# modprobe xfs\n FATAL: Error inserting xfs\n (/lib/modules/2.6.38-rc6-00001-g2bf4ca3/kernel/fs/xfs/xfs.ko): Operation not permitted\n root@albatros:~# lsmod | grep xfs\n root@albatros:~# ifconfig xfs\n xfs: error fetching interface information: Device not found\n root@albatros:~# lsmod | grep xfs\n root@albatros:~# lsmod | grep sit\n root@albatros:~# ifconfig sit\n sit: error fetching interface information: Device not found\n root@albatros:~# lsmod | grep sit\n root@albatros:~# ifconfig sit0\n sit0 Link encap:IPv6-in-IPv4\n\t NOARP MTU:1480 Metric:1\n\n root@albatros:~# lsmod | grep sit\n sit 10457 0\n tunnel4 2957 1 sit\n\nFor CAP_SYS_MODULE module loading is still relaxed:\n\n root@albatros:~# grep Cap /proc/$$/status\n CapInh:\t0000000000000000\n CapPrm:\tffffffffffffffff\n CapEff:\tffffffffffffffff\n CapBnd:\tffffffffffffffff\n root@albatros:~# ifconfig xfs\n xfs: error fetching interface information: Device not found\n root@albatros:~# lsmod | grep xfs\n xfs 745319 0\n\nReference: https://lkml.org/lkml/2011/2/24/203\n\nSigned-off-by: Vasiliy Kulikov \u003csegoon@openwall.com\u003e\nSigned-off-by: Michael Tokarev \u003cmjt@tls.msk.ru\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Kees Cook \u003ckees.cook@canonical.com\u003e\nSigned-off-by: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "4b66fef9b591b95f447aea12242a1133deb0bd22", "tree": "9f9a6e36e8412b004ad61b85f0fb81b9c0247025", "parents": [ "06f0c1392c20d708ffae067fdcad604882e19200" ], "author": { "name": "Hagen Paul Pfeifer", "email": "hagen@jauu.net", "time": "Fri Mar 04 11:45:03 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 07 15:51:13 2011 -0800" }, "message": "mcast: net_device dev not used\n\nip6_mc_source(), ip6_mc_msfilter() as well as ip6_mc_msfget() declare\nand assign dev but do not use the variable afterwards.\n\nSigned-off-by: Hagen Paul Pfeifer \u003chagen@jauu.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0a0e9ae1bd788bc19adc4d4ae08c98b233697402", "tree": "13825eeb5bbeae27d66e95f12168eff4b60701ab", "parents": [ "01a16b21d6adf992aa863186c3c4e561a57c1714", "b65a0e0c84cf489bfa00d6aa6c48abc5a237100f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 03 21:27:42 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 03 21:27:42 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/bnx2x/bnx2x.h\n" }, { "commit": "29546a6404e3a4b5d13f0a9586eb5cf1c3b25167", "tree": "a8be742e4d7980b588103b39a6cdb5f2ac165061", "parents": [ "a45d49d1053fd5954260a70e555daabd5672577d" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 03 12:10:37 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 03 12:10:37 2011 -0800" }, "message": "ipv6: Use ERR_CAST in addrconf_dst_alloc.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b23dd4fe42b455af5c6e20966b7d6959fa8352ea", "tree": "bf97323eae9a8d084170e573ff2c0c40bc72c3cd", "parents": [ "452edd598f60522c11f7f88fdbab27eb36509d1a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 02 14:31:35 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 02 14:31:35 2011 -0800" }, "message": "ipv4: Make output route lookup return rtable directly.\n\nInstead of on the stack.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "452edd598f60522c11f7f88fdbab27eb36509d1a", "tree": "df1510e9848e591a412c8bfa724253470c48c4c2", "parents": [ "3872b284087081ee5cb0e4630954c2f7a2153cf5" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 02 13:27:41 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 02 13:27:41 2011 -0800" }, "message": "xfrm: Return dst directly from xfrm_lookup()\n\nInstead of on the stack.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b42835dbe83d725198c7ab0bbe726d6dfd92a634", "tree": "8728dccb3fa9bb54dba53a0a00c6e2818b843a91", "parents": [ "f6d460cf0ed16d35aec48f823685e7a0e0283d84" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 01 22:06:22 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 01 22:07:37 2011 -0800" }, "message": "ipv6: Make icmp route lookup code a bit clearer.\n\nThe route lookup code in icmpv6_send() is slightly tricky as a result of\nhaving to handle all of the requirements of RFC 4301 host relookups.\n\nPull the route resolution into a seperate function, so that the error\nhandling and route reference counting is hopefully easier to see and\ncontained wholly within this new routine.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2774c131b1d19920b4587db1cfbd6f0750ad1f15", "tree": "3a0482c727cf4dcc046a211214f12459dcba8271", "parents": [ "69ead7afdf6028184f713a77376ee26f8aaafdcd" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 01 14:59:04 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 01 14:59:04 2011 -0800" }, "message": "xfrm: Handle blackhole route creation via afinfo.\n\nThat way we don\u0027t have to potentially do this in every xfrm_lookup()\ncaller.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "69ead7afdf6028184f713a77376ee26f8aaafdcd", "tree": "bd5cd86f9786daadfd5425f65106bd1c7383fcc7", "parents": [ "80c0bc9e37adfc892af82cb6aa8cace79f8a96cb" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 01 14:45:33 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 01 14:45:33 2011 -0800" }, "message": "ipv6: Normalize arguments to ip6_dst_blackhole().\n\nReturn a dst pointer which is potentitally error encoded.\n\nDon\u0027t pass original dst pointer by reference, pass a struct net\ninstead of a socket, and elide the flow argument since it is\nunnecessary.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "80c0bc9e37adfc892af82cb6aa8cace79f8a96cb", "tree": "0f4abc233d9661e85c7c7ecb064a75a8f0984f1f", "parents": [ "a1414715f0ac905fb4b3a158ff6548d37bbe6165" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 01 14:36:37 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 01 14:36:37 2011 -0800" }, "message": "xfrm: Kill XFRM_LOOKUP_WAIT flag.\n\nThis can be determined from the flow flags instead.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a1414715f0ac905fb4b3a158ff6548d37bbe6165", "tree": "64d8875dd744deff8ccfd0afad7a0806f4e4308a", "parents": [ "273447b352e69c327efdecfd6e1d6fe3edbdcd14" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 01 14:32:04 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 01 14:32:04 2011 -0800" }, "message": "ipv6: Change final dst lookup arg name to \"can_sleep\"\n\nSince it indicates whether we are invoked from a sleepable\ncontext or not.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5df65e5567a497a28067019b8ff08f98fb026629", "tree": "776a8a2cfa2cf5962ea0d53dea8c6c8360a0c58d", "parents": [ "420d44daa7aa1cc847e9e527f0a27a9ce61768ca" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 01 14:22:19 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 01 14:22:19 2011 -0800" }, "message": "net: Add FLOWI_FLAG_CAN_SLEEP.\n\nAnd set is in contexts where the route resolution can sleep.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "68d0c6d34d586a893292d4fb633a3bf8c547b222", "tree": "b6d812307621873cf16000171563c1f68b5bc255", "parents": [ "903ab86d195cca295379699299c5fc10beba31c7" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 01 13:19:07 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 01 13:19:07 2011 -0800" }, "message": "ipv6: Consolidate route lookup sequences.\n\nRoute lookups follow a general pattern in the ipv6 code wherein\nwe first find the non-IPSEC route, potentially override the\nflow destination address due to ipv6 options settings, and then\nfinally make an IPSEC search using either xfrm_lookup() or\n__xfrm_lookup().\n\n__xfrm_lookup() is used when we want to generate a blackhole route\nif the key manager needs to resolve the IPSEC rules (in this case\n-EREMOTE is returned and the original \u0027dst\u0027 is left unchanged).\n\nOtherwise plain xfrm_lookup() is used and when asynchronous IPSEC\nresolution is necessary, we simply fail the lookup completely.\n\nAll of these cases are encapsulated into two routines,\nip6_dst_lookup_flow and ip6_sk_dst_lookup_flow. The latter of which\nhandles unconnected UDP datagram sockets.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5a2ef92023506d4e9cd13617b5a46b4d0f1b6747", "tree": "995af8882f53c67ed79e10a1bd37d523ba7986a9", "parents": [ "9836f4080fd5b680cc2d9656355c1a7c681b1ffd" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Mar 01 02:36:47 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 01 12:35:02 2011 -0800" }, "message": "inet: Remove unused sk_sndmsg_* from UFO\n\nUFO doesn\u0027t really use the sk_sndmsg_* parameters so touching\nthem is pointless. It can\u0027t use them anyway since the whole\npoint of UFO is to use the original pages without copying.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a693e69897e7811e2790295f38a0ce3a92c4b45c", "tree": "2c3cd9d7288821a7b71dc7f4481462150f41de63", "parents": [ "eaaa3a7c4da2bdc48e536bb750860253150cb931" ], "author": { "name": "Anders Berggren", "email": "anders@halon.se", "time": "Mon Feb 28 12:32:11 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Feb 28 12:32:11 2011 -0800" }, "message": "net: TX timestamps for IPv6 UDP packets\n\nEnabling TX timestamps (SO_TIMESTAMPING) for IPv6 UDP packets, in\nthe same fashion as for IPv4. Necessary in order for NICs such as\nIntel 82580 to timestamp IPv6 packets.\n\nSigned-off-by: Anders Berggren \u003canders@halon.se\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ddc3731fcb712646e4a0f8e6117af6a153e9d36f", "tree": "3b36d1f397ef7255ff437cf8f51921e03751e32e", "parents": [ "e9476e95d8707d1567d1af60df2c1f19630219a3" ], "author": { "name": "Hagen Paul Pfeifer", "email": "hagen@jauu.net", "time": "Fri Feb 25 05:45:20 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 25 14:00:23 2011 -0800" }, "message": "ipv6: ignore rtnl_unicast() return code\n\nrtnl_unicast() return value is not of interest, we can silently ignore\nit, save some instructions and four byte on the stack.\n\nSigned-off-by: Hagen Paul Pfeifer \u003chagen@jauu.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e9476e95d8707d1567d1af60df2c1f19630219a3", "tree": "54f6de320be67fe161f65e2c472664ed6d1be0d9", "parents": [ "96d796a38e9ec9a7c04a6cda3fc15d79efebb008" ], "author": { "name": "Hagen Paul Pfeifer", "email": "hagen@jauu.net", "time": "Fri Feb 25 05:45:19 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 25 14:00:22 2011 -0800" }, "message": "ipv6: variable next is never used in this function\n\nSigned-off-by: Hagen Paul Pfeifer \u003chagen@jauu.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "96d796a38e9ec9a7c04a6cda3fc15d79efebb008", "tree": "2452390cd9a4044bf63f05836d595b775c2206db", "parents": [ "a5f5e3689c8682e06ba155676d69ccf3f4172cb4" ], "author": { "name": "Hagen Paul Pfeifer", "email": "hagen@jauu.net", "time": "Fri Feb 25 05:45:18 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 25 14:00:22 2011 -0800" }, "message": "ipv6: hash is calculated but not used afterwards\n\nhash is declared and assigned but not used anymore. ipv6_addr_hash()\nexhibit no side-effects.\n\nSigned-off-by: Hagen Paul Pfeifer \u003chagen@jauu.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a5f5e3689c8682e06ba155676d69ccf3f4172cb4", "tree": "5e29960dabb86477ad9ae9be6092b1e3e19a626f", "parents": [ "3b193ade594e4f2d501d4c3a9f43d49176f03230" ], "author": { "name": "Hagen Paul Pfeifer", "email": "hagen@jauu.net", "time": "Fri Feb 25 05:45:17 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 25 14:00:21 2011 -0800" }, "message": "ipv6: totlen is declared and assigned but not used\n\nSigned-off-by: Hagen Paul Pfeifer \u003chagen@jauu.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c486da34390846b430896a407b47f0cea3a4189c", "tree": "2df7eb05f91354e0dc0468ed884326b121f76686", "parents": [ "cdf64c803e6cfec72259f7bb2654261584bb80a8" ], "author": { "name": "Lucian Adrian Grijincu", "email": "lucian.grijincu@gmail.com", "time": "Thu Feb 24 19:48:03 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 25 11:01:56 2011 -0800" }, "message": "sysctl: ipv6: use correct net in ipv6_sysctl_rtcache_flush\n\nBefore this patch issuing these commands:\n\n fd \u003d open(\"/proc/sys/net/ipv6/route/flush\")\n unshare(CLONE_NEWNET)\n write(fd, \"stuff\")\n\nwould flush the newly created net, not the original one.\n\nThe equivalent ipv4 code is correct (stores the net inside -\u003eextra1).\nAcked-by: Daniel Lezcano \u003cdaniel.lezcano@free.fr\u003e\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5e6b930f21b0a442f9d5db97c8314b4d91be1c27", "tree": "035572d5908abe8092bae44befcc99720ab50a1b", "parents": [ "200ce96e5601391a6d97c87067edf21fa94fb74e" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 24 00:14:45 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 23 23:07:38 2011 -0800" }, "message": "xfrm: Const\u0027ify address arguments to -\u003edst_lookup()\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "19bd62441c36279ab33e311faebd357ef04ba344", "tree": "d9666f25d4212876d7feb0d75303ac246c8846ef", "parents": [ "214e005bc32c7045b8554f9f0fb07b3fcce2cd42" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 24 00:07:20 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 23 23:07:37 2011 -0800" }, "message": "xfrm: Const\u0027ify tmpl and address arguments to -\u003einit_temprop()\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8f029de281b26ec9fd5cd77294db1d35d9876f1a", "tree": "221eca1314cf4a9920b06143b4d08d370ea63b19", "parents": [ "73e5ebb20f2809e2eb0b904448481e010c2599d7" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 22 17:59:59 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 22 17:59:59 2011 -0800" }, "message": "xfrm: Mark flowi arg to xfrm_type-\u003ereject() const.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "73e5ebb20f2809e2eb0b904448481e010c2599d7", "tree": "b41c044d23f9b488ac45d743cf1a0c9e9e90ca79", "parents": [ "0c7b3eefb4ab8df245e94feb0d83c1c3450a3d87" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 22 17:51:44 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 22 17:51:44 2011 -0800" }, "message": "xfrm: Mark flowi arg to -\u003einit_tempsel() const.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0c7b3eefb4ab8df245e94feb0d83c1c3450a3d87", "tree": "895c8242220a1bbbdf0704bba009fb3a424af316", "parents": [ "05d8402576c9c1b85bfc9e4f9d6a21c27ccbd5b1" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 22 17:48:57 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 22 17:48:57 2011 -0800" }, "message": "xfrm: Mark flowi arg to -\u003efill_dst() const.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "05d8402576c9c1b85bfc9e4f9d6a21c27ccbd5b1", "tree": "d3406de85a12ae45b75ef109bd8e991b119f55b9", "parents": [ "e8a4e37716dbc964e1cd18bca1a62fbd11805c1d" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 22 17:47:10 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 22 17:47:10 2011 -0800" }, "message": "xfrm: Mark flowi arg to -\u003eget_tos() const.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "089c34827e52346f0303d1e6a7b744c1f4da3095", "tree": "79f42bd0c4782aca57f3fe9d0f941f5c04b566a4", "parents": [ "81146ec1b85067e70b71e81b5ecd9998ce054c0e" ], "author": { "name": "Shan Wei", "email": "shanwei@cn.fujitsu.com", "time": "Sat Feb 19 21:55:45 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Feb 20 11:10:14 2011 -0800" }, "message": "tcp: Remove debug macro of TCP_CHECK_TIMER\n\nNow, TCP_CHECK_TIMER is not used for debuging, it does nothing.\nAnd, it has been there for several years, maybe 6 years.\n\nRemove it to keep code clearer.\n\nSigned-off-by: Shan Wei \u003cshanwei@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "da935c66bacb3ed9ada984b053297f87c2dff63a", "tree": "46278da2b312c73f1375b830d7e5912bf23abd78", "parents": [ "9435eb1cf0b76b323019cebf8d16762a50a12a19", "2205a6ea93fea76f88b43727fea53f3ce3790d6f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Feb 19 19:17:35 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Feb 19 19:17:35 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tDocumentation/feature-removal-schedule.txt\n\tdrivers/net/e1000e/netdev.c\n\tnet/xfrm/xfrm_policy.c\n" }, { "commit": "ece639caa33c85c8805fa4a0a5955b8de9c95346", "tree": "5b8d613601c2e01e876a7d241923e90a0e759c3b", "parents": [ "0cc9d5257857608ba85885b75fcada13d359b5d1", "0af320fb4627033e49cbc6e8138e7aa75ab8352a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Feb 19 16:42:37 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Feb 19 16:42:37 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6\n" }, { "commit": "214f45c91bbda8321d9676f1197238e4663edcbb", "tree": "2b78e1d21298c1622755b09826ed2b8e5152d6e3", "parents": [ "ed199facd070f8e551dc16a2ae1baa01d8d28ed4" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri Feb 18 11:39:01 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 18 11:39:01 2011 -0800" }, "message": "net: provide default_advmss() methods to blackhole dst_ops\n\nCommit 0dbaee3b37e118a (net: Abstract default ADVMSS behind an\naccessor.) introduced a possible crash in tcp_connect_init(), when\ndst-\u003edefault_advmss() is called from dst_metric_advmss()\n\nReported-by: George Spelvin \u003clinux@horizon.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3c7bd1a14071b99d6535b710bc998ae5d3abbb66", "tree": "05f31758aa4d6b49b70a4af4a8df4a83588610c2", "parents": [ "0c4dcd58fd69aded93b0dc6917cd88b262c8aa3f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 16 14:08:44 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 17 15:44:00 2011 -0800" }, "message": "net: Add initial_ref arg to dst_alloc().\n\nThis allows avoiding multiple writes to the initial __refcnt.\n\nThe most simplest cases of wanting an initial reference of \"1\"\nin ipv4 and ipv6 have been converted, the rest have been left\nalong and kept at the existing \"0\".\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0af320fb4627033e49cbc6e8138e7aa75ab8352a", "tree": "724a020c8d6f96b37ee9674cd59b94c08f50a176", "parents": [ "d503b30bd648b3cb4e5f50b65d27e389960cc6d9" ], "author": { "name": "Joerg Marx", "email": "joerg.marx@secunet.com", "time": "Thu Feb 17 16:23:40 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Feb 17 16:23:40 2011 +0100" }, "message": "netfilter: ip6t_LOG: fix a flaw in printing the MAC\n\nThe flaw was in skipping the second byte in MAC header due to increasing\nthe pointer AND indexed access starting at \u00271\u0027.\n\nSigned-off-by: Joerg Marx \u003cjoerg.marx@secunet.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "0a9d59a2461477bd9ed143c01af9df3f8f00fa81", "tree": "df997d1cfb0786427a0df1fbd6f0640fa4248cf4", "parents": [ "a23ce6da9677d245aa0aadc99f4197030350ab54", "795abaf1e4e188c4171e3cd3dbb11a9fcacaf505" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue Feb 15 10:24:31 2011 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue Feb 15 10:24:31 2011 +0100" }, "message": "Merge branch \u0027master\u0027 into for-next\n" }, { "commit": "6431cbc25fa21635ee04eb0516ba6c51389fbfac", "tree": "515deede7292fce41c019e7bd72b58cab34ecb9c", "parents": [ "ddd4aa424b866a08ceba7ddf38e61542c91b93a0" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Feb 07 20:38:06 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 10 13:33:41 2011 -0800" }, "message": "inet: Create a mechanism for upward inetpeer propagation into routes.\n\nIf we didn\u0027t have a routing cache, we would not be able to properly\npropagate certain kinds of dynamic path attributes, for example\nPMTU information and redirects.\n\nThe reason is that if we didn\u0027t have a routing cache, then there would\nbe no way to lookup all of the active cached routes hanging off of\nsockets, tunnels, IPSEC bundles, etc.\n\nConsider the case where we created a cached route, but no inetpeer\nentry existed and also we were not asked to pre-COW the route metrics\nand therefore did not force the creation a new inetpeer entry.\n\nIf we later get a PMTU message, or a redirect, and store this\ninformation in a new inetpeer entry, there is no way to teach that\ncached route about the newly existing inetpeer entry.\n\nThe facilities implemented here handle this problem.\n\nFirst we create a generation ID. When we create a cached route of any\nkind, we remember the generation ID at the time of attachment. Any\ntime we force-create an inetpeer entry in response to new path\ninformation, we bump that generation ID.\n\nThe dst_ops-\u003echeck() callback is where the knowledge of this event\nis propagated. If the global generation ID does not equal the one\nstored in the cached route, and the cached route has not attached\nto an inetpeer yet, we look it up and attach if one is found. Now\nthat we\u0027ve updated the cached route\u0027s information, we update the\nroute\u0027s generation ID too.\n\nThis clears the way for implementing PMTU and redirects directly in\nthe inetpeer cache. There is absolutely no need to consult cached\nroute information in order to maintain this information.\n\nAt this point nothing bumps the inetpeer genids, that comes in the\nlater changes which handle PMTUs and redirects using inetpeers.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7a71ed899e77cc822abb863e24a422dcf7e9fa33", "tree": "2811b8ca75c7019522f73c7d972208ae3a3ea8f9", "parents": [ "b6644cb706610874104dbf3359e3b67aa59cbc27" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 09 14:30:26 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 10 13:22:28 2011 -0800" }, "message": "inetpeer: Abstract address representation further.\n\nFuture changes will add caching information, and some of\nthese new elements will be addresses.\n\nSince the family is implicit via the -\u003edaddr.family member,\nreplicating the family in ever address we store is entirely\nredundant.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8d13a2a9fb3e5e3f68e9d3ec0de3c8fcfa56a224", "tree": "fee1865c2fbfe8fbb67e8aed97fd8df18254d777", "parents": [ "e7b66bdc02592f5573ade667e4d68ac6e7b0f9e1" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 08 16:17:55 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 08 16:17:55 2011 -0800" }, "message": "net: Kill NETEVENT_PMTU_UPDATE.\n\nNobody actually does anything in response to the event,\nso just kill it off.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "92d8682926342d2b6aa5b2ecc02221e00e1573a0", "tree": "7f70b9cc2975716ab60ddd632b9fecf0a51b828d", "parents": [ "0131ba451e20239c5dc701027c1a2edef95e1a6e" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 04 15:55:25 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 04 15:59:53 2011 -0800" }, "message": "inetpeer: Move ICMP rate limiting state into inet_peer entries.\n\nLike metrics, the ICMP rate limiting bits are cached state about\na destination. So move it into the inet_peer entries.\n\nIf an inet_peer cannot be bound (the reason is memory allocation\nfailure or similar), the policy is to allow.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bd4a6974cc9090ef3851e5b0a2071e5383565c7c", "tree": "e96ef46426d293b730a305b5185ba5412c9172d4", "parents": [ "2b7bcebf958c74124220ee8103024def8597b36c", "1e6d93e45b231b3ae87c01902ede2315aacfe976" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 04 14:28:58 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 04 14:28:58 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "e2d57766e6744f2956975dd2086d82957187b0f6", "tree": "6d7f09ad6eaaac8ad99528cc83894faa6b230b1a", "parents": [ "ca6b8bb097c8e0ab6bce4fa04584074dee17c0d9" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 03 17:59:32 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 03 18:05:29 2011 -0800" }, "message": "net: Provide compat support for SIOCGETMIFCNT_IN6 and SIOCGETSGCNT_IN6.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bf36076a67db6d7423d09d861a072337866f0dd9", "tree": "39d1b95a07d47b69f0e807461427e74b8f340af9", "parents": [ "785e8cc39baf31d5c18a2d198ded03a003c9c190" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Mon Jan 31 20:54:17 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 31 20:54:17 2011 -0800" }, "message": "net: Fix ipv6 neighbour unregister_sysctl_table warning\n\nIn my testing of 2.6.37 I was occassionally getting a warning about\nsysctl table entries being unregistered in the wrong order. Digging\nin it turns out this dates back to the last great sysctl reorg done\nwhere Al Viro introduced the requirement that sysctl directories\nneeded to be created before and destroyed after the files in them.\n\nIt turns out that in that great reorg /proc/sys/net/ipv6/neigh was\noverlooked. So this patch fixes that oversight and makes an annoying\nwarning message go away.\n\n\u003e------------[ cut here ]------------\n\u003eWARNING: at kernel/sysctl.c:1992 unregister_sysctl_table+0x134/0x164()\n\u003ePid: 23951, comm: kworker/u:3 Not tainted 2.6.37-350888.2010AroraKernelBeta.fc14.x86_64 #1\n\u003eCall Trace:\n\u003e [\u003cffffffff8103e034\u003e] warn_slowpath_common+0x80/0x98\n\u003e [\u003cffffffff8103e061\u003e] warn_slowpath_null+0x15/0x17\n\u003e [\u003cffffffff810452f8\u003e] unregister_sysctl_table+0x134/0x164\n\u003e [\u003cffffffff810e7834\u003e] ? kfree+0xc4/0xd1\n\u003e [\u003cffffffff813439b2\u003e] neigh_sysctl_unregister+0x22/0x3a\n\u003e [\u003cffffffffa02cd14e\u003e] addrconf_ifdown+0x33f/0x37b [ipv6]\n\u003e [\u003cffffffff81331ec2\u003e] ? skb_dequeue+0x5f/0x6b\n\u003e [\u003cffffffffa02ce4a5\u003e] addrconf_notify+0x69b/0x75c [ipv6]\n\u003e [\u003cffffffffa02eb953\u003e] ? ip6mr_device_event+0x98/0xa9 [ipv6]\n\u003e [\u003cffffffff813d2413\u003e] notifier_call_chain+0x32/0x5e\n\u003e [\u003cffffffff8105bdea\u003e] raw_notifier_call_chain+0xf/0x11\n\u003e [\u003cffffffff8133cdac\u003e] call_netdevice_notifiers+0x45/0x4a\n\u003e [\u003cffffffff8133d2b0\u003e] rollback_registered_many+0x118/0x201\n\u003e [\u003cffffffff8133d3af\u003e] unregister_netdevice_many+0x16/0x6d\n\u003e [\u003cffffffff8133d571\u003e] default_device_exit_batch+0xa4/0xb8\n\u003e [\u003cffffffff81337c42\u003e] ? cleanup_net+0x0/0x194\n\u003e [\u003cffffffff81337a2a\u003e] ops_exit_list+0x4e/0x56\n\u003e [\u003cffffffff81337d36\u003e] cleanup_net+0xf4/0x194\n\u003e [\u003cffffffff81053318\u003e] process_one_work+0x187/0x280\n\u003e [\u003cffffffff8105441b\u003e] worker_thread+0xff/0x19f\n\u003e [\u003cffffffff8105431c\u003e] ? worker_thread+0x0/0x19f\n\u003e [\u003cffffffff8105776d\u003e] kthread+0x7d/0x85\n\u003e [\u003cffffffff81003824\u003e] kernel_thread_helper+0x4/0x10\n\u003e [\u003cffffffff810576f0\u003e] ? kthread+0x0/0x85\n\u003e [\u003cffffffff81003820\u003e] ? kernel_thread_helper+0x0/0x10\n\u003e---[ end trace 8a7e9310b35e9486 ]---\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ec831ea72ee5d7d473899e27a86bd659482c4d0d", "tree": "9bce912eff9cc0aaeb1f47659e99f1d6c9951f80", "parents": [ "c4c93106741bbf61ecd05a2a835af8e3bf31c1bd" ], "author": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Mon Jan 31 13:16:00 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 31 13:16:00 2011 -0800" }, "message": "net: Add default_mtu() methods to blackhole dst_ops\n\nWhen an IPSEC SA is still being set up, __xfrm_lookup() will return\n-EREMOTE and so ip_route_output_flow() will return a blackhole route.\nThis can happen in a sndmsg call, and after d33e455337ea (\"net: Abstract\ndefault MTU metric calculation behind an accessor.\") this leads to a\ncrash in ip_append_data() because the blackhole dst_ops have no\ndefault_mtu() method and so dst_mtu() calls a NULL pointer.\n\nFix this by adding default_mtu() methods (that simply return 0, matching\nthe old behavior) to the blackhole dst_ops.\n\nThe IPv4 part of this patch fixes a crash that I saw when using an IPSEC\nVPN; the IPv6 part is untested because I don\u0027t have an IPv6 VPN, but it\nlooks to be needed as well.\n\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "065825402c058f4a123ddc53dbbe864cc5caaf64", "tree": "7d0d5122a5315c5850a0b01ed7349e9eebf794e2", "parents": [ "1397e171f143878dd16ad5f8c99f7b9440cc8911" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 27 14:58:42 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 27 14:59:31 2011 -0800" }, "message": "net: Store ipv4/ipv6 COW\u0027d metrics in inetpeer cache.\n\nPlease note that the IPSEC dst entry metrics keep using\nthe generic metrics COW\u0027ing mechanism using kmalloc/kfree.\n\nThis gives the IPSEC routes an opportunity to use metrics\nwhich are unique to their encapsulated paths.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1397e171f143878dd16ad5f8c99f7b9440cc8911", "tree": "8aadcac291a2550028950bcaa5d8d0c0d6bedc45", "parents": [ "144001bddcb4db62c2261f1d703d835851031577", "8f2771f2b85aea4d0f9a0137ad3b63d1173c0962" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 27 14:59:08 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 27 14:59:08 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "8f2771f2b85aea4d0f9a0137ad3b63d1173c0962", "tree": "b632e0a811dee0637017d6f024e5efade412f0d1", "parents": [ "c2aa3665cf8510b1665ee2f5a9525cf7be6dec4f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 27 14:55:22 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 27 14:55:22 2011 -0800" }, "message": "ipv6: Remove route peer binding assertions.\n\nThey are bogus. The basic idea is that I wanted to make sure\nthat prefixed routes never bind to peers.\n\nThe test I used was whether RTF_CACHE was set.\n\nBut first of all, the RTF_CACHE flag is set at different spots\ndepending upon which ip6_rt_copy() caller you\u0027re talking about.\n\nI\u0027ve validated all of the code paths, and even in the future\nwhere we bind peers more aggressively (for route metric COW\u0027ing)\nwe never bind to prefix\u0027d routes, only fully specified ones.\nThis even applies when addrconf or icmp6 routes are allocated.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "62fa8a846d7de4b299232e330c74b7783539df76", "tree": "e401dbdbf4b11cbd27bdc3a47d9dc8b512173c9f", "parents": [ "b4e69ac670d71b5748dc81e536b2cb103489badd" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 26 20:51:05 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 26 20:51:05 2011 -0800" }, "message": "net: Implement read-only protection and COW\u0027ing of metrics.\n\nRouting metrics are now copy-on-write.\n\nInitially a route entry points it\u0027s metrics at a read-only location.\nIf a routing table entry exists, it will point there. Else it will\npoint at the all zero metric place-holder called \u0027dst_default_metrics\u0027.\n\nThe writeability state of the metrics is stored in the low bits of the\nmetrics pointer, we have two bits left to spare if we want to store\nmore states.\n\nFor the initial implementation, COW is implemented simply via kmalloc.\nHowever future enhancements will change this to place the writable\nmetrics somewhere else, in order to increase sharing. Very likely\nthis \"somewhere else\" will be the inetpeer cache.\n\nNote also that this means that metrics updates may transiently fail\nif we cannot COW the metrics successfully.\n\nBut even by itself, this patch should decrease memory usage and\nincrease cache locality especially for routing workloads. In those\ncases the read-only metric copies stay in place and never get written\nto.\n\nTCP workloads where metrics get updated, and those rare cases where\nPMTU triggers occur, will take a very slight performance hit. But\nthat hit will be alleviated when the long-term writable metrics\nmove to a more sharable location.\n\nSince the metrics storage went from a u32 array of RTAX_MAX entries to\nwhat is essentially a pointer, some retooling of the dst_entry layout\nwas necessary.\n\nMost importantly, we need to preserve the alignment of the reference\ncount so that it doesn\u0027t share cache lines with the read-mostly state,\nas per Eric Dumazet\u0027s alignment assertion checks.\n\nThe only non-trivial bit here is the move of the \u0027flags\u0027 member into\nthe writeable cacheline. This is OK since we are always accessing the\nflags around the same moment when we made a modification to the\nreference count.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b4e69ac670d71b5748dc81e536b2cb103489badd", "tree": "26a04ba5d950657132fd6acb4e0ef17d0bcabe93", "parents": [ "144ce879b057c760194d808c90826cd96308f423", "7cc2edb83447775a34ed3bf9d29d8295a434b523" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 26 13:49:30 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 26 13:49:30 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "7cc2edb83447775a34ed3bf9d29d8295a434b523", "tree": "cdcbae599c95d6902fcb29989c75810b08f04707", "parents": [ "34c92049ac15dcb731dc455d165b4c3c1df569cf" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 26 13:41:03 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 26 13:41:03 2011 -0800" }, "message": "xfrm6: Don\u0027t forget to propagate peer into ipsec route.\n\nLike ipv4, we have to propagate the ipv6 route peer into\nthe ipsec top-level route during instantiation.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "73a8bd74e2618990dbb218c3d82f53e60acd9af0", "tree": "6bc0dddddd6a5f76a6d0a6adb41d466814cbc023", "parents": [ "de0368d5fec7b9ef95228510f2edb79610beb448" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 23 23:27:15 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 25 12:49:08 2011 -0800" }, "message": "ipv6: Revert \u0027administrative down\u0027 address handling changes.\n\nThis reverts the following set of commits:\n\nd1ed113f1669390da9898da3beddcc058d938587 (\"ipv6: remove duplicate neigh_ifdown\")\n29ba5fed1bbd09c2cba890798c8f9eaab251401d (\"ipv6: don\u0027t flush routes when setting loopback down\")\n9d82ca98f71fd686ef2f3017c5e3e6a4871b6e46 (\"ipv6: fix missing in6_ifa_put in addrconf\")\n2de795707294972f6c34bae9de713e502c431296 (\"ipv6: addrconf: don\u0027t remove address state on ifdown if the address is being kept\")\n8595805aafc8b077e01804c9a3668e9aa3510e89 (\"IPv6: only notify protocols if address is compeletely gone\")\n27bdb2abcc5edb3526e25407b74bf17d1872c329 (\"IPv6: keep tentative addresses in hash table\")\n93fa159abe50d3c55c7f83622d3f5c09b6e06f4b (\"IPv6: keep route for tentative address\")\n8f37ada5b5f6bfb4d251a7f510f249cb855b77b3 (\"IPv6: fix race between cleanup and add/delete address\")\n84e8b803f1e16f3a2b8b80f80a63fa2f2f8a9be6 (\"IPv6: addrconf notify when address is unavailable\")\ndc2b99f71ef477a31020511876ab4403fb7c4420 (\"IPv6: keep permanent addresses on admin down\")\n\nbecause the core semantic change to ipv6 address handling on ifdown\nhas broken some things, in particular \"disable_ipv6\" sysctl handling.\n\nStephen has made several attempts to get things back in working order,\nbut nothing has restored disable_ipv6 fully yet.\n\nReported-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nTested-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d80bc0fd262ef840ed4e82593ad6416fa1ba3fc4", "tree": "3a6af0460cad71f1b2efa4acae895dfe2a52634a", "parents": [ "3dce38a02d6370dca690cd923619d4b00024b723" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 24 16:01:58 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 24 16:01:58 2011 -0800" }, "message": "ipv6: Always clone offlink routes.\n\nDo not handle PMTU vs. route lookup creation any differently\nwrt. offlink routes, always clone them.\n\nReported-by: PK \u003crunningdoglackey@yahoo.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "04ed3e741d0f133e02bed7fa5c98edba128f90e7", "tree": "3dde4ca8306e98536faa69bccf0e47a2549c088f", "parents": [ "57422dc530115e427dff464cc0a32bcd0efb5008" ], "author": { "name": "Michał Mirosław", "email": "mirq-linux@rere.qmqm.pl", "time": "Mon Jan 24 15:32:47 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 24 15:32:47 2011 -0800" }, "message": "net: change netdev-\u003efeatures to u32\n\nQuoting Ben Hutchings: we presumably won\u0027t be defining features that\ncan only be enabled on 64-bit architectures.\n\nOccurences found by `grep -r` on net/, drivers/net, include/\n\n[ Move features and vlan_features next to each other in\n struct netdev, as per Eric Dumazet\u0027s suggestion -DaveM ]\n\nSigned-off-by: Michał Mirosław \u003cmirq-linux@rere.qmqm.pl\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f2eda47df46f9953fc8a4fec820f34d539a8efbb", "tree": "3f4a745c93f44a0375d85c96b284bff5d3b4e640", "parents": [ "6193d2be290990b789021e06fa770ecb45319f2d" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Jan 20 07:37:53 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 20 16:59:34 2011 -0800" }, "message": "ipv6: raw: rcu annotations\n\nRemove sparse warnings, using a function typedef to be able to use __rcu\nannotation on mh_filter pointer.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "753ea8e96258d87be1951083b5c4a368524515f1", "tree": "60b07f927e558697a74e387b6ea6af6599d05ad9", "parents": [ "2ffa007eaa01cf5fedd6a71f7d43854339a831ee" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Jan 20 07:16:24 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 20 16:59:33 2011 -0800" }, "message": "net: ipv6: sit: fix rcu annotations\n\nFix minor __rcu annotations and remove sparse warnings\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bced94ed5efad836859d9426f37f48d46218e99a", "tree": "3e97c08c815faf8391517e2fc7ee74170145972c", "parents": [ "2f1e3176723d74ea2dd975e5be0ef6bb4fed2e2e" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Jan 20 21:00:38 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Jan 20 21:00:38 2011 +0100" }, "message": "netfilter: add a missing include in nf_conntrack_reasm.c\n\nAfter commit ae90bdeaeac6b (netfilter: fix compilation when conntrack is\ndisabled but tproxy is enabled) we have following warnings :\n\nnet/ipv6/netfilter/nf_conntrack_reasm.c:520:16: warning: symbol\n\u0027nf_ct_frag6_gather\u0027 was not declared. Should it be static?\nnet/ipv6/netfilter/nf_conntrack_reasm.c:591:6: warning: symbol\n\u0027nf_ct_frag6_output\u0027 was not declared. Should it be static?\nnet/ipv6/netfilter/nf_conntrack_reasm.c:612:5: warning: symbol\n\u0027nf_ct_frag6_init\u0027 was not declared. Should it be static?\nnet/ipv6/netfilter/nf_conntrack_reasm.c:640:6: warning: symbol\n\u0027nf_ct_frag6_cleanup\u0027 was not declared. Should it be static?\n\nFix this including net/netfilter/ipv6/nf_defrag_ipv6.h\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: KOVACS Krisztian \u003chidden@balabit.hu\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "1268afe676ee9431a229fc68a2efb0dad4d5852f", "tree": "c252b969a51bd97317415cfc3b6465441f1b8aec", "parents": [ "c56eb8fb6dccb83d9fe62fd4dc00c834de9bc470", "4580ccc04ddd8c17a470573a7fdb8def2e036dfa" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 19 20:25:45 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 19 20:25:45 2011 -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: (41 commits)\n sctp: user perfect name for Delayed SACK Timer option\n net: fix can_checksum_protocol() arguments swap\n Revert \"netlink: test for all flags of the NLM_F_DUMP composite\"\n gianfar: Fix misleading indentation in startup_gfar()\n net/irda/sh_irda: return to RX mode when TX error\n net offloading: Do not mask out NETIF_F_HW_VLAN_TX for vlan.\n USB CDC NCM: tx_fixup() race condition fix\n ns83820: Avoid bad pointer deref in ns83820_init_one().\n ipv6: Silence privacy extensions initialization\n bnx2x: Update bnx2x version to 1.62.00-4\n bnx2x: Fix AER setting for BCM57712\n bnx2x: Fix BCM84823 LED behavior\n bnx2x: Mark full duplex on some external PHYs\n bnx2x: Fix BCM8073/BCM8727 microcode loading\n bnx2x: LED fix for BCM8727 over BCM57712\n bnx2x: Common init will be executed only once after POR\n bnx2x: Swap BCM8073 PHY polarity if required\n iwlwifi: fix valid chain reading from EEPROM\n ath5k: fix locking in tx_complete_poll_work\n ath9k_hw: do PA offset calibration only on longcal interval\n ...\n" }, { "commit": "14f0290ba44de6ed435fea24bba26e7868421c66", "tree": "449d32e4848007e3edbcab14fa8e09fdc66608ed", "parents": [ "f5c88f56b35599ab9ff2d3398e0153e4cd4a4c82", "a5db219f4cf9f67995eabd53b81a1232c82f5852" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Wed Jan 19 23:51:37 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Wed Jan 19 23:51:37 2011 +0100" }, "message": "Merge branch \u0027master\u0027 of /repos/git/net-next-2.6\n" }, { "commit": "42b16b3fbb5ee4555f5dee6220f3ccaa6e1ebe47", "tree": "966c1266afca5dd0e59cace37f7cd49577bdf0e2", "parents": [ "f0940cee222790e6e995a23f25c4ffb23f939a24" ], "author": { "name": "Jesper Juhl", "email": "jj@chaosbits.net", "time": "Mon Jan 17 00:09:38 2011 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Jan 19 15:43:08 2011 +0100" }, "message": "Kill off warning: ‘inline’ is not at beginning of declaration\n\nFix a bunch of\n\twarning: ‘inline’ is not at beginning of declaration\nmessages when building a \u0027make allyesconfig\u0027 kernel with -Wextra.\n\nThese warnings are trivial to kill, yet rather annoying when building with\n-Wextra.\nThe more we can cut down on pointless crap like this the better (IMHO).\n\nA previous patch to do this for a \u0027allnoconfig\u0027 build has already been\nmerged. This just takes the cleanup a little further.\n\nSigned-off-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "a5db219f4cf9f67995eabd53b81a1232c82f5852", "tree": "5fffcb7ebd543b39468822963f9190fe6bf41bff", "parents": [ "c56eb8fb6dccb83d9fe62fd4dc00c834de9bc470", "ff76015f3bdfbc482c723cb4f2559cef84d178ca" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 18 16:28:31 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 18 16:28:31 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "2fdc1c8093255f9da877d7b9ce3f46c2098377dc", "tree": "aaf2ce878a25db10ce5509d5e9931d6e68184f06", "parents": [ "6aefc522a8680f7b5a794f14dc78d6eab1cfdc37" ], "author": { "name": "Romain Francoise", "email": "romain@orebokech.com", "time": "Mon Jan 17 07:59:18 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 18 16:13:49 2011 -0800" }, "message": "ipv6: Silence privacy extensions initialization\n\nWhen a network namespace is created (via CLONE_NEWNET), the loopback\ninterface is automatically added to the new namespace, triggering a\nprintk in ipv6_add_dev() if CONFIG_IPV6_PRIVACY is set.\n\nThis is problematic for applications which use CLONE_NEWNET as\npart of a sandbox, like Chromium\u0027s suid sandbox or recent versions of\nvsftpd. On a busy machine, it can lead to thousands of useless\n\"lo: Disabled Privacy Extensions\" messages appearing in dmesg.\n\nIt\u0027s easy enough to check the status of privacy extensions via the\nuse_tempaddr sysctl, so just removing the printk seems like the most\nsensible solution.\n\nSigned-off-by: Romain Francoise \u003cromain@orebokech.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d018b6f4f1539f3679fbdc2d02d58d09e76be84a", "tree": "317b9e04d8e7a73a4d07c69a5cb5455ec34f47e5", "parents": [ "18bce371ae09af6c20ee62c1092a4d1d0e84dd49", "0f73f2c5a3ebb957ee66718c903c17ed71a4fc2e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 14 13:25:30 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 14 13:25:30 2011 -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: (47 commits)\n GRETH: resolve SMP issues and other problems\n GRETH: handle frame error interrupts\n GRETH: avoid writing bad speed/duplex when setting transfer mode\n GRETH: fixed skb buffer memory leak on frame errors\n GRETH: GBit transmit descriptor handling optimization\n GRETH: fix opening/closing\n GRETH: added raw AMBA vendor/device number to match against.\n cassini: Fix build bustage on x86.\n e1000e: consistent use of Rx/Tx vs. RX/TX/rx/tx in comments/logs\n e1000e: update Copyright for 2011\n e1000: Avoid unhandled IRQ\n r8169: keep firmware in memory.\n netdev: tilepro: Use is_unicast_ether_addr helper\n etherdevice.h: Add is_unicast_ether_addr function\n ks8695net: Use default implementation of ethtool_ops::get_link\n ks8695net: Disable non-working ethtool operations\n USB CDC NCM: Don\u0027t deref NULL in cdc_ncm_rx_fixup() and don\u0027t use uninitialized variable.\n vxge: Remember to release firmware after upgrading firmware\n netdev: bfin_mac: Remove is_multicast_ether_addr use in netdev_for_each_mc_addr\n ipsec: update MAX_AH_AUTH_LEN to support sha512\n ...\n" }, { "commit": "008d23e4852d78bb2618f2035f8b2110b6a6b968", "tree": "81c88f744f6f3fc84132527c1ddc0b4da410c5e2", "parents": [ "8f685fbda43deccd130d192c9fcef1444649eaca", "bfc672dcf323877228682aff79dff8ecd9f30ff8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:05:56 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:05:56 2011 -0800" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)\n Documentation/trace/events.txt: Remove obsolete sched_signal_send.\n writeback: fix global_dirty_limits comment runtime -\u003e real-time\n ppc: fix comment typo singal -\u003e signal\n drivers: fix comment typo diable -\u003e disable.\n m68k: fix comment typo diable -\u003e disable.\n wireless: comment typo fix diable -\u003e disable.\n media: comment typo fix diable -\u003e disable.\n remove doc for obsolete dynamic-printk kernel-parameter\n remove extraneous \u0027is\u0027 from Documentation/iostats.txt\n Fix spelling milisec -\u003e ms in snd_ps3 module parameter description\n Fix spelling mistakes in comments\n Revert conflicting V4L changes\n i7core_edac: fix typos in comments\n mm/rmap.c: fix comment\n sound, ca0106: Fix assignment to \u0027channel\u0027.\n hrtimer: fix a typo in comment\n init/Kconfig: fix typo\n anon_inodes: fix wrong function name in comment\n fix comment typos concerning \"consistent\"\n poll: fix a typo in comment\n ...\n\nFix up trivial conflicts in:\n - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)\n - fs/ext4/ext4.h\n\nAlso fix missed \u0027diabled\u0027 typo in drivers/net/bnx2x/bnx2x.h while at it.\n" }, { "commit": "255d0dc34068a976550ce555e153c0bfcfec7cc6", "tree": "e936c3d55eaf144cbc4edf8f9332d8089719d0d4", "parents": [ "b017900aac4a158b9bf7ffdcb8a369a91115b3e4" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sat Dec 18 18:35:15 2010 +0100" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Thu Jan 13 12:05:12 2011 +0100" }, "message": "netfilter: x_table: speedup compat operations\n\nOne iptables invocation with 135000 rules takes 35 seconds of cpu time\non a recent server, using a 32bit distro and a 64bit kernel.\n\nWe eventually trigger NMI/RCU watchdog.\n\nINFO: rcu_sched_state detected stall on CPU 3 (t\u003d6000 jiffies)\n\nCOMPAT mode has quadratic behavior and consume 16 bytes of memory per\nrule.\n\nSwitch the xt_compat algos to use an array instead of list, and use a\nbinary search to locate an offset in the sorted array.\n\nThis halves memory need (8 bytes per rule), and removes quadratic\nbehavior [ O(N*N) -\u003e O(N*log2(N)) ]\n\nTime of iptables goes from 35 s to 150 ms.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "464143c911df98d4913932534485113a0a14aa74", "tree": "4df3953e3cbba8931b6305aa6d16981f1a93de6c", "parents": [ "bb1231052e265e960d902ab32e67c5ccdabc9434", "2fc72c7b84002ffb3c66918e2a7b0ee607d8b5aa" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 12 18:58:40 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 12 18:58:40 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of git://1984.lsi.us.es/net-2.6\n" } ], "next": "72b43d0898e97f588293b4a24b33c58c46633d81" }