)]}' { "log": [ { "commit": "27a429383b399fc0f68bea55c422d7179f3c8b05", "tree": "a38d2d38a7506e10cf4bd00a2b49273d82878fbf", "parents": [ "319d3b9c97b5e3191e419bb95496bf08ec50f096" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Jan 16 04:35:50 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 17 10:17:32 2012 -0500" }, "message": "bridge: BH already disabled in br_fdb_cleanup()\n\nbr_fdb_cleanup() is run from timer interrupt, BH already masked.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nCC: Štefan Gula \u003csteweg@gmail.com\u003e\nAcked-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "abb434cb0539fb355c1c921f8fd761efbbac3462", "tree": "24a7d99ec161f8fd4dc9ff03c9c4cc93be883ce6", "parents": [ "2494654d4890316e7340fb8b3458daad0474a1b9", "6350323ad8def2ac00d77cdee3b79c9b9fba75c4" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 23 17:13:56 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 23 17:13:56 2011 -0500" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nConflicts:\n\tnet/bluetooth/l2cap_core.c\n\nJust two overlapping changes, one added an initialization of\na local variable, and another change added a new local variable.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e688a604807647c9450f9c12a7cb6d027150a895", "tree": "6b3df826b4a42affdfc9d58d74f5e17c063cc7d6", "parents": [ "7838f2ce36b6ab5c13ef20b1857e3bbd567f1759" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Dec 22 04:15:53 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 22 22:34:56 2011 -0500" }, "message": "net: introduce DST_NOPEER dst flag\n\nChris Boot reported crashes occurring in ipv6_select_ident().\n\n[ 461.457562] RIP: 0010:[\u003cffffffff812dde61\u003e] [\u003cffffffff812dde61\u003e]\nipv6_select_ident+0x31/0xa7\n\n[ 461.578229] Call Trace:\n[ 461.580742] \u003cIRQ\u003e\n[ 461.582870] [\u003cffffffff812efa7f\u003e] ? udp6_ufo_fragment+0x124/0x1a2\n[ 461.589054] [\u003cffffffff812dbfe0\u003e] ? ipv6_gso_segment+0xc0/0x155\n[ 461.595140] [\u003cffffffff812700c6\u003e] ? skb_gso_segment+0x208/0x28b\n[ 461.601198] [\u003cffffffffa03f236b\u003e] ? ipv6_confirm+0x146/0x15e\n[nf_conntrack_ipv6]\n[ 461.608786] [\u003cffffffff81291c4d\u003e] ? nf_iterate+0x41/0x77\n[ 461.614227] [\u003cffffffff81271d64\u003e] ? dev_hard_start_xmit+0x357/0x543\n[ 461.620659] [\u003cffffffff81291cf6\u003e] ? nf_hook_slow+0x73/0x111\n[ 461.626440] [\u003cffffffffa0379745\u003e] ? br_parse_ip_options+0x19a/0x19a\n[bridge]\n[ 461.633581] [\u003cffffffff812722ff\u003e] ? dev_queue_xmit+0x3af/0x459\n[ 461.639577] [\u003cffffffffa03747d2\u003e] ? br_dev_queue_push_xmit+0x72/0x76\n[bridge]\n[ 461.646887] [\u003cffffffffa03791e3\u003e] ? br_nf_post_routing+0x17d/0x18f\n[bridge]\n[ 461.653997] [\u003cffffffff81291c4d\u003e] ? nf_iterate+0x41/0x77\n[ 461.659473] [\u003cffffffffa0374760\u003e] ? br_flood+0xfa/0xfa [bridge]\n[ 461.665485] [\u003cffffffff81291cf6\u003e] ? nf_hook_slow+0x73/0x111\n[ 461.671234] [\u003cffffffffa0374760\u003e] ? br_flood+0xfa/0xfa [bridge]\n[ 461.677299] [\u003cffffffffa0379215\u003e] ?\nnf_bridge_update_protocol+0x20/0x20 [bridge]\n[ 461.684891] [\u003cffffffffa03bb0e5\u003e] ? nf_ct_zone+0xa/0x17 [nf_conntrack]\n[ 461.691520] [\u003cffffffffa0374760\u003e] ? br_flood+0xfa/0xfa [bridge]\n[ 461.697572] [\u003cffffffffa0374812\u003e] ? NF_HOOK.constprop.8+0x3c/0x56\n[bridge]\n[ 461.704616] [\u003cffffffffa0379031\u003e] ?\nnf_bridge_push_encap_header+0x1c/0x26 [bridge]\n[ 461.712329] [\u003cffffffffa037929f\u003e] ? br_nf_forward_finish+0x8a/0x95\n[bridge]\n[ 461.719490] [\u003cffffffffa037900a\u003e] ?\nnf_bridge_pull_encap_header+0x1c/0x27 [bridge]\n[ 461.727223] [\u003cffffffffa0379974\u003e] ? br_nf_forward_ip+0x1c0/0x1d4 [bridge]\n[ 461.734292] [\u003cffffffff81291c4d\u003e] ? nf_iterate+0x41/0x77\n[ 461.739758] [\u003cffffffffa03748cc\u003e] ? __br_deliver+0xa0/0xa0 [bridge]\n[ 461.746203] [\u003cffffffff81291cf6\u003e] ? nf_hook_slow+0x73/0x111\n[ 461.751950] [\u003cffffffffa03748cc\u003e] ? __br_deliver+0xa0/0xa0 [bridge]\n[ 461.758378] [\u003cffffffffa037533a\u003e] ? NF_HOOK.constprop.4+0x56/0x56\n[bridge]\n\nThis is caused by bridge netfilter special dst_entry (fake_rtable), a\nspecial shared entry, where attaching an inetpeer makes no sense.\n\nProblem is present since commit 87c48fa3b46 (ipv6: make fragment\nidentifications less predictable)\n\nIntroduce DST_NOPEER dst flag and make sure ipv6_select_ident() and\n__ip_select_ident() fallback to the \u0027no peer attached\u0027 handling.\n\nReported-by: Chris Boot \u003cbootc@bootc.net\u003e\nTested-by: Chris Boot \u003cbootc@bootc.net\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a13861a28b90541aa207532d237e7a940f1b1c7b", "tree": "5e7b03bdd6774897662dfc4e7a4bff09324fd306", "parents": [ "b3b1b70e62a603f473619dbebc3b3d23f535e6f8" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Dec 21 20:00:32 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 22 22:34:56 2011 -0500" }, "message": "bridge: provide a mtu() method for fake_dst_ops\n\nCommit 618f9bc74a039da76 (net: Move mtu handling down to the protocol\ndepended handlers) forgot the bridge netfilter case, adding a NULL\ndereference in ip_fragment().\n\nReported-by: Chris Boot \u003cbootc@bootc.net\u003e\nCC: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e6373c4c0ecb3a944c34117a3daeac315d641b5f", "tree": "25f21dc82327c56474b0e894c832faef084c176b", "parents": [ "c0cd115667bcd23c2a31fe2114beaab3608de68c" ], "author": { "name": "Igor Maravić", "email": "igorm@etf.rs", "time": "Mon Dec 12 02:58:25 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 16 15:49:52 2011 -0500" }, "message": "net:bridge: use IS_ENABLED\n\nUse IS_ENABLED(CONFIG_FOO)\ninstead of defined(CONFIG_FOO) || defined (CONFIG_FOO_MODULE)\n\nSigned-off-by: Igor Maravić \u003cigorm@etf.rs\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "dfd56b8b38fff3586f36232db58e1e9f7885a605", "tree": "64c7142ebf4625939f68bd3603f1d37bacb20a73", "parents": [ "1ded132d4c3442aa3a619c94c245d7b5e0eb9731" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sat Dec 10 09:48:31 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Dec 11 18:25:16 2011 -0500" }, "message": "net: use IS_ENABLED(CONFIG_IPV6)\n\nInstead of testing defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "43598813386f6205edf3c21f1fe97f731ccb4f15", "tree": "e08befb899b76681fac2af8acb13150b0b74d44f", "parents": [ "31e8a49c161b00c648e960903512c9cbaee777b1" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Thu Dec 08 07:17:49 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 08 19:40:28 2011 -0500" }, "message": "bridge: add local MAC address to forwarding table (v2)\n\nIf user has configured a MAC address that is not one of the existing\nports of the bridge, then we need to add a special entry in the forwarding\ntable. This forwarding table entry has no outgoing port so it has to be\ntreated a little differently. The special entry is reported by the netlink\ninterface with ifindex of bridge, but ignored by the old interface since there\nis no usable way to put it in the ABI.\n\nReported-by: Koki Sanagi \u003csanagi.koki@jp.fujitsu.com\u003e\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "31e8a49c161b00c648e960903512c9cbaee777b1", "tree": "9c2097bc4583ca9d47922a120465b22789ac0acb", "parents": [ "f58ee4e1a28b68ad94130a747d676cbc6644dbd1" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Thu Dec 08 07:17:41 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 08 19:40:28 2011 -0500" }, "message": "bridge: rearrange fdb notifications (v2)\n\nPass bridge to fdb_notify so it can determine correct namespace based\non namespace of bridge rather than namespace of destination port.\nAlso makes next patch easier.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f58ee4e1a28b68ad94130a747d676cbc6644dbd1", "tree": "85f412fc18d4515bd844da0ca7dbaa23672041ea", "parents": [ "f33f1fccbf67b3d9b310a4b09114b7c670320ad4" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Tue Dec 06 13:02:24 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 08 19:40:28 2011 -0500" }, "message": "bridge: refactor fdb_notify\n\nMove fdb_notify outside of fdb_create. This fixes the problem\nthat notification of local entries are not flagged correctly.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2721745501a26d0dc3b88c0d2f3aa11471891388", "tree": "e9c09622b11ad7d9317b4b01824374a852867c28", "parents": [ "761965eab38d2cbc59c36e355c59609e3a04705a" ], "author": { "name": "David Miller", "email": "davem@davemloft.net", "time": "Fri Dec 02 16:52:08 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 05 15:20:19 2011 -0500" }, "message": "net: Rename dst_get_neighbour{, _raw} to dst_get_neighbour_noref{, _raw}.\n\nTo reflect the fact that a refrence is not obtained to the\nresulting neighbour entry.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "75f2811c6460ccc59d83c66059943ce9c9f81a18", "tree": "49373cf5f5b11358aeb587209ad270496f751609", "parents": [ "396cf9430505cfba529a2f2a037d782719fa5844" ], "author": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Wed Nov 30 17:05:51 2011 -0800" }, "committer": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Sat Dec 03 09:35:10 2011 -0800" }, "message": "ipv6: Add fragment reporting to ipv6_skip_exthdr().\n\nWhile parsing through IPv6 extension headers, fragment headers are\nskipped making them invisible to the caller. This reports the\nfragment offset of the last header in order to make it possible to\ndetermine whether the packet is fragmented and, if so whether it is\na first or last fragment.\n\nSigned-off-by: Jesse Gross \u003cjesse@nicira.com\u003e\n" }, { "commit": "b3613118eb30a589d971e4eccbbb2a1314f5dfd4", "tree": "868c1ee59e1b5c19a4f2e43716400d0001a994e5", "parents": [ "7505afe28c16a8d386624930a018d0052c75d687", "5983fe2b29df5885880d7fa3b91aca306c7564ef" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 02 13:49:21 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 02 13:49:21 2011 -0500" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n" }, { "commit": "b03b6dd58cef7d15b7c46a6729b83dd535ef08ab", "tree": "a193461397942346f330b782a200849feafa1991", "parents": [ "efbc368dcc6426d5430b9b8eeda944cf2cb74b8c" ], "author": { "name": "Vitalii Demianets", "email": "vitas@nppfactor.kiev.ua", "time": "Fri Nov 25 00:16:37 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 01 14:05:17 2011 -0500" }, "message": "bridge: master device stuck in no-carrier state forever when in user-stp mode\n\nWhen in user-stp mode, bridge master do not follow state of its slaves, so\nafter the following sequence of events it can stuck forever in no-carrier\nstate:\n1) turn stp off\n2) put all slaves down - master device will follow their state and also go in\nno-carrier state\n3) turn stp on with bridge-stp script returning 0 (go to the user-stp mode)\nNow bridge master won\u0027t follow slaves\u0027 state and will never reach running\nstate.\n\nThis patch solves the problem by making user-stp and kernel-stp behavior\nsimilar regarding master following slaves\u0027 states.\n\nSigned-off-by: Vitalii Demianets \u003cvitas@nppfactor.kiev.ua\u003e\nAcked-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4e3fd7a06dc20b2d8ec6892233ad2012968fe7b6", "tree": "da3fbec7672ac6b967dfa31cec6c88f468a57fa2", "parents": [ "40ba84993d66469d336099c5af74c3da5b73e28d" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Mon Nov 21 03:39:03 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 22 16:43:32 2011 -0500" }, "message": "net: remove ipv6_addr_copy()\n\nC assignment can handle struct in6_addr copying.\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "efd0bf97deeddd9ba53daabfc470a1399c6b0b2d", "tree": "eec56da5fbc796bac7c67f1990a18f5e0a304059", "parents": [ "f8a15af093b19b86d56933c8757cee298d0f32a8", "6fe4c6d466e95d31164f14b1ac4aefb51f0f4f82" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 21 13:50:33 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 21 13:50:33 2011 -0500" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nThe forcedeth changes had a conflict with the conversion over\nto atomic u64 statistics in net-next.\n\nThe libertas cfg.c code had a conflict with the bss reference\ncounting fix by John Linville in net-next.\n\nConflicts:\n\tdrivers/net/ethernet/nvidia/forcedeth.c\n\tdrivers/net/wireless/libertas/cfg.c\n" }, { "commit": "34324dc2bf27c1773045fea63cb11f7e2a6ad2b9", "tree": "47cd1f4ea5590c405dc60aee70b49fb14f56859b", "parents": [ "a861a8b233e9024303fb8e73e465e81ad7119d5a" ], "author": { "name": "Michał Mirosław", "email": "mirq-linux@rere.qmqm.pl", "time": "Tue Nov 15 15:29:55 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 16 17:43:12 2011 -0500" }, "message": "net: remove NETIF_F_NO_CSUM feature bit\n\nOnly distinct use is checking if NETIF_F_NOCACHE_COPY should be\nenabled by default. The check heuristics is altered a bit here,\nso it hits other people than before. The default shouldn\u0027t be\ntrusted for performance-critical cases anyway.\n\nFor all other uses NETIF_F_NO_CSUM is equivalent to NETIF_F_HW_CSUM.\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": "c8f44affb7244f2ac3e703cab13d55ede27621bb", "tree": "62e7aea2916a8d7cab825fe500670c5113854c0f", "parents": [ "a59e2ecb859f2ab03bb2e230709f8039472ad2c3" ], "author": { "name": "Michał Mirosław", "email": "mirq-linux@rere.qmqm.pl", "time": "Tue Nov 15 15:29:55 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 16 17:43:10 2011 -0500" }, "message": "net: introduce and use netdev_features_t for device features sets\n\nv2:\tadd couple missing conversions in drivers\n\tsplit unexporting netdev_fix_features()\n\timplemented %pNF\n\tconvert sock::sk_route_(no?)caps\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": "fa2da8cdae1dd64f78fc915ca1d1a4a93c71e7cb", "tree": "e1c89ec5c3e0d2bf279c6c9f1a427949c5286baf", "parents": [ "0284a0fdf3def1beb4de509f87472520b23883c9" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Tue Nov 15 08:09:14 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 16 17:32:43 2011 -0500" }, "message": "bridge: correct IPv6 checksum after pull\n\nBridge multicast snooping of ICMPv6 would incorrectly report a checksum problem\nwhen used with Ethernet devices like sky2 that use CHECKSUM_COMPLETE.\nWhen bytes are removed from skb, the computed checksum needs to be adjusted.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nTested-by: Martin Volf \u003cmartin.volf.42@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "292d1398983f3514a0eab13b7606df7f4730b498", "tree": "4d62bdf2fd88b56432d8b9ec38dcf31e3e2e2a47", "parents": [ "23020ab35364f2c91133b099c2b1f7458e29aa96" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Wed Nov 09 18:30:08 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 14 00:41:54 2011 -0500" }, "message": "bridge: add NTF_USE support\n\nMore changes to the recent code to support control of forwarding\ndatabase via netlink.\n * Support NTF_USE like neighbour table\n * Validate state bits from application\n * Only send notifications (and change bits) if new entry is\n different.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ef5e0d8237287db3a12d84f08fb2483d7a30a943", "tree": "788e6c6546b4e3af7b01e0863ef4f2d8808e50ef", "parents": [ "731abb9cb27aef6013ce60808a04e04a545f3f4e" ], "author": { "name": "Andrey Vagin", "email": "avagin@openvz.org", "time": "Thu Nov 10 05:48:03 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 14 00:38:53 2011 -0500" }, "message": "bridge: Fix potential deadlock on br-\u003emulticast_lock\n\nmulticast_lock is taken in softirq context, so we should use\nspin_lock_bh() in userspace.\n\ncall-chain in softirq context:\nrun_timer_softirq()\n\tbr_multicast_query_expired()\n\ncall-chain in userspace:\nsysfs_write_file()\n\tstore_multicast_snooping()\n\t\tbr_multicast_toggle()\n\nSigned-off-by: Andrew Vagin \u003cavagin@openvz.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "32aaeffbd4a7457bf2f7448b33b5946ff2a960eb", "tree": "faf7ad871d87176423ff9ed1d1ba4d9c688fc23f", "parents": [ "208bca0860406d16398145ddd950036a737c3c9d", "67b84999b1a8b1af5625b1eabe92146c5eb42932" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "message": "Merge branch \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\n* \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)\n Revert \"tracing: Include module.h in define_trace.h\"\n irq: don\u0027t put module.h into irq.h for tracking irqgen modules.\n bluetooth: macroize two small inlines to avoid module.h\n ip_vs.h: fix implicit use of module_get/module_put from module.h\n nf_conntrack.h: fix up fallout from implicit moduleparam.h presence\n include: replace linux/module.h with \"struct module\" wherever possible\n include: convert various register fcns to macros to avoid include chaining\n crypto.h: remove unused crypto_tfm_alg_modname() inline\n uwb.h: fix implicit use of asm/page.h for PAGE_SIZE\n pm_runtime.h: explicitly requires notifier.h\n linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h\n miscdevice.h: fix up implicit use of lists and types\n stop_machine.h: fix implicit use of smp.h for smp_processor_id\n of: fix implicit use of errno.h in include/linux/of.h\n of_platform.h: delete needless include \u003clinux/module.h\u003e\n acpi: remove module.h include from platform/aclinux.h\n miscdevice.h: delete unnecessary inclusion of module.h\n device_cgroup.h: delete needless include \u003clinux/module.h\u003e\n net: sch_generic remove redundant use of \u003clinux/module.h\u003e\n net: inet_timewait_sock doesnt need \u003clinux/module.h\u003e\n ...\n\nFix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in\n - drivers/media/dvb/frontends/dibx000_common.c\n - drivers/media/video/{mt9m111.c,ov6650.c}\n - drivers/mfd/ab3550-core.c\n - include/linux/dmaengine.h\n" }, { "commit": "0a9ee81349d90c6c85831f38118bf569c60a4d51", "tree": "37c5f232e594cbd222637c8ae44030749467190d", "parents": [ "40cb1f9bc52186a1a9ef56f0d976482863516ce1" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Mon Aug 29 14:17:25 2011 -0700" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue Nov 01 09:19:49 2011 +0100" }, "message": "netfilter: Remove unnecessary OOM logging messages\n\nSite specific OOM messages are duplications of a generic MM\nout of memory message and aren\u0027t really useful, so just\ndelete them.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "79bb1ee46ad1b76069108ca9b5467a3c14574744", "tree": "3295be3a365a31445fbf9cab10ef779537ac5de0", "parents": [ "bc3b2d7fb9b014d75ebb79ba371a763dbab5e8cf" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Aug 29 17:55:05 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:30:30 2011 -0400" }, "message": "net: fix implicit kmod.h usage in bridge/br_stp_if.c\n\nTo fix this, once the implicit presence of module.h is removed:\n\nnet/bridge/br_stp_if.c: In function ‘br_stp_start’:\nnet/bridge/br_stp_if.c:131: error: implicit declaration of function ‘call_usermodehelper’\nnet/bridge/br_stp_if.c:131: error: ‘UMH_WAIT_PROC’ undeclared (first use in this function)\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "bc3b2d7fb9b014d75ebb79ba371a763dbab5e8cf", "tree": "b0fd4e724bdb1c0a1783616614ae5a9dec1cfa5c", "parents": [ "d9b9384215e17c68d7b6bd05d6fa409e5d4140d7" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Fri Jul 15 11:47:34 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:30:30 2011 -0400" }, "message": "net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules\n\nThese files are non modular, but need to export symbols using\nthe macros now living in export.h -- call out the include so\nthat things won\u0027t break when we remove the implicit presence\nof module.h from everywhere.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "1805b2f04855f07afe3a71d620a68f483b0ed74f", "tree": "b823b90f37f5404fcaef70f785c70112ca74a329", "parents": [ "78d81d15b74246c7cedf84894434890b33da3907", "f42af6c486aa5ca6ee62800cb45c5b252020509d" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 24 18:18:09 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 24 18:18:09 2011 -0400" }, "message": "Merge branch \u0027master\u0027 of ra.kernel.org:/pub/scm/linux/kernel/git/davem/net\n" }, { "commit": "1ce5cce895309862d2c35d922816adebe094fe4a", "tree": "15e92f7f8f7a78843ec797bcd4b432979be111a7", "parents": [ "ae2a4583154a5b985ed4a81c6259c55bafe6d810" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Thu Oct 06 11:19:41 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 18 23:24:16 2011 -0400" }, "message": "bridge: fix hang on removal of bridge via netlink\n\nNeed to cleanup bridge device timers and ports when being bridge\ndevice is being removed via netlink.\n\nThis fixes the problem of observed when doing:\n ip link add br0 type bridge\n ip link set dev eth1 master br0\n ip link set br0 up\n ip link del br0\n\nwhich would cause br0 to hang in unregister_netdev because\nof leftover reference count.\n\nReported-by: Sridhar Samudrala \u003csri@us.ibm.com\u003e\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nAcked-by: Sridhar Samudrala \u003csri@us.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "88c5100c28b02c4b2b2c6f6fafbbd76d90f698b9", "tree": "08c4399e0341f7eb0ccb24e15f2cab687275c2a4", "parents": [ "8083f0fc969d9b5353061a7a6f963405057e26b1", "3ee72ca99288f1de95ec9c570e43f531c8799f06" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Oct 07 13:38:43 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Oct 07 13:38:43 2011 -0400" }, "message": "Merge branch \u0027master\u0027 of github.com:davem330/net\n\nConflicts:\n\tnet/batman-adv/soft-interface.c\n" }, { "commit": "515853ccecc6987dfb8ed809dd8bf8900286f29e", "tree": "ddd361a7bacb3d37a95f6101ef541af91c01d9ba", "parents": [ "45b58465acaa9d98354e7fa730e3172c5355da06" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Mon Oct 03 18:14:46 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 06 15:27:56 2011 -0400" }, "message": "bridge: allow forwarding some link local frames\n\nThis is based on an earlier patch by Nick Carter with comments\nby David Lamparter but with some refinements. Thanks for their patience\nthis is a confusing area with overlap of standards, user requirements,\nand compatibility with earlier releases.\n\nIt adds a new sysfs attribute\n /sys/class/net/brX/bridge/group_fwd_mask\nthat controls forwarding of frames with address of: 01-80-C2-00-00-0X\nThe default setting has no forwarding to retain compatibility.\n\nOne change from earlier releases is that forwarding of group\naddresses is not dependent on STP being enabled or disabled. This\nchoice was made based on interpretation of tie 802.1 standards.\nI expect complaints will arise because of this, but better to follow\nthe standard than continue acting incorrectly by default.\n\nThe filtering mask is writeable, but only values that don\u0027t forward\nknown control frames are allowed. It intentionally blocks attempts\nto filter control protocols. For example: writing a 8 allows\nforwarding 802.1X PAE addresses which is the most common request.\n\nReported-by: David Lamparter \u003cequinox@diac24.net\u003e\nOriginal-patch-by: Nick Carter \u003cncarter100@gmail.com\u003e\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nTested-by: Benjamin Poirier \u003cbenjamin.poirier@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b64b73d7d0c480f75684519c6134e79d50c1b341", "tree": "4b8ecae0723a6149a0831fdcd7db9874e82fe8af", "parents": [ "3458e21c0d384ca04b27a2ea24d9314c1b57530f" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Mon Oct 03 18:14:45 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 06 15:26:50 2011 -0400" }, "message": "bridge: leave carrier on for empty bridge\n\nThis resolves a regression seen by some users of bridging.\nSome users use the bridge like a dummy device.\nThey expect to be able to put an IPv6 address on the device\nwith no ports attached. Although there are better ways of doing\nthis, there is no reason to not allow it.\n\nNote: the bridge still will reflect the state of ports in the\nbridge if there are any added.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "64af1bac9b979ae1f2f052742fda06d65f497643", "tree": "bcd4b0063382a5b9da64fb2e19af4ec0bfd98516", "parents": [ "77f9859837cbe262ef2aa12fc38d18458814c2ca" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Fri Sep 30 14:37:27 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 03 12:17:33 2011 -0400" }, "message": "bridge: allow updating existing fdb entries\n\nNeed to allow application to update existing fdb entries that already\nexist. This makes bridge netlink neighbor API have same flags and\nsemantics as ip neighbor table.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "77f9859837cbe262ef2aa12fc38d18458814c2ca", "tree": "51653355c4a333e63551c58934629881bb0856a2", "parents": [ "3de09455cfcde1898fb435ad425b9ad5d13ed362" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Fri Sep 30 14:37:26 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 03 12:17:33 2011 -0400" }, "message": "bridge: fix ordering of NEWLINK and NEWNEIGH events\n\nWhen port is added to a bridge, the old code would send the new neighbor\nnetlink message before the subsequent new link message. This bug makes\nit difficult to use the monitoring API in an application.\n\nThis code changes the ordering to add the forwarding entry\nafter the port is setup. One of the error checks (for invalid address)\nis moved earlier in the process to avoid having to do unwind.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8decf868790b48a727d7e7ca164f2bcd3c1389c0", "tree": "b759a5f861f842af7ea76f9011b579d06e9d5508", "parents": [ "3fc72370186be2f9d4d6ef06d99e1caa5d92c564", "d93dc5c4478c1fd5de85a3e8aece9aad7bbae044" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 22 03:23:13 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 22 03:23:13 2011 -0400" }, "message": "Merge branch \u0027master\u0027 of github.com:davem330/net\n\nConflicts:\n\tMAINTAINERS\n\tdrivers/net/Kconfig\n\tdrivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c\n\tdrivers/net/ethernet/broadcom/tg3.c\n\tdrivers/net/wireless/iwlwifi/iwl-pci.c\n\tdrivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c\n\tdrivers/net/wireless/rt2x00/rt2800usb.c\n\tdrivers/net/wireless/wl12xx/main.c\n" }, { "commit": "4bc71cb983fd2844e603bf633df2bb53385182d2", "tree": "067b6df32fda6c554b2b9263a94a585c2e5a832d", "parents": [ "c5dac7c9984d8a034eb7ae149cedf23ec9259f98" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Sat Sep 03 03:34:30 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 15 17:32:26 2011 -0400" }, "message": "net: consolidate and fix ethtool_ops-\u003eget_settings calling\n\nThis patch does several things:\n- introduces __ethtool_get_settings which is called from ethtool code and\n from drivers as well. Put ASSERT_RTNL there.\n- dev_ethtool_get_settings() is replaced by __ethtool_get_settings()\n- changes calling in drivers so rtnl locking is respected. In\n iboe_get_rate was previously -\u003eget_settings() called unlocked. This\n fixes it. Also prb_calc_retire_blk_tmo() in af_packet.c had the same\n problem. Also fixed by calling __dev_get_by_index() instead of\n dev_get_by_index() and holding rtnl_lock for both calls.\n- introduces rtnl_lock in bnx2fc_vport_create() and fcoe_vport_create()\n so bnx2fc_if_create() and fcoe_if_create() are called locked as they\n are from other places.\n- use __ethtool_get_settings() in bonding code\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\n\nv2-\u003ev3:\n\t-removed dev_ethtool_get_settings()\n\t-added ASSERT_RTNL into __ethtool_get_settings()\n\t-prb_calc_retire_blk_tmo - use __dev_get_by_index() and lock\n\t around it and __ethtool_get_settings() call\nv1-\u003ev2:\n add missing export_symbol\nReviewed-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e [except FCoE bits]\nAcked-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fa3df928e0878350ab0ddd1453bb85b056c726da", "tree": "b2dc6f573420f56300fa65bcd6fba85af617f3b4", "parents": [ "e8aaebc6b2a9c36dd9705adcb8f10d14b3d33f75" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Thu Sep 01 03:29:38 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 15 15:36:34 2011 -0400" }, "message": "br: remove redundant check and init\n\nSince these checks and initialization are done in\ndev_ethtool_get_settings called later on, remove this redundancy.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nAcked-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "785824165508a65478474f0c87f6b8c3ad048c62", "tree": "2b3ef81b4439cf682638aa504e29f37ef2b6da96", "parents": [ "ec0506dbe4e240ecd4c32bf74c84a88ce1ddb414", "768b1031dc9f3eabe3e9f603e33617a0215c12a8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 30 17:43:56 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 30 17:43:56 2011 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6\n" }, { "commit": "22df13319d1fec30b8f9bcaadc295829647109bb", "tree": "b61441ea39ac3c525746bfe8aaab9b6b5f9c6c63", "parents": [ "4b275d7efa1c4412f0d572fcd7f78ed0919370b3" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Aug 23 19:57:05 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 24 17:49:24 2011 -0700" }, "message": "bridge: fix a possible use after free\n\nbr_multicast_ipv6_rcv() can call pskb_trim_rcsum() and therefore skb\nhead can be reallocated.\n\nCache icmp6_type field instead of dereferencing twice the struct\nicmp6hdr pointer.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4b275d7efa1c4412f0d572fcd7f78ed0919370b3", "tree": "79affe03339b4b3815043ae9ebe572264ec52667", "parents": [ "e05c4ad3ed874ee4f5e2c969e55d318ec654332c" ], "author": { "name": "Yan, Zheng", "email": "zheng.z.yan@intel.com", "time": "Tue Aug 23 22:54:33 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 24 17:49:00 2011 -0700" }, "message": "bridge: Pseudo-header required for the checksum of ICMPv6\n\nChecksum of ICMPv6 is not properly computed because the pseudo header is not used.\nThus, the MLD packet gets dropped by the bridge.\n\nSigned-off-by: Zheng Yan \u003czheng.z.yan@intel.com\u003e\nReported-by: Ang Way Chuang \u003cwcang@sfc.wide.ad.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "11f3a6bdc2528d1ce2af50202dbf7138fdee1b34", "tree": "69ee1b19bd869600b0f0898986dd5e4b34d299c6", "parents": [ "832d80aceaab995c347d62abf7c241fc3e2eb0ce" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Aug 22 06:05:59 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 22 16:49:56 2011 -0700" }, "message": "bridge: fix a possible net_device leak\n\nJan Beulich reported a possible net_device leak in bridge code after\ncommit bb900b27a2f4 (bridge: allow creating bridge devices with netlink)\n\nReported-by: Jan Beulich \u003cJBeulich@novell.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "823dcd2506fa369aeb8cbd26da5663efe2fda9a9", "tree": "853b3e3c05f0b9ee1b5df8464db19b7acc57150c", "parents": [ "eaa36660de7e174498618d69d7277d44a2f24c3d", "98e77438aed3cd3343cbb86825127b1d9d2bea33" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 20 10:39:12 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 20 10:39:12 2011 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net\n" }, { "commit": "afc4b13df143122f99a0eb10bfefb216c2806de0", "tree": "5a90e0a8226ce4173d8d366f5bed0322c9623cdd", "parents": [ "01789349ee52e4a3faf376f1485303d9723c4f1f" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Tue Aug 16 06:29:01 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 17 20:22:03 2011 -0700" }, "message": "net: remove use of ndo_set_multicast_list in drivers\n\nreplace it by ndo_set_rx_mode\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5189054dd7ff18576446edc270b6b69fa8285336", "tree": "6b6e8d9497e3fa636f377a09329f446067da447c", "parents": [ "94a80d63b245c66745c1d72b8154f67b597e3b89" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Thu Aug 11 01:59:38 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 11 05:52:57 2011 -0700" }, "message": "net/bridge/netfilter/ebtables.c: use available error handling code\n\nFree the locally allocated table and newinfo as done in adjacent error\nhandling code.\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9be6dd6510fde5cfa2ab73f238754d38ee6797bc", "tree": "f64f94d8765e0a679ad4976dae4e16796e0324cb", "parents": [ "8028837d71ba9904b17281b40f94b93e947fbe38" ], "author": { "name": "Andrei Warkentin", "email": "andreiw@motorola.com", "time": "Fri Aug 05 11:04:10 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 09 21:44:44 2011 -0700" }, "message": "Bridge: Always send NETDEV_CHANGEADDR up on br MAC change.\n\nThis ensures the neighbor entries associated with the bridge\ndev are flushed, also invalidating the associated cached L2 headers.\n\nThis means we br_add_if/br_del_if ports to implement hand-over and\nnot wind up with bridge packets going out with stale MAC.\n\nThis means we can also change MAC of port device and also not wind\nup with bridge packets going out with stale MAC.\n\nThis builds on Stephen Hemminger\u0027s patch, also handling the br_del_if\ncase and the port MAC change case.\n\nCc: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: Andrei Warkentin \u003candreiw@motorola.com\u003e\nAcked-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a9b3cd7f323b2e57593e7215362a7b02fc933e3a", "tree": "eba1741956aef3015d5b1a07253bf93c4c1bc7df", "parents": [ "76f793e3a47139d340185cbc1a314740c09b13d3" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Mon Aug 01 16:19:00 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 02 04:29:23 2011 -0700" }, "message": "rcu: convert uses of rcu_assign_pointer(x, NULL) to RCU_INIT_POINTER\n\nWhen assigning a NULL value to an RCU protected pointer, no barrier\nis needed. The rcu_assign_pointer, used to handle that but will soon\nchange to not handle the special case.\n\nConvert all rcu_assign_pointer of NULL value.\n\n//smpl\n@@ expression P; @@\n\n- rcu_assign_pointer(P, NULL)\n+ RCU_INIT_POINTER(P, NULL)\n\n// \u003c/smpl\u003e\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nAcked-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9823d9ff483af4ce8804a9eb69600ca739cd1f58", "tree": "15da201362c5f5a748442a73f5569d709f66d75a", "parents": [ "91c66c6893a3e2bb8a88a30cb76007d5d49d32c9" ], "author": { "name": "Bart De Schuymer", "email": "bdschuym@pandora.be", "time": "Fri Jul 29 16:40:30 2011 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jul 29 16:40:30 2011 +0200" }, "message": "netfilter: ebtables: fix ebtables build dependency\n\nThe configuration of ebtables shouldn\u0027t depend on\nCONFIG_BRIDGE_NETFILTER, only on CONFIG_NETFILTER.\n\nReported-by: Sébastien Laveze \u003cslaveze@gmail.com\u003e\nSigned-off-by: Bart De Schuymer \u003cbdschuym@pandora.be\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "60063497a95e716c9a689af3be2687d261f115b4", "tree": "6ce0d68db76982c53df46aee5f29f944ebf2c320", "parents": [ "148817ba092f9f6edd35bad3c6c6b8e8f90fe2ed" ], "author": { "name": "Arun Sharma", "email": "asharma@fb.com", "time": "Tue Jul 26 16:09:06 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 16:49:47 2011 -0700" }, "message": "atomic: use \u003clinux/atomic.h\u003e\n\nThis allows us to move duplicated code in \u003casm/atomic.h\u003e\n(atomic_inc_not_zero() for now) to \u003clinux/atomic.h\u003e\n\nSigned-off-by: Arun Sharma \u003casharma@fb.com\u003e\nReviewed-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d3ec4844d449cf7af9e749f73ba2052fb7b72fc2", "tree": "c515913e85f7e50878c83da2a88bc5a7269d087c", "parents": [ "0003230e8200699860f0b10af524dc47bf8aecad", "df2e301fee3c2c2a87592151397ad7699bb14c37" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 25 13:56:39 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 25 13:56:39 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: (43 commits)\n fs: Merge split strings\n treewide: fix potentially dangerous trailing \u0027;\u0027 in #defined values/expressions\n uwb: Fix misspelling of neighbourhood in comment\n net, netfilter: Remove redundant goto in ebt_ulog_packet\n trivial: don\u0027t touch files that are removed in the staging tree\n lib/vsprintf: replace link to Draft by final RFC number\n doc: Kconfig: `to be\u0027 -\u003e `be\u0027\n doc: Kconfig: Typo: square -\u003e squared\n doc: Konfig: Documentation/power/{pm \u003d\u003e apm-acpi}.txt\n drivers/net: static should be at beginning of declaration\n drivers/media: static should be at beginning of declaration\n drivers/i2c: static should be at beginning of declaration\n XTENSA: static should be at beginning of declaration\n SH: static should be at beginning of declaration\n MIPS: static should be at beginning of declaration\n ARM: static should be at beginning of declaration\n rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check\n Update my e-mail address\n PCIe ASPM: forcedly -\u003e forcibly\n gma500: push through device driver tree\n ...\n\nFix up trivial conflicts:\n - arch/arm/mach-ep93xx/dma-m2p.c (deleted)\n - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)\n - drivers/net/r8169.c (just context changes)\n" }, { "commit": "160d73b8455edb1a12967e207790b1a93a4cb0e1", "tree": "adba1755432a81fd4d258ecdeb2207d94e36be03", "parents": [ "4ecb961c8b474ebef5aff55f715c7875e69dd57b" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Fri Jul 22 07:47:10 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 22 17:01:13 2011 -0700" }, "message": "bridge: minor cleanups\n\nSome minor cleanups that won\u0027t impact code:\n 1. Remove inline from non-critical functions; compiler will most\n likely inline them anyway.\n 2. Make function args const where possible.\n 3. Whitespace cleanup\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4ecb961c8b474ebef5aff55f715c7875e69dd57b", "tree": "32aff0d005ed0f5c810fc41a711e64ee6afae937", "parents": [ "56139fc5bd6e740706993ab3ad0d0aeff69a8479" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Fri Jul 22 07:47:09 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 22 17:01:12 2011 -0700" }, "message": "bridge: add notification over netlink when STP changes state\n\nWhen STP changes state of interface need to send a new link\nmessage to reflect that change.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "56139fc5bd6e740706993ab3ad0d0aeff69a8479", "tree": "65ce11b7198f8cbece5e8ccd05bfb47b4e0fc0af", "parents": [ "0652cac22ce3fa0c90e35d0a2862969fc394cb02" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Fri Jul 22 07:47:08 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 22 17:01:12 2011 -0700" }, "message": "bridge: notifier called with the wrong device\n\nIf a new device is added to a bridge, the ethernet address of the\nbridge network device may change. When the address changes, the\nappropriate callback is called, but with the wrong device argument.\nThe address of the bridge device (ie br0) changes not the address\nof the device being passed to add_if (ie eth0).\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0652cac22ce3fa0c90e35d0a2862969fc394cb02", "tree": "cb4aa33271758c13924999dd43fc32664f212b1b", "parents": [ "0c03150e7ea8f7fcd03cfef29385e0010b22ee92" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Fri Jul 22 07:47:07 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 22 17:01:12 2011 -0700" }, "message": "bridge: ignore bogus STP config packets\n\nIf the message_age is already greater than the max_age, then the\nBPDU is bogus. Linux won\u0027t generate BPDU, but conformance tester\nor buggy implementation might.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0c03150e7ea8f7fcd03cfef29385e0010b22ee92", "tree": "60dae3c582863b79df992a605c18a0029469b67b", "parents": [ "781223a15c510b4cb11328603bfc41ec8352f015" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Fri Jul 22 07:47:06 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 22 17:01:12 2011 -0700" }, "message": "bridge: send proper message_age in config BPDU\n\nA bridge topology with three systems:\n\n +------+ +------+\n | A(2) |--| B(1) |\n +------+ +------+\n \\ /\n +------+\n | C(3) |\n +------+\n\nWhat is supposed to happen:\n * bridge with the lowest ID is elected root (for example: B)\n * C detects that A-\u003eC is higher cost path and puts in blocking state\n\nWhat happens. Bridge with lowest id (B) is elected correctly as\nroot and things start out fine initially. But then config BPDU\ndoesn\u0027t get transmitted from A -\u003e C. Because of that\nthe link from A-C is transistioned to the forwarding state.\n\nThe root cause of this is that the configuration messages\nis generated with bogus message age, and dropped before\nsending.\n\nIn the standardmessage_age is supposed to be:\n the time since the generation of the Configuration BPDU by\n the Root that instigated the generation of this Configuration BPDU.\n\nReimplement this by recording the timestamp (age + jiffies) when\nrecording config information. The old code incorrectly used the time\nelapsed on the ageing timer which was incorrect.\n\nSee also:\n https://bugzilla.vyatta.com/show_bug.cgi?id\u003d7164\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f0da7ee410e63a1521af734c3970acc1470e8c50", "tree": "b88bcd8e857d9910fd5609604c2ccd07fd5e3a33", "parents": [ "9b42f06517ae19d6519e9c54eac5ea58d00f3028" ], "author": { "name": "Jesper Juhl", "email": "jj@chaosbits.net", "time": "Sun Jul 17 19:56:38 2011 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Thu Jul 21 14:02:17 2011 +0200" }, "message": "net, netfilter: Remove redundant goto in ebt_ulog_packet\n\nIn net/bridge/netfilter/ebt_ulog.c:ebt_ulog_packet() the \u0027goto unlock\u0027\nbefore the \u0027alloc_failure\u0027 label is completely redundant. This patch\nremoves it.\n\nSigned-off-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "d3aaeb38c40e5a6c08dd31a1b64da65c4352be36", "tree": "1c17b41d11edc7a7b3477a294cba440f2a14796c", "parents": [ "69cce1d1404968f78b177a0314f5822d5afdbbfb" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 18 00:40:17 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 18 00:40:17 2011 -0700" }, "message": "net: Add -\u003eneigh_lookup() operation to dst_ops\n\nIn the future dst entries will be neigh-less. In that environment we\nneed to have an easy transition point for current users of\ndst-\u003eneighbour outside of the packet output fast path.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "69cce1d1404968f78b177a0314f5822d5afdbbfb", "tree": "26223264fd69ea8078d0013fd5a76eb7aeb04c12", "parents": [ "9cbb7ecbcff85077bb12301aaf4c9b5a56c5993d" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 17 23:09:49 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 17 23:11:35 2011 -0700" }, "message": "net: Abstract dst-\u003eneighbour accesses behind helpers.\n\ndst_{get,set}_neighbour()\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8f40b161de4f27402b4c0659ad2ae83fad5a0cdd", "tree": "9e2dbd4ba8a66916c690b0e5791ac25ea0958c26", "parents": [ "69ecca86da4890c13a5e29c51b4ac76a1a8a62c9" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 17 13:34:11 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 17 23:11:17 2011 -0700" }, "message": "neigh: Pass neighbour entry to output ops.\n\nThis will get us closer to being able to do \"neigh stuff\"\ncompletely independent of the underlying dst_entry for\nprotocols (ipv4/ipv6) that wish to do so.\n\nWe will also be able to make dst entries neigh-less.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f6b72b6217f8c24f2a54988e58af858b4e66024d", "tree": "c59d5adcf9bb226db6f602c5078106052524cfea", "parents": [ "390fd0b388e4f85549e5d60bdeb21364b344d9b9" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 14 07:53:20 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 14 07:53:20 2011 -0700" }, "message": "net: Embed hh_cache inside of struct neighbour.\n\nNow that there is a one-to-one correspondance between neighbour\nand hh_cache entries, we no longer need:\n\n1) dynamic allocation\n2) attachment to dst-\u003ehh\n3) refcounting\n\nInitialization of the hh_cache entry is indicated by hh_len\nbeing non-zero, and such initialization is always done with\nthe neighbour\u0027s lock held as a writer.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e12fe68ce34d60c04bb1ddb1d3cc5c3022388fe4", "tree": "83c0e192ccaa4752c80b6131a7d0aa8272b5d0d0", "parents": [ "7329f0d58de01878d9ce4f0be7a76e136f223eef", "712ae51afd55b20c04c5383d02ba5d10233313b1" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jul 05 23:23:37 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jul 05 23:23:37 2011 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "44661462ee1ee3c922754fc1f246867f0d01e7ea", "tree": "e0a040be7f73d3929d45e975ca0eef7025f8f93f", "parents": [ "9b9cfe7cf663c16c0d93349cc0094bb28ae7135a" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Jul 05 13:58:33 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jul 05 18:39:39 2011 -0700" }, "message": "bridge: Always flood broadcast packets\n\nAs is_multicast_ether_addr returns true on broadcast packets as\nwell, we need to explicitly exclude broadcast packets so that\nthey\u0027re always flooded. This wasn\u0027t an issue before as broadcast\npackets were considered to be an unregistered multicast group,\nwhich were always flooded. However, as we now only flood such\npackets to router ports, this is no longer acceptable.\n\nReported-by: Michael Guntsche \u003cmike@it-loops.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bd4265fe365c0f3945dd5ff1527e52bbe2bedfa2", "tree": "462be6140e8ef35ae3797d31d365df08b01f9b16", "parents": [ "b997d79a91f7b6be952b98cf9d9585b124558f5b" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Jun 23 02:39:12 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 24 17:52:51 2011 -0700" }, "message": "bridge: Only flood unregistered groups to routers\n\nThe bridge currently floods packets to groups that we have never\nseen before to all ports. This is not required by RFC4541 and\nin fact it is not desirable in environment where traffic to\nunregistered group is always present.\n\nThis patch changes the behaviour so that we only send traffic\nto unregistered groups to ports marked as routers.\n\nThe user can always force flooding behaviour to any given port\nby marking it as a router.\n\nNote that this change does not apply to traffic to 224.0.0.X\nas traffic to those groups must always be flooded to all ports.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9f6ec8d697c08963d83880ccd35c13c5ace716ea", "tree": "ad8d93cf6fcdd09b86ade09f5fcbbc66cdb1cca2", "parents": [ "4aa3a715551c93eda32d79bd52042ce500bd5383", "56299378726d5f2ba8d3c8cbbd13cb280ba45e4f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 20 22:29:08 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 20 22:29:08 2011 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/wireless/iwlwifi/iwl-agn-rxon.c\n\tdrivers/net/wireless/rtlwifi/pci.c\n\tnet/netfilter/ipvs/ip_vs_core.c\n" }, { "commit": "cefa9993f161c1c2b6b91b7ea2e84a9bfbd43d2e", "tree": "ea1a587dd6a87e2c8c5ea84855ca068484fecdf5", "parents": [ "9aa3c94ce59066f545521033007abb6441706068" ], "author": { "name": "WANG Cong", "email": "amwang@redhat.com", "time": "Sun Jun 19 16:13:01 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jun 19 16:13:01 2011 -0700" }, "message": "netpoll: copy dev name of slaves to struct netpoll\n\nOtherwise we will not see the name of the slave dev in error\nmessage:\n\n[ 388.469446] (null): doesn\u0027t support polling, aborting.\n\nSigned-off-by: WANG Cong \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fc2af6c73fc9449cd5894a36bb76b8f8c0e49fd8", "tree": "f2013b06d5c6c049529598477e15584a1e77c342", "parents": [ "62b2bcb49cca72f6d3f39f831127a6ab315a475d" ], "author": { "name": "Fernando Luis Vázquez Cao", "email": "fernando@oss.ntt.co.jp", "time": "Mon Jun 13 15:06:58 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@conan.davemloft.net", "time": "Thu Jun 16 23:14:13 2011 -0400" }, "message": "IGMP snooping: set mrouters_only flag for IPv6 traffic properly\n\nUpon reception of a MGM report packet the kernel sets the mrouters_only flag\nin a skb that is a clone of the original skb, which means that the bridge\nloses track of MGM packets (cb buffers are tied to a specific skb and not\nshared) and it ends up forwading join requests to the bridge interface.\n\nThis can cause unexpected membership timeouts and intermitent/permanent loss\nof connectivity as described in RFC 4541 [2.1.1. IGMP Forwarding Rules]:\n\n A snooping switch should forward IGMP Membership Reports only to\n those ports where multicast routers are attached.\n [...]\n Sending membership reports to other hosts can result, for IGMPv1\n and IGMPv2, in unintentionally preventing a host from joining a\n specific multicast group.\n\nSigned-off-by: Fernando Luis Vazquez Cao \u003cfernando@oss.ntt.co.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@conan.davemloft.net\u003e\n" }, { "commit": "62b2bcb49cca72f6d3f39f831127a6ab315a475d", "tree": "edb756747c2fcabb74d8422a7adb84e3a7bb3386", "parents": [ "d40261236e8e278cb1936cb5e934262971692b10" ], "author": { "name": "Fernando Luis Vázquez Cao", "email": "fernando@oss.ntt.co.jp", "time": "Mon Jun 13 15:04:43 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@conan.davemloft.net", "time": "Thu Jun 16 23:14:12 2011 -0400" }, "message": "IGMP snooping: set mrouters_only flag for IPv4 traffic properly\n\nUpon reception of a IGMP/IGMPv2 membership report the kernel sets the\nmrouters_only flag in a skb that may be a clone of the original skb, which\nmeans that sometimes the bridge loses track of membership report packets (cb\nbuffers are tied to a specific skb and not shared) and it ends up forwading\njoin requests to the bridge interface.\n\nThis can cause unexpected membership timeouts and intermitent/permanent loss\nof connectivity as described in RFC 4541 [2.1.1. IGMP Forwarding Rules]:\n\n A snooping switch should forward IGMP Membership Reports only to\n those ports where multicast routers are attached.\n [...]\n Sending membership reports to other hosts can result, for IGMPv1\n and IGMPv2, in unintentionally preventing a host from joining a\n specific multicast group.\n\nSigned-off-by: Fernando Luis Vazquez Cao \u003cfernando@oss.ntt.co.jp\u003e\nTested-by: Hayato Kakuta \u003ckakuta.hayato@oss.ntt.co.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@conan.davemloft.net\u003e\n" }, { "commit": "c7ac8679bec9397afe8918f788cbcef88c38da54", "tree": "c152712de4c997ea79252ef9ac72aaedb8f88c18", "parents": [ "929dd047720785f099e12113780b3d7914ce6d9f" ], "author": { "name": "Greg Rose", "email": "gregory.v.rose@intel.com", "time": "Fri Jun 10 01:27:09 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Thu Jun 09 20:38:07 2011 -0700" }, "message": "rtnetlink: Compute and store minimum ifinfo dump size\n\nThe message size allocated for rtnl ifinfo dumps was limited to\na single page. This is not enough for additional interface info\navailable with devices that support SR-IOV and caused a bug in\nwhich VF info would not be displayed if more than approximately\n40 VFs were created per interface.\n\nImplement a new function pointer for the rtnl_register service that will\ncalculate the amount of data required for the ifinfo dump and allocate\nenough data to satisfy the request.\n\nSigned-off-by: Greg Rose \u003cgregory.v.rose@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "6407d74c5106bb362b4087693688afd34942b094", "tree": "82688e2abeaeb78f770cf01538f56eab5a704bf5", "parents": [ "13fcb7bd322164c67926ffe272846d4860196dc6" ], "author": { "name": "Alexander Holler", "email": "holler@ahsoftware.de", "time": "Tue Jun 07 00:51:35 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 07 00:51:35 2011 -0700" }, "message": "bridge: provide a cow_metrics method for fake_ops\n\nLike in commit 0972ddb237 (provide cow_metrics() methods to blackhole\ndst_ops), we must provide a cow_metrics for bridges fake_dst_ops as\nwell.\n\nThis fixes a regression coming from commits 62fa8a846d7d (net: Implement\nread-only protection and COW\u0027ing of metrics.) and 33eb9873a28 (bridge:\ninitialize fake_rtable metrics)\n\nip link set mybridge mtu 1234\n--\u003e\n[ 136.546243] Pid: 8415, comm: ip Tainted: P \n2.6.39.1-00006-g40545b7 #103 ASUSTeK Computer Inc. V1Sn \n /V1Sn\n[ 136.546256] EIP: 0060:[\u003c00000000\u003e] EFLAGS: 00010202 CPU: 0\n[ 136.546268] EIP is at 0x0\n[ 136.546273] EAX: f14a389c EBX: 000005d4 ECX: f80d32c0 EDX: f80d1da1\n[ 136.546279] ESI: f14a3000 EDI: f255bf10 EBP: f15c3b54 ESP: f15c3b48\n[ 136.546285] DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068\n[ 136.546293] Process ip (pid: 8415, ti\u003df15c2000 task\u003df4741f80 \ntask.ti\u003df15c2000)\n[ 136.546297] Stack:\n[ 136.546301] f80c658f f14a3000 ffffffed f15c3b64 c12cb9c8 f80d1b80 \nffffffa1 f15c3bbc\n[ 136.546315] c12da347 c12d9c7d 00000000 f7670b00 00000000 f80d1b80 \nffffffa6 f15c3be4\n[ 136.546329] 00000004 f14a3000 f255bf20 00000008 f15c3bbc c11d6cae \n00000000 00000000\n[ 136.546343] Call Trace:\n[ 136.546359] [\u003cf80c658f\u003e] ? br_change_mtu+0x5f/0x80 [bridge]\n[ 136.546372] [\u003cc12cb9c8\u003e] dev_set_mtu+0x38/0x80\n[ 136.546381] [\u003cc12da347\u003e] do_setlink+0x1a7/0x860\n[ 136.546390] [\u003cc12d9c7d\u003e] ? rtnl_fill_ifinfo+0x9bd/0xc70\n[ 136.546400] [\u003cc11d6cae\u003e] ? nla_parse+0x6e/0xb0\n[ 136.546409] [\u003cc12db931\u003e] rtnl_newlink+0x361/0x510\n[ 136.546420] [\u003cc1023240\u003e] ? vmalloc_sync_all+0x100/0x100\n[ 136.546429] [\u003cc1362762\u003e] ? error_code+0x5a/0x60\n[ 136.546438] [\u003cc12db5d0\u003e] ? rtnl_configure_link+0x80/0x80\n[ 136.546446] [\u003cc12db27a\u003e] rtnetlink_rcv_msg+0xfa/0x210\n[ 136.546454] [\u003cc12db180\u003e] ? __rtnl_unlock+0x20/0x20\n[ 136.546463] [\u003cc12ee0fe\u003e] netlink_rcv_skb+0x8e/0xb0\n[ 136.546471] [\u003cc12daf1c\u003e] rtnetlink_rcv+0x1c/0x30\n[ 136.546479] [\u003cc12edafa\u003e] netlink_unicast+0x23a/0x280\n[ 136.546487] [\u003cc12ede6b\u003e] netlink_sendmsg+0x26b/0x2f0\n[ 136.546497] [\u003cc12bb828\u003e] sock_sendmsg+0xc8/0x100\n[ 136.546508] [\u003cc10adf61\u003e] ? __alloc_pages_nodemask+0xe1/0x750\n[ 136.546517] [\u003cc11d0602\u003e] ? _copy_from_user+0x42/0x60\n[ 136.546525] [\u003cc12c5e4c\u003e] ? verify_iovec+0x4c/0xc0\n[ 136.546534] [\u003cc12bd805\u003e] sys_sendmsg+0x1c5/0x200\n[ 136.546542] [\u003cc10c2150\u003e] ? __do_fault+0x310/0x410\n[ 136.546549] [\u003cc10c2c46\u003e] ? do_wp_page+0x1d6/0x6b0\n[ 136.546557] [\u003cc10c47d1\u003e] ? handle_pte_fault+0xe1/0x720\n[ 136.546565] [\u003cc12bd1af\u003e] ? sys_getsockname+0x7f/0x90\n[ 136.546574] [\u003cc10c4ec1\u003e] ? handle_mm_fault+0xb1/0x180\n[ 136.546582] [\u003cc1023240\u003e] ? vmalloc_sync_all+0x100/0x100\n[ 136.546589] [\u003cc10233b3\u003e] ? do_page_fault+0x173/0x3d0\n[ 136.546596] [\u003cc12bd87b\u003e] ? sys_recvmsg+0x3b/0x60\n[ 136.546605] [\u003cc12bdd83\u003e] sys_socketcall+0x293/0x2d0\n[ 136.546614] [\u003cc13629d0\u003e] sysenter_do_call+0x12/0x26\n[ 136.546619] Code: Bad EIP value.\n[ 136.546627] EIP: [\u003c00000000\u003e] 0x0 SS:ESP 0068:f15c3b48\n[ 136.546645] CR2: 0000000000000000\n[ 136.546652] ---[ end trace 6909b560e78934fa ]---\n\nSigned-off-by: Alexander Holler \u003choller@ahsoftware.de\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "58bf2dbccc5aca12df77e2328f478e239a68bdd5", "tree": "3eb8009d5029e2b5b07325c9dba1709413677395", "parents": [ "86e4ca66e81bba0f8640f1fa19b8b8f72cbd0561", "c74c0bfe0b61cf41a897c2444c038e0d3f600556" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 27 13:04:40 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 27 13:04:40 2011 -0400" }, "message": "Merge branch \u0027pablo/nf-2.6-updates\u0027 of git://1984.lsi.us.es/net-2.6\n" }, { "commit": "97242c85a2c8160eac5a6e945209b5b6ae8ab5a3", "tree": "c1d64596ae85c77580fe99b7c4cae3d41ca4fbf5", "parents": [ "9184a9cba622d9e38462ce11dff7da094b4fea84" ], "author": { "name": "David Miller", "email": "davem@davemloft.net", "time": "Thu May 19 18:14:39 2011 -0400" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Thu May 26 19:09:07 2011 +0200" }, "message": "netfilter: Fix several warnings in compat_mtw_from_user().\n\nKill set but not used \u0027entry_offset\u0027.\n\nAdd a default case to the switch statement so the compiler\ncan see that we always initialize off and size_kern before\nusing them.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "33eb9873a283a2076f2b5628813d5365ca420ea9", "tree": "ae07eb66338204a0995d8cacc32f8242674e5104", "parents": [ "b30c516f875004f025f4d10147bde28c5e98466b" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue May 24 13:32:18 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 24 13:32:18 2011 -0400" }, "message": "bridge: initialize fake_rtable metrics\n\nbridge netfilter code uses a fake_rtable, and we must init its _metric\nfield or risk NULL dereference later.\n\nRef: https://bugzilla.kernel.org/show_bug.cgi?id\u003d35672\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6df427fe8c481d3be437cbe8bd366bdac82b73c4", "tree": "5107145d367b646f815493bfcee75e2c0abfca3b", "parents": [ "ac3d3f81516fcbf80416e84682fd4bdaf3080611" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu May 19 19:37:40 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 22 21:01:20 2011 -0400" }, "message": "net: remove synchronize_net() from netdev_set_master()\n\nIn the old days, we used to access dev-\u003emaster in __netif_receive_skb()\nin a rcu_read_lock section.\n\nSo one synchronize_net() call was needed in netdev_set_master() to make\nsure another cpu could not use old master while/after we release it.\n\nWe now use netdev_rx_handler infrastructure and added one\nsynchronize_net() call in bond_release()/bond_release_all()\n\nRemove the obsolete synchronize_net() from netdev_set_master() and add\none in bridge del_nbp() after its netdev_rx_handler_unregister() call.\n\nThis makes enslave -d a bit faster.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Jiri Pirko \u003cjpirko@redhat.com\u003e\nCC: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bb8ed6302b0613339c1a5f0a2cb0b3807c0af611", "tree": "11fac5a62c192453f01cab4aedc81b0cdc91c900", "parents": [ "8d8fc29d02a33e4bd5f4fa47823c1fd386346093" ], "author": { "name": "Amerigo Wang", "email": "amwang@redhat.com", "time": "Thu May 19 21:39:11 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 22 21:01:19 2011 -0400" }, "message": "bridge: call NETDEV_JOIN notifiers when add a slave\n\nIn the previous patch I added NETDEV_JOIN, now\nwe can notify netconsole when adding a device to a bridge too.\n\nSigned-off-by: WANG Cong \u003camwang@redhat.com\u003e\nCc: Neil Horman \u003cnhorman@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9cbc94eabb0791906051bbfac024ef2c2be8e079", "tree": "41ba194e687c6c60f5c883f98737ac83257d0c00", "parents": [ "1d1652cbdb9885e4d73972263e4cdbe1b0beebfe", "7cc31a9ae1477abc79d5992b3afe889f25c50c99" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 17 17:33:11 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 17 17:33:11 2011 -0400" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/vmxnet3/vmxnet3_ethtool.c\n\tnet/core/dev.c\n" }, { "commit": "cb68552858c64db302771469b1202ea09e696329", "tree": "f7a5f943a151b0bcde920b9aad1938e245c7c5d0", "parents": [ "a10e14667635dde504ed9e7ee851494c2cf2ae8e" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Fri May 13 16:03:24 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 13 16:03:24 2011 -0400" }, "message": "bridge: fix forwarding of IPv6\n\nThe commit 6b1e960fdbd75dcd9bcc3ba5ff8898ff1ad30b6e\n bridge: Reset IPCB when entering IP stack on NF_FORWARD\nbroke forwarding of IPV6 packets in bridge because it would\ncall bp_parse_ip_options with an IPV6 packet.\n\nReported-by: Noah Meyerhans \u003cnoahm@debian.org\u003e\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nReviewed-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3c709f8fb43e07a0403bba4a8ca7ba00ab874994", "tree": "9efc1e2bf6930851f0224f525b6cde0f5297fa61", "parents": [ "0074820978004cc484b132d7a9ce0df414660d9d", "9bbc052d5e63512b0ce4e201ea97e12fba9fda82" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 11 14:26:15 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 11 14:26:58 2011 -0400" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-3.6\n\nConflicts:\n\tdrivers/net/benet/be_main.c\n" }, { "commit": "103a9778e07bcc0cd34b5c35a87281454eec719e", "tree": "0b4f2262a31df17d205a6ace7b1c7992c8ce1147", "parents": [ "5a6351eecf8c87afed9c883bb6341d09406d74ba" ], "author": { "name": "Florian Westphal", "email": "fw@strlen.de", "time": "Thu Apr 21 10:58:25 2011 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 10 09:52:17 2011 +0200" }, "message": "netfilter: ebtables: only call xt_compat_add_offset once per rule\n\nThe optimizations in commit 255d0dc34068a976\n(netfilter: x_table: speedup compat operations) assume that\nxt_compat_add_offset is called once per rule.\n\nebtables however called it for each match/target found in a rule.\n\nThe match/watcher/target parser already returns the needed delta, so it\nis sufficient to move the xt_compat_add_offset call to a more reasonable\nlocation.\n\nWhile at it, also get rid of the unused COMPAT iterator macros.\n\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "5a6351eecf8c87afed9c883bb6341d09406d74ba", "tree": "2e7262b7002c8f09abaedb9e4e91ec51fdb01299", "parents": [ "315c34dae0069d0c67abd714bb846cd466289c7f" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Apr 21 10:57:21 2011 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue May 10 09:48:59 2011 +0200" }, "message": "netfilter: fix ebtables compat support\n\ncommit 255d0dc34068a976 (netfilter: x_table: speedup compat operations)\nmade ebtables not working anymore.\n\n1) xt_compat_calc_jump() is not an exact match lookup\n2) compat_table_info() has a typo in xt_compat_init_offsets() call\n3) compat_do_replace() misses a xt_compat_init_offsets() call\n\nReported-by: dann frazier \u003cdannf@dannf.org\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "e67f88dd12f610da98ca838822f2c9b4e7c6100e", "tree": "6cf01b794984aaad97b6e6ff6e5103bc48d68191", "parents": [ "dcfd9cdc1222f14d6180514e533289493a0716fb" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Apr 27 22:56:07 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 02 15:26:28 2011 -0700" }, "message": "net: dont hold rtnl mutex during netlink dump callbacks\n\nFour years ago, Patrick made a change to hold rtnl mutex during netlink\ndump callbacks.\n\nI believe it was a wrong move. This slows down concurrent dumps, making\ngood old /proc/net/ files faster than rtnetlink in some situations.\n\nThis occurred to me because one \"ip link show dev ...\" was _very_ slow\non a workload adding/removing network devices in background.\n\nAll dump callbacks are able to use RCU locking now, so this patch does\nroughly a revert of commits :\n\n1c2d670f366 : [RTNETLINK]: Hold rtnl_mutex during netlink dump callbacks\n6313c1e0992 : [RTNETLINK]: Remove unnecessary locking in dump callbacks\n\nThis let writers fight for rtnl mutex and readers going full speed.\n\nIt also takes care of phonet : phonet_route_get() is now called from rcu\nread section. I renamed it to phonet_route_get_rcu()\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Patrick McHardy \u003ckaber@trash.net\u003e\nCc: Remi Denis-Courmont \u003cremi.denis-courmont@nokia.com\u003e\nAcked-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "25db0338813a8915457636b1f6abe6a28fa73f8d", "tree": "29ea39e45de1342beb4e3c58da0cfbc9915b617e", "parents": [ "8ae6daca85c8bbd6a32c382db5e2a2a989f8bed2" ], "author": { "name": "David Decotigny", "email": "decot@google.com", "time": "Wed Apr 27 18:32:39 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 29 14:03:00 2011 -0700" }, "message": "ethtool: Use full 32 bit speed range in ethtool\u0027s set_settings\n\nThis makes sure the ethtool\u0027s set_settings() callback of network\ndrivers don\u0027t ignore the 16 most significant bits when ethtool calls\ntheir set_settings().\n\nAll drivers compiled with make allyesconfig on x86_64 have been\nupdated.\n\nSigned-off-by: David Decotigny \u003cdecot@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c4d27ef957cd9261c0bc8488edaf8390e412cd35", "tree": "f8e263ca9a1842803a2265bffd5eaa3e5b3d9660", "parents": [ "1742f183fc218798dab6fcf0ded25b6608fc0a48" ], "author": { "name": "Michał Mirosław", "email": "mirq-linux@rere.qmqm.pl", "time": "Fri Apr 22 06:31:16 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 28 13:33:08 2011 -0700" }, "message": "bridge: convert br_features_recompute() to ndo_fix_features\n\nNote: netdev_update_features() needs only rtnl_lock as br-\u003eport_list\nis only changed while holding it.\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": "2bd93d7af1581d40e3c4b25242472661cb7c637a", "tree": "43c638422d20857339d8d908d6b65ebb8045edc0", "parents": [ "64cad2ade1e6f890531a58318ca9ee013f92ef2f", "0972ddb2373d5e127aabdcabd8305eff0242cd0b" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 26 12:16:46 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 26 12:16:46 2011 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nResolved logic conflicts causing a build failure due to\ndrivers/net/r8169.c changes using a patch from Stephen Rothwell.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b71d1d426d263b0b6cb5760322efebbfc89d4463", "tree": "226ca7390bd6187ec9139d2ccedd26fd94d8e57a", "parents": [ "5f8629c526b4f7e529a6d27bbd802c0dc7fcc357" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri Apr 22 04:53:02 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 22 11:04:14 2011 -0700" }, "message": "inet: constify ip headers and in6_addr\n\nAdd const qualifiers to structs iphdr, ipv6hdr and in6_addr pointers\nwhere possible, to make code intention more obvious.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f01cb5fbea1c1613621f9f32f385e12c1a29dde0", "tree": "011167bc13e0911a6638abce448098dee952c371", "parents": [ "cb771838715b1c470bc5735bdae709b33b18e0ad" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 21 21:17:25 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 21 21:17:25 2011 -0700" }, "message": "Revert \"bridge: Forward reserved group addresses if !STP\"\n\nThis reverts commit 1e253c3b8a1aeed51eef6fc366812f219b97de65.\n\nIt breaks 802.3ad bonding inside of a bridge.\n\nThe commit was meant to support transport bridging, and specifically\nvirtual machines bridged to an ethernet interface connected to a\nswitch port wiht 802.1x enabled.\n\nBut this isn\u0027t the way to do it, it breaks too many other things.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e1943424e43974f85b82bb31eaf832823bf49ce7", "tree": "00a2dda7454ba186c0be4bfb8d08b7f74c3cd98c", "parents": [ "88230fd586b4ccc5ffe6d6c2df8cdc495e89ad83", "0553c891fabd287726b41076cfd03fe7e5ab596f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 19 00:21:33 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 19 00:21:33 2011 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/bnx2x/bnx2x_ethtool.c\n" }, { "commit": "28674b97cfb907b0b3de7b7fea89efda1e65f34e", "tree": "8ce41fb220a4ea54fc5d92454c106d186e1c5433", "parents": [ "2ed28baa7076083b56c1e70ccd927b7870117c59" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Sun Apr 17 17:52:51 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 17 17:52:51 2011 -0700" }, "message": "bridge: fix accidental creation of sysfs directory\n\nCommit bb900b27a2f49b37bc38c08e656ea13048fee13b (\"bridge: allow\ncreating bridge devices with netlink\") introduced a bug in net-next\nbecause of a typo in notifier. Every device would have the sysfs\nbridge directory (and files).\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f8e9881c2aef1e982e5abc25c046820cd0b7cf64", "tree": "be6286761107774543025b577e32535bee55504b", "parents": [ "aa8673599f1d269b4e4d9b0c0f61fca57bc02699" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Apr 12 13:39:14 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 12 13:39:14 2011 -0700" }, "message": "bridge: reset IPCB in br_parse_ip_options\n\nCommit 462fb2af9788a82 (bridge : Sanitize skb before it enters the IP\nstack), missed one IPCB init before calling ip_options_compile()\n\nThanks to Scot Doyle for his tests and bug reports.\n\nReported-by: Scot Doyle \u003clkml@scotdoyle.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Hiroaki SHIMODA \u003cshimoda.hiroaki@gmail.com\u003e\nAcked-by: Bandan Das \u003cbandan.das@stratus.com\u003e\nAcked-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nCc: Jan Lübbe \u003cjluebbe@debian.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1c01a80cfec6f806246f31ff2680cd3639b30e67", "tree": "0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c", "parents": [ "c44d79950b2daa1025e62eede73e4e4a274d1ef3", "4a9f65f6304a00f6473e83b19c1e83caa1e42530" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 11 13:44:25 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 11 13:44:25 2011 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/smsc911x.c\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": "14f98f258f1936e0dba77474bd7eda63f61a9826", "tree": "b74a80e8736c937be34291fb432f15a3f6aff67c", "parents": [ "bb900b27a2f49b37bc38c08e656ea13048fee13b" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Mon Apr 04 14:03:33 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 04 17:22:29 2011 -0700" }, "message": "bridge: range check STP parameters\n\nApply restrictions on STP parameters based 802.1D 1998 standard.\n * Fixes missing locking in set path cost ioctl\n * Uses common code for both ioctl and sysfs\n\nThis is based on an earlier patch Sasikanth V but with overhaul.\n\nNote:\n1. It does NOT enforce the restriction on the relationship max_age and\n forward delay or hello time because in existing implementation these are\n set as independant operations.\n\n2. If STP is disabled, there is no restriction on forward delay\n\n3. No restriction on holding time because users use Linux code to act\n as hub or be sticky.\n\n4. Although standard allow 0-255, Linux only allows 0-63 for port priority\n because more bits are reserved for port number.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bb900b27a2f49b37bc38c08e656ea13048fee13b", "tree": "dbea65f697ee131de15a7b6d94466744ad346594", "parents": [ "36fd2b63e3b4336744cf3f6a6c9543ecbec334a7" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Mon Apr 04 14:03:32 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 04 17:22:28 2011 -0700" }, "message": "bridge: allow creating bridge devices with netlink\n\nAdd netlink device ops to allow creating bridge device via netlink.\nThis works in a manner similar to vlan, macvlan and bonding.\n\nExample:\n # ip link add link dev br0 type bridge\n # ip link del dev br0\n\nThe change required rearranging initializtion code to deal with\nbeing called by create link. Most of the initialization happens\nin br_dev_setup, but allocation of stats is done in ndo_init callback\nto deal with allocation failure. Sysfs setup has to wait until\nafter the network device kobject is registered.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "36fd2b63e3b4336744cf3f6a6c9543ecbec334a7", "tree": "0793a71cf90d8bb3ea1573564ad5bed485324396", "parents": [ "b078f0df676233fc7ebc1ab270bd11ef5824bb64" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Mon Apr 04 14:03:31 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 04 17:22:28 2011 -0700" }, "message": "bridge: allow creating/deleting fdb entries via netlink\n\nUse RTM_NEWNEIGH and RTM_DELNEIGH to allow updating of entries\nin bridge forwarding table. This allows manipulating static entries\nwhich is not possible with existing tools.\n\nExample (using bridge extensions to iproute2)\n # br fdb add 00:02:03:04:05:06 dev eth0\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b078f0df676233fc7ebc1ab270bd11ef5824bb64", "tree": "14eb5b201cfd451cf5c9df173ffb84be7cf62857", "parents": [ "664de48bb6c4e167fcdf92a4bddf880030fbfbb3" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Mon Apr 04 14:03:30 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 04 17:22:27 2011 -0700" }, "message": "bridge: add netlink notification on forward entry changes\n\nThis allows applications to query and monitor bridge forwarding\ntable in the same method used for neighbor table. The forward table\nentries are returned in same structure format as used by the ioctl.\nIf more information is desired in future, the netlink method is\nextensible.\n\nExample (using bridge extensions to iproute2)\n # br monitor\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "664de48bb6c4e167fcdf92a4bddf880030fbfbb3", "tree": "3da0ad964f1ad79f567ed04a5e5b32c201687787", "parents": [ "7cd8861ab0d907430bbea0af93bc41aee0437efc" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Mon Apr 04 14:03:29 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 04 17:22:26 2011 -0700" }, "message": "bridge: split rcu and no-rcu cases of fdb lookup\n\nIn some cases, look up of forward database entry is done with RCU;\nand for others no RCU is needed because of locking. Split the two\ncases into two differnt loops (and take off inline).\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7cd8861ab0d907430bbea0af93bc41aee0437efc", "tree": "ed6f9689447b01dc81212705d015186f17774f23", "parents": [ "03e9b64b89243ccc6f8f48f5955a5a78a8ca1431" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Mon Apr 04 14:03:28 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 04 17:22:26 2011 -0700" }, "message": "bridge: track last used time in forwarding table\n\nAdds tracking the last used time in forwarding table.\nRename ageing_timer to updated to better describe it.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "03e9b64b89243ccc6f8f48f5955a5a78a8ca1431", "tree": "5ab589f74076a17cea2b08aca5ce4354cde32142", "parents": [ "0545a3037773512d3448557ba048cebb73b3e4af" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Mon Apr 04 14:03:27 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 04 17:22:25 2011 -0700" }, "message": "bridge: change arguments to fdb_create\n\nLater patch provides ability to create non-local static entry.\nTo make this easier move the updating of the flag values to\nafter the code that creates entry.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.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": "ff9a57a62afbbe2d0f3a09af321f1fd7645f38a5", "tree": "74a3d7cf9a7b10ad042eccf6adacf30aae8c7c15", "parents": [ "fd1d9188f2cb81fe63c789d9f5463dca402ade12" ], "author": { "name": "Linus Lüssing", "email": "linus.luessing@web.de", "time": "Sat Mar 26 20:27:24 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 30 02:28:20 2011 -0700" }, "message": "bridge: mcast snooping, fix length check of snooped MLDv1/2\n\n\"len \u003d ntohs(ip6h-\u003epayload_len)\" does not include the length of the ipv6\nheader itself, which the rest of this function assumes, though.\n\nThis leads to a length check less restrictive as it should be in the\nfollowing line for one thing. For another, it very likely leads to an\ninteger underrun when substracting the offset and therefore to a very\nhigh new value of \u0027len\u0027 due to its unsignedness. This will ultimately\nlead to the pskb_trim_rcsum() practically never being called, even in\nthe cases where it should.\n\nSigned-off-by: Linus Lüssing \u003clinus.luessing@web.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1459a3cc51d90d78027c7b5c1790e5d22751c8eb", "tree": "c8c1f1a12c0001e55ed27f904dcef490040bd4ab", "parents": [ "eec009548e98f6b6d514ff5bb8a8627b8dd17a49" ], "author": { "name": "Balaji G", "email": "balajig81@gmail.com", "time": "Tue Mar 29 06:20:04 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 29 23:37:23 2011 -0700" }, "message": "bridge: Fix compilation warning in function br_stp_recalculate_bridge_id()\n\nnet/bridge/br_stp_if.c: In function ‘br_stp_recalculate_bridge_id’:\nnet/bridge/br_stp_if.c:216:3: warning: ‘return’ with no value, in function returning non-void\n\nSigned-off-by: G.Balaji \u003cbalajig81@gmail.com\u003e\nAcked-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "edf947f10074fea27fdb1730524dca59355a1c40", "tree": "4141cd2fa39ae589055057e912d3235150d670c5", "parents": [ "8628bd8af7c4c14f40f5183f80f5744c4e682439" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Thu Mar 24 13:24:01 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Mar 27 23:35:02 2011 -0700" }, "message": "bridge: notify applications if address of bridge device changes\n\nThe mac address of the bridge device may be changed when a new interface\nis added to the bridge. If this happens, then the bridge needs to call\nthe network notifiers to tickle any other systems that care. Since bridge\ncan be a module, this also means exporting the notifier function.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a7bff75b087e7a355838a32efe61707cfa73c194", "tree": "4e87f5cb94772624b1f035baefb7a6c21586984d", "parents": [ "6a1fef6d000944911df0f160f366111daa10740a" ], "author": { "name": "Linus Lüssing", "email": "linus.luessing@web.de", "time": "Tue Mar 22 11:40:32 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 22 19:26:42 2011 -0700" }, "message": "bridge: Fix possibly wrong MLD queries\u0027 ethernet source address\n\nThe ipv6_dev_get_saddr() is currently called with an uninitialized\ndestination address. Although in tests it usually seemed to nevertheless\nalways fetch the right source address, there seems to be a possible race\ncondition.\n\nTherefore this commit changes this, first setting the destination\naddress and only after that fetching the source address.\n\nReported-by: Jan Beulich \u003cJBeulich@novell.com\u003e\nSigned-off-by: Linus Lüssing \u003clinus.luessing@web.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6b1e960fdbd75dcd9bcc3ba5ff8898ff1ad30b6e", "tree": "71834e9ccd22d9e7aed7272e805a514664cf8b25", "parents": [ "d870bfb9d366c5d466c0f5419a4ec95a3f71ea8a" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Fri Mar 18 05:27:28 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Mar 18 15:13:12 2011 -0700" }, "message": "bridge: Reset IPCB when entering IP stack on NF_FORWARD\n\nWhenever we enter the IP stack proper from bridge netfilter we\nneed to ensure that the skb is in a form the IP stack expects\nit to be in.\n\nThe entry point on NF_FORWARD did not meet the requirements of\nthe IP stack, therefore leading to potential crashes/panics.\n\nThis patch fixes the problem.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nAcked-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8a4eb5734e8d1dc60a8c28576bbbdfdcc643626d", "tree": "ed4cd2f9a2a04a30994a8f8964a81834c895c0c9", "parents": [ "2d7011ca79f1a8792e04d131b8ea21db179ab917" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Sat Mar 12 03:14:39 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 16 12:53:54 2011 -0700" }, "message": "net: introduce rx_handler results and logic around that\n\nThis patch allows rx_handlers to better signalize what to do next to\nit\u0027s caller. That makes skb-\u003edeliver_no_wcard no longer needed.\n\nkernel-doc for rx_handler_result is taken from Nicolas\u0027 patch.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nReviewed-by: Nicolas de Pesloüan \u003cnicolas.2p.debian@free.fr\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" } ], "next": "c337ffb68e1e71bad069b14d2246fa1e0c31699c" }