)]}' { "log": [ { "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": "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": "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": "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": "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" }, { "commit": "c337ffb68e1e71bad069b14d2246fa1e0c31699c", "tree": "7861a59b196adfd63758cc0921e4fb56030fbaf3", "parents": [ "30df754dedebf27ef90452944a723ba058d23396", "84c0c6933cb0303fa006992a6659c2b46de4eb17" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 15 15:15:17 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 15 15:15:17 2011 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "a461c0297f2e80c78eaa03fc5141bf57a814ff4f", "tree": "30938b4d69699dc8b9e8393e990c3e35957baf49", "parents": [ "60aeba23101f34a690a0b0a048ffde3d023d4f3b" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Thu Mar 10 05:57:04 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 14 15:06:49 2011 -0700" }, "message": "bridge: skip forwarding delay if not using STP\n\nIf Spanning Tree Protocol is not enabled, there is no good reason for\nthe bridge code to wait for the forwarding delay period before enabling\nthe link. The purpose of the forwarding delay is to allow STP to\nlearn about other bridges before nominating itself.\n\nThe only possible impact is that when starting up a new port\nthe bridge may flood a packet now, where previously it might have\nseen traffic from the other host and preseeded the forwarding table.\n\nIncludes change for local variable br already available in that func.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1faa4356a3bd89ea11fb92752d897cff3a20ec0e", "tree": "31bf972b0ee42105bceb79e09f2a8b82d9d9b942", "parents": [ "942527634e201883b39fe0c97a1e47db7a026f91" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Mon Mar 07 08:34:06 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 14 14:29:02 2011 -0700" }, "message": "bridge: control carrier based on ports online\n\nThis makes the bridge device behave like a physical device.\nIn earlier releases the bridge always asserted carrier. This\nchanges the behavior so that bridge device carrier is on only\nif one or more ports are in the forwarding state. This\nshould help IPv6 autoconfiguration, DHCP, and routing daemons.\n\nI did brief testing with Network and Virt manager and they\nseem fine, but since this changes behavior of bridge, it should\nwait until net-next (2.6.39).\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nReviewed-by: Nicolas de Pesloüan \u003cnicolas.2p.debian@free.fr\u003e\nTested-By: Adam Majer \u003cadamm@zombino.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "78fbfd8a653ca972afe479517a40661bfff6d8c3", "tree": "9dccc5c16bf269d53d8499064ec95a998e84c646", "parents": [ "1561747ddf9d28185548687b11aae7074d6129c4" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 12 00:00:52 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 12 15:08:42 2011 -0800" }, "message": "ipv4: Create and use route lookup helpers.\n\nThe idea here is this minimizes the number of places one has to edit\nin order to make changes to how flows are defined and used.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "33175d84ee3fa29991adb80513683e010769e807", "tree": "3731f61cf82451b6892cf1368701e57e35d92908", "parents": [ "c5908939b2738bafe1b309bc2465cb9f2e6184c5", "6dfbd87a20a737641ef228230c77f4262434fa24" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 10 14:26:00 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 10 14:26:00 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/bnx2x/bnx2x_cmn.c\n" }, { "commit": "dcbcdf22f500ac6e4ec06485341024739b9dc241", "tree": "71492abd2ba95b51fb0d20e63e0164eb6c3f7a49", "parents": [ "7343ff31ebf01691ea4515d3126467434b9d22d6" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Thu Mar 10 13:45:57 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 10 13:45:57 2011 -0800" }, "message": "net: bridge builtin vs. ipv6 modular\n\nWhen configs BRIDGE\u003dy and IPV6\u003dm, this build error occurs:\n\nbr_multicast.c:(.text+0xa3341): undefined reference to `ipv6_dev_get_saddr\u0027\n\nBRIDGE_IGMP_SNOOPING is boolean; if it were tristate, then adding\n\tdepends on IPV6 || IPV6\u003dn\nto BRIDGE_IGMP_SNOOPING would be a good fix. As it is currently,\nmaking BRIDGE depend on the IPV6 config works.\n\nReported-by: Patrick Schaaf \u003cnetdev@bof.de\u003e\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0a0e9ae1bd788bc19adc4d4ae08c98b233697402", "tree": "13825eeb5bbeae27d66e95f12168eff4b60701ab", "parents": [ "01a16b21d6adf992aa863186c3c4e561a57c1714", "b65a0e0c84cf489bfa00d6aa6c48abc5a237100f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 03 21:27:42 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 03 21:27:42 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/bnx2x/bnx2x.h\n" }, { "commit": "b23dd4fe42b455af5c6e20966b7d6959fa8352ea", "tree": "bf97323eae9a8d084170e573ff2c0c40bc72c3cd", "parents": [ "452edd598f60522c11f7f88fdbab27eb36509d1a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 02 14:31:35 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 02 14:31:35 2011 -0800" }, "message": "ipv4: Make output route lookup return rtable directly.\n\nInstead of on the stack.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3872b284087081ee5cb0e4630954c2f7a2153cf5", "tree": "ead36598e35730e419edcf42dc788290af9e3d5b", "parents": [ "07df5294a753dfac2cc9f75e6159fc25fdc22149", "8a80c79a776d1b1b54895314ffaf53d0c7604c80" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 02 11:30:24 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 02 11:30:24 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6\n" }, { "commit": "fe29ec41aaa51902aebd63658dfb04fe6fea8be5", "tree": "c9325f8cb76331c307b39d1348f8d668dfdfbc58", "parents": [ "36cff5a10c6b003fa2d0464848d5664b2bf723e0" ], "author": { "name": "Linus Lüssing", "email": "linus.luessing@web.de", "time": "Thu Feb 17 08:17:52 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 22 10:07:29 2011 -0800" }, "message": "bridge: Use IPv6 link-local address for multicast listener queries\n\nCurrently the bridge multicast snooping feature periodically issues\nIPv6 general multicast listener queries to sense the absence of a\nlistener.\n\nFor this, it uses :: as its source address - however RFC 2710 requires:\n\"To be valid, the Query message MUST come from a link-local IPv6 Source\nAddress\". Current Linux kernel versions seem to follow this requirement\nand ignore our bogus MLD queries.\n\nWith this commit a link local address from the bridge interface is being\nused to issue the MLD query, resulting in other Linux devices which are\nmulticast listeners in the network to respond with a MLD response (which\nwas not the case before).\n\nSigned-off-by: Linus Lüssing \u003clinus.luessing@web.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "36cff5a10c6b003fa2d0464848d5664b2bf723e0", "tree": "3c7bbed26f620254a680329600b658746c3c83fc", "parents": [ "e4de9f9e8333fbbae951c6e068f501f955123cf0" ], "author": { "name": "Linus Lüssing", "email": "linus.luessing@web.de", "time": "Thu Feb 17 08:17:51 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 22 10:07:28 2011 -0800" }, "message": "bridge: Fix MLD queries\u0027 ethernet source address\n\nMap the IPv6 header\u0027s destination multicast address to an ethernet\nsource address instead of the MLD queries multicast address.\n\nFor instance for a general MLD query (multicast address in the MLD query\nset to ::), this would wrongly be mapped to 33:33:00:00:00:00, although\nan MLD queries destination MAC should always be 33:33:00:00:00:01 which\nmatches the IPv6 header\u0027s multicast destination ff02::1.\n\nSigned-off-by: Linus Lüssing \u003clinus.luessing@web.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e4de9f9e8333fbbae951c6e068f501f955123cf0", "tree": "b3b09d3d6510f57724c599246f2bbe08451f8165", "parents": [ "5ced1339612d1fa095459bd481f1d1f64f76f859" ], "author": { "name": "Linus Lüssing", "email": "linus.luessing@web.de", "time": "Tue Feb 15 13:19:21 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 22 10:07:28 2011 -0800" }, "message": "bridge: Allow mcast snooping for transient link local addresses too\n\nCurrently the multicast bridge snooping support is not active for\nlink local multicast. I assume this has been done to leave\nimportant multicast data untouched, like IPv6 Neighborhood Discovery.\n\nIn larger, bridged, local networks it could however be desirable to\noptimize for instance local multicast audio/video streaming too.\n\nWith the transient flag in IPv6 multicast addresses we have an easy\nway to optimize such multimedia traffic without tempering with the\nhigh priority multicast data from well-known addresses.\n\nThis patch alters the multicast bridge snooping for IPv6, to take\neffect for transient multicast addresses instead of non-link-local\naddresses.\n\nSigned-off-by: Linus Lüssing \u003clinus.luessing@web.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d41db9f3f71548f07b8b6d81a88220d0035b04f6", "tree": "14d56a73bccb0fdc6a00a79809fec94697817f6d", "parents": [ "649e984d00416cb1a254fdbebd6d3f9fa01c32fa" ], "author": { "name": "Linus Lüssing", "email": "linus.luessing@web.de", "time": "Tue Feb 15 13:19:19 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 22 10:07:27 2011 -0800" }, "message": "bridge: Add missing ntohs()s for MLDv2 report parsing\n\nThe nsrcs number is 2 Byte wide, therefore we need to call ntohs()\nbefore using it.\n\nSigned-off-by: Linus Lüssing \u003clinus.luessing@web.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "649e984d00416cb1a254fdbebd6d3f9fa01c32fa", "tree": "f55db589cf188c833680f64622a6baee407e78ca", "parents": [ "9cc6e0c4c457f84bedcfb04e7dd58a36909c4ef7" ], "author": { "name": "Linus Lüssing", "email": "linus.luessing@web.de", "time": "Tue Feb 15 13:19:18 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 22 10:07:26 2011 -0800" }, "message": "bridge: Fix IPv6 multicast snooping by correcting offset in MLDv2 report\n\nWe actually want a pointer to the grec_nsrcr and not the following\nfield. Otherwise we can get very high values for *nsrcs as the first two\nbytes of the IPv6 multicast address are being used instead, leading to\na failing pskb_may_pull() which results in MLDv2 reports not being\nparsed.\n\nSigned-off-by: Linus Lüssing \u003clinus.luessing@web.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9cc6e0c4c457f84bedcfb04e7dd58a36909c4ef7", "tree": "e0a1dc5eba3ce25e8f1cf0b3b78a60314ee80975", "parents": [ "c24f691b56107feeba076616982093ee2d3c8fb5" ], "author": { "name": "Linus Lüssing", "email": "linus.luessing@web.de", "time": "Tue Feb 15 13:19:17 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 22 10:07:26 2011 -0800" }, "message": "bridge: Fix IPv6 multicast snooping by storing correct protocol type\n\nThe protocol type for IPv6 entries in the hash table for multicast\nbridge snooping is falsely set to ETH_P_IP, marking it as an IPv4\naddress, instead of setting it to ETH_P_IPV6, which results in negative\nlook-ups in the hash table later.\n\nSigned-off-by: Linus Lüssing \u003clinus.luessing@web.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "da935c66bacb3ed9ada984b053297f87c2dff63a", "tree": "46278da2b312c73f1375b830d7e5912bf23abd78", "parents": [ "9435eb1cf0b76b323019cebf8d16762a50a12a19", "2205a6ea93fea76f88b43727fea53f3ce3790d6f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Feb 19 19:17:35 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Feb 19 19:17:35 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tDocumentation/feature-removal-schedule.txt\n\tdrivers/net/e1000e/netdev.c\n\tnet/xfrm/xfrm_policy.c\n" }, { "commit": "d846f71195d57b0bbb143382647c2c6638b04c5a", "tree": "67515bc845a399c77df22dd859cabdb17dcd70ff", "parents": [ "44bd4de9c2270b22c3c898310102bc6be9ed2978" ], "author": { "name": "Vasiliy Kulikov", "email": "segoon@openwall.com", "time": "Mon Feb 14 16:49:23 2011 +0100" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon Feb 14 16:49:23 2011 +0100" }, "message": "bridge: netfilter: fix information leak\n\nStruct tmp is copied from userspace. It is not checked whether the \"name\"\nfield is NULL terminated. This may lead to buffer overflow and passing\ncontents of kernel stack as a module name to try_then_request_module() and,\nconsequently, to modprobe commandline. It would be seen by all userspace\nprocesses.\n\nSigned-off-by: Vasiliy Kulikov \u003csegoon@openwall.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "afc6151a78a43bdca5f64a8bd3e3c13837580c54", "tree": "ec95ce72f88991aeb28df160b4a0215b137b2844", "parents": [ "9232ecca3ecd2e32140118c8fdabd7f8fb9ef4d5" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Sun Feb 13 09:33:42 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Feb 13 16:58:40 2011 -0800" }, "message": "bridge: implement [add/del]_slave ops\n\nadd possibility to addif/delif via rtnetlink\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8a870178c0ad1bae9994c99bd01eb10c9903e616", "tree": "e850d082e5aef4f436867a3301d1bf15fda80d06", "parents": [ "24f9cdcbd743fd6adb8fb83688d8d86dcccde662" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Sat Feb 12 01:05:42 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Feb 12 01:05:42 2011 -0800" }, "message": "bridge: Replace mp-\u003emglist hlist with a bool\n\nAs it turns out we never need to walk through the list of multicast\ngroups subscribed by the bridge interface itself (the only time we\u0027d\nwant to do that is when we shut down the bridge, in which case we\nsimply walk through all multicast groups), we don\u0027t really need to\nkeep an hlist for mp-\u003emglist.\n\nThis means that we can replace it with just a single bit to indicate\nwhether the bridge interface is subscribed to a group.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "24f9cdcbd743fd6adb8fb83688d8d86dcccde662", "tree": "95913d38abc0ec80c4bfa0ca8af478e63de137f8", "parents": [ "6b0d6a9b4296fa16a28d10d416db7a770fc03287" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Fri Feb 11 12:42:07 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 11 21:59:37 2011 -0800" }, "message": "bridge: Fix timer typo that may render snooping less effective\n\nIn a couple of spots where we are supposed to modify the port\ngroup timer (p-\u003etimer) we instead modify the bridge interface\ngroup timer (mp-\u003etimer).\n\nThe effect of this is mostly harmless. However, it can cause\nport subscriptions to be longer than they should be, thus making\nsnooping less effective.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6b0d6a9b4296fa16a28d10d416db7a770fc03287", "tree": "27f21e7dbcd447e7fd0f2d0b75e2c9cd9e7deddf", "parents": [ "946bf5ee3c46f73b5cbd52aab594697b1a132d1f" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Fri Feb 11 12:36:55 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 11 21:59:37 2011 -0800" }, "message": "bridge: Fix mglist corruption that leads to memory corruption\n\nThe list mp-\u003emglist is used to indicate whether a multicast group\nis active on the bridge interface itself as opposed to one of the\nconstituent interfaces in the bridge.\n\nUnfortunately the operation that adds the mp-\u003emglist node to the\nlist neglected to check whether it has already been added. This\nleads to list corruption in the form of nodes pointing to itself.\n\nNormally this would be quite obvious as it would cause an infinite\nloop when walking the list. However, as this list is never actually\nwalked (which means that we don\u0027t really need it, I\u0027ll get rid of\nit in a subsequent patch), this instead is hidden until we perform\na delete operation on the affected nodes.\n\nAs the same node may now be pointed to by more than one node, the\ndelete operations can then cause modification of freed memory.\n\nThis was observed in practice to cause corruption in 512-byte slabs,\nmost commonly leading to crashes in jbd2.\n\nThanks to Josef Bacik for pointing me in the right direction.\n\nReported-by: Ian Page Hands \u003cihands@redhat.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": "bd4a6974cc9090ef3851e5b0a2071e5383565c7c", "tree": "e96ef46426d293b730a305b5185ba5412c9172d4", "parents": [ "2b7bcebf958c74124220ee8103024def8597b36c", "1e6d93e45b231b3ae87c01902ede2315aacfe976" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 04 14:28:58 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 04 14:28:58 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "1158f762e57c1cdcda631c1c5f339e4853caa82b", "tree": "c4e0fa76daa3c8f37312d4de6a3fd587545e920e", "parents": [ "f60ac8e7ab7cbb413a0131d5665b053f9f386526" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@openvz.org", "time": "Fri Feb 04 13:02:36 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 04 13:02:36 2011 -0800" }, "message": "bridge: Don\u0027t put partly initialized fdb into hash\n\nThe fdb_create() puts a new fdb into hash with only addr set. This is\nnot good, since there are callers, that search the hash w/o the lock\nand access all the other its fields.\n\nApplies to current netdev tree.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@openvz.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "acd1130e8793fb150fb522da8ec51675839eb4b1", "tree": "0da6f9f8f7690b426ff069f95bb28bf9e692d534", "parents": [ "04ed3e741d0f133e02bed7fa5c98edba128f90e7" ], "author": { "name": "Michał Mirosław", "email": "mirq-linux@rere.qmqm.pl", "time": "Mon Jan 24 15:45:15 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 24 15:45:15 2011 -0800" }, "message": "net: reduce and unify printk level in netdev_fix_features()\n\nReduce printk() levels to KERN_INFO in netdev_fix_features() as this will\nbe used by ethtool and might spam dmesg unnecessarily.\n\nThis converts the function to use netdev_info() instead of plain printk().\n\nAs a side effect, bonding and bridge devices will now log dropped features\non every slave device change.\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": "04ed3e741d0f133e02bed7fa5c98edba128f90e7", "tree": "3dde4ca8306e98536faa69bccf0e47a2549c088f", "parents": [ "57422dc530115e427dff464cc0a32bcd0efb5008" ], "author": { "name": "Michał Mirosław", "email": "mirq-linux@rere.qmqm.pl", "time": "Mon Jan 24 15:32:47 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 24 15:32:47 2011 -0800" }, "message": "net: change netdev-\u003efeatures to u32\n\nQuoting Ben Hutchings: we presumably won\u0027t be defining features that\ncan only be enabled on 64-bit architectures.\n\nOccurences found by `grep -r` on net/, drivers/net, include/\n\n[ Move features and vlan_features next to each other in\n struct netdev, as per Eric Dumazet\u0027s suggestion -DaveM ]\n\nSigned-off-by: Michał Mirosław \u003cmirq-linux@rere.qmqm.pl\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6faee60a4e82075853a437831768cc9e2e563e4e", "tree": "2e5ae700342b8b24f027b7c7afa198f4bfe2e92f", "parents": [ "255d0dc34068a976550ce555e153c0bfcfec7cc6" ], "author": { "name": "Florian Westphal", "email": "fw@strlen.de", "time": "Mon Dec 20 15:57:47 2010 +0100" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Thu Jan 13 12:05:12 2011 +0100" }, "message": "netfilter: ebt_ip6: allow matching on ipv6-icmp types/codes\n\nTo avoid adding a new match revision icmp type/code are stored\nin the sport/dport area.\n\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nReviewed-by: Holger Eitzenberger \u003cholger@eitzenberger.org\u003e\nReviewed-by: Bart De Schuymer\u003cbdschuym@pandora.be\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "255d0dc34068a976550ce555e153c0bfcfec7cc6", "tree": "e936c3d55eaf144cbc4edf8f9332d8089719d0d4", "parents": [ "b017900aac4a158b9bf7ffdcb8a369a91115b3e4" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sat Dec 18 18:35:15 2010 +0100" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Thu Jan 13 12:05:12 2011 +0100" }, "message": "netfilter: x_table: speedup compat operations\n\nOne iptables invocation with 135000 rules takes 35 seconds of cpu time\non a recent server, using a 32bit distro and a 64bit kernel.\n\nWe eventually trigger NMI/RCU watchdog.\n\nINFO: rcu_sched_state detected stall on CPU 3 (t\u003d6000 jiffies)\n\nCOMPAT mode has quadratic behavior and consume 16 bytes of memory per\nrule.\n\nSwitch the xt_compat algos to use an array instead of list, and use a\nbinary search to locate an offset in the sorted array.\n\nThis halves memory need (8 bytes per rule), and removes quadratic\nbehavior [ O(N*N) -\u003e O(N*log2(N)) ]\n\nTime of iptables goes from 35 s to 150 ms.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "f88de8de5a8c8a8a73960d4432ceef2d38b7f86f", "tree": "cfbbf4195278a69944db9af044ad51b036957f49", "parents": [ "38cfb907a55f3223445151b517b6e4678b8c9d66" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Sat Dec 25 03:41:30 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 06 11:33:05 2011 -0800" }, "message": "net: bridge: check the length of skb after nf_bridge_maybe_copy_header()\n\nSince nf_bridge_maybe_copy_header() may change the length of skb,\nwe should check the length of skb after it to handle the ppoe skbs.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "dbbe68bb12b34f3e450da7a73c20e6fa1f85d63a", "tree": "10f8363cbf5e428c0cb5614959e37b67a7e0cfa2", "parents": [ "7b26e5ebd8b27b0126a84ae7f9a42aa8293d6c48", "9fc3bbb4a752f108cf096d96640f3b548bbbce6c" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 04 11:57:25 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 04 11:57:25 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "1a9180a20f3a314fda3e96b77570cad3864b2896", "tree": "4b8c4f605e283902f03f5ab1113903793823d1b5", "parents": [ "ebd80880c55364d2850e1ff569869245142318e0" ], "author": { "name": "Tomas Winkler", "email": "tomas.winkler@intel.com", "time": "Mon Jan 03 11:08:58 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 03 13:29:18 2011 -0800" }, "message": "net/bridge: fix trivial sparse errors\n\nnet/bridge//br_stp_if.c:148:66: warning: conversion of\nnet/bridge//br_stp_if.c:148:66: int to\nnet/bridge//br_stp_if.c:148:66: int enum umh_wait\n\nnet/bridge//netfilter/ebtables.c:1150:30: warning: Using plain integer as NULL pointer\n\nSigned-off-by: Tomas Winkler \u003ctomas.winkler@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e6f26129ebbb0071016e2526036f42036ccf30e1", "tree": "ba75f3014c9251ceee17c69bd6602603337c6b2e", "parents": [ "9d89081d698132b5f964aea88112f76492563ee9" ], "author": { "name": "Florian Westphal", "email": "fw@strlen.de", "time": "Mon Jan 03 04:16:28 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 03 12:09:33 2011 -0800" }, "message": "bridge: stp: ensure mac header is set\n\ncommit bf9ae5386bca8836c16e69ab8fdbe46767d7452a\n(llc: use dev_hard_header) removed the\nskb_reset_mac_header call from llc_mac_hdr_init.\n\nThis seems fine itself, but br_send_bpdu() invokes ebtables LOCAL_OUT.\n\nWe oops in ebt_basic_match() because it assumes eth_hdr(skb) returns\na meaningful result.\n\nCc: acme@ghostprotocols.net\nReferences: https://bugzilla.kernel.org/show_bug.cgi?id\u003d24532\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9d89081d698132b5f964aea88112f76492563ee9", "tree": "55c1c41e407ea0c8bbbf6444a8cdb16a9da181d0", "parents": [ "2f32c867219734b06abc980d4812f67b6d6fe517" ], "author": { "name": "Tomas Winkler", "email": "tomas.winkler@intel.com", "time": "Mon Jan 03 11:26:08 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 03 11:26:34 2011 -0800" }, "message": "bridge: fix br_multicast_ipv6_rcv for paged skbs\n\nuse pskb_may_pull to access ipv6 header correctly for paged skbs\nIt was omitted in the bridge code leading to crash in blind\n__skb_pull\n\nsince the skb is cloned undonditionally we also simplify the\nthe exit path\n\nthis fixes bug https://bugzilla.kernel.org/show_bug.cgi?id\u003d25202\n\nDec 15 14:36:40 User-PC hostapd: wlan0: STA 00:15:00:60:5d:34 IEEE 802.11: authenticated\nDec 15 14:36:40 User-PC hostapd: wlan0: STA 00:15:00:60:5d:34 IEEE 802.11: associated (aid 2)\nDec 15 14:36:40 User-PC hostapd: wlan0: STA 00:15:00:60:5d:34 RADIUS: starting accounting session 4D0608A3-00000005\nDec 15 14:36:41 User-PC kernel: [175576.120287] ------------[ cut here ]------------\nDec 15 14:36:41 User-PC kernel: [175576.120452] kernel BUG at include/linux/skbuff.h:1178!\nDec 15 14:36:41 User-PC kernel: [175576.120609] invalid opcode: 0000 [#1] SMP\nDec 15 14:36:41 User-PC kernel: [175576.120749] last sysfs file: /sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/uevent\nDec 15 14:36:41 User-PC kernel: [175576.121035] Modules linked in: approvals binfmt_misc bridge stp llc parport_pc ppdev arc4 iwlagn snd_hda_codec_realtek iwlcore i915 snd_hda_intel mac80211 joydev snd_hda_codec snd_hwdep snd_pcm snd_seq_midi drm_kms_helper snd_rawmidi drm snd_seq_midi_event snd_seq snd_timer snd_seq_device cfg80211 eeepc_wmi usbhid psmouse intel_agp i2c_algo_bit intel_gtt uvcvideo agpgart videodev sparse_keymap snd shpchp v4l1_compat lp hid video serio_raw soundcore output snd_page_alloc ahci libahci atl1c\nDec 15 14:36:41 User-PC kernel: [175576.122712]\nDec 15 14:36:41 User-PC kernel: [175576.122769] Pid: 0, comm: kworker/0:0 Tainted: G W 2.6.37-rc5-wl+ #3 1015PE/1016P\nDec 15 14:36:41 User-PC kernel: [175576.123012] EIP: 0060:[\u003cf83edd65\u003e] EFLAGS: 00010283 CPU: 1\nDec 15 14:36:41 User-PC kernel: [175576.123193] EIP is at br_multicast_rcv+0xc95/0xe1c [bridge]\nDec 15 14:36:41 User-PC kernel: [175576.123362] EAX: 0000001c EBX: f5626318 ECX: 00000000 EDX: 00000000\nDec 15 14:36:41 User-PC kernel: [175576.123550] ESI: ec512262 EDI: f5626180 EBP: f60b5ca0 ESP: f60b5bd8\nDec 15 14:36:41 User-PC kernel: [175576.123737] DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068\nDec 15 14:36:41 User-PC kernel: [175576.123902] Process kworker/0:0 (pid: 0, ti\u003df60b4000 task\u003df60a8000 task.ti\u003df60b0000)\nDec 15 14:36:41 User-PC kernel: [175576.124137] Stack:\nDec 15 14:36:41 User-PC kernel: [175576.124181] ec556500 f6d06800 f60b5be8 c01087d8 ec512262 00000030 00000024 f5626180\nDec 15 14:36:41 User-PC kernel: [175576.124181] f572c200 ef463440 f5626300 3affffff f6d06dd0 e60766a4 000000c4 f6d06860\nDec 15 14:36:41 User-PC kernel: [175576.124181] ffffffff ec55652c 00000001 f6d06844 f60b5c64 c0138264 c016e451 c013e47d\nDec 15 14:36:41 User-PC kernel: [175576.124181] Call Trace:\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cc01087d8\u003e] ? sched_clock+0x8/0x10\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cc0138264\u003e] ? enqueue_entity+0x174/0x440\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cc016e451\u003e] ? sched_clock_cpu+0x131/0x190\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cc013e47d\u003e] ? select_task_rq_fair+0x2ad/0x730\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cc0524fc1\u003e] ? nf_iterate+0x71/0x90\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cf83e4914\u003e] ? br_handle_frame_finish+0x184/0x220 [bridge]\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cf83e4790\u003e] ? br_handle_frame_finish+0x0/0x220 [bridge]\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cf83e46e9\u003e] ? br_handle_frame+0x189/0x230 [bridge]\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cf83e4790\u003e] ? br_handle_frame_finish+0x0/0x220 [bridge]\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cf83e4560\u003e] ? br_handle_frame+0x0/0x230 [bridge]\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cc04ff026\u003e] ? __netif_receive_skb+0x1b6/0x5b0\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cc04f7a30\u003e] ? skb_copy_bits+0x110/0x210\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cc0503a7f\u003e] ? netif_receive_skb+0x6f/0x80\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cf82cb74c\u003e] ? ieee80211_deliver_skb+0x8c/0x1a0 [mac80211]\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cf82cc836\u003e] ? ieee80211_rx_handlers+0xeb6/0x1aa0 [mac80211]\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cc04ff1f0\u003e] ? __netif_receive_skb+0x380/0x5b0\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cc016e242\u003e] ? sched_clock_local+0xb2/0x190\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cc012b688\u003e] ? default_spin_lock_flags+0x8/0x10\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cc05d83df\u003e] ? _raw_spin_lock_irqsave+0x2f/0x50\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cf82cd621\u003e] ? ieee80211_prepare_and_rx_handle+0x201/0xa90 [mac80211]\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cf82ce154\u003e] ? ieee80211_rx+0x2a4/0x830 [mac80211]\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cf815a8d6\u003e] ? iwl_update_stats+0xa6/0x2a0 [iwlcore]\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cf8499212\u003e] ? iwlagn_rx_reply_rx+0x292/0x3b0 [iwlagn]\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cc05d83df\u003e] ? _raw_spin_lock_irqsave+0x2f/0x50\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cf8483697\u003e] ? iwl_rx_handle+0xe7/0x350 [iwlagn]\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cf8486ab7\u003e] ? iwl_irq_tasklet+0xf7/0x5c0 [iwlagn]\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cc01aece1\u003e] ? __rcu_process_callbacks+0x201/0x2d0\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cc0150d05\u003e] ? tasklet_action+0xc5/0x100\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cc0150a07\u003e] ? __do_softirq+0x97/0x1d0\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cc05d910c\u003e] ? nmi_stack_correct+0x2f/0x34\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cc0150970\u003e] ? __do_softirq+0x0/0x1d0\nDec 15 14:36:41 User-PC kernel: [175576.124181] \u003cIRQ\u003e\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cc01508f5\u003e] ? irq_exit+0x65/0x70\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cc05df062\u003e] ? do_IRQ+0x52/0xc0\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cc01036b0\u003e] ? common_interrupt+0x30/0x38\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cc03a1fc2\u003e] ? intel_idle+0xc2/0x160\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cc04daebb\u003e] ? cpuidle_idle_call+0x6b/0x100\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cc0101dea\u003e] ? cpu_idle+0x8a/0xf0\nDec 15 14:36:41 User-PC kernel: [175576.124181] [\u003cc05d2702\u003e] ? start_secondary+0x1e8/0x1ee\n\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nCc: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: Tomas Winkler \u003ctomas.winkler@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b4aa9e05a61b845541fa6f5b1d246976922601f0", "tree": "ca94478c3df281ab76a3399f5ba6341ade3f5791", "parents": [ "1dc0f3c54ce1df957f99c17b145488fd03eb1a59", "4b8fe66300acb2fba8b16d62606e0d30204022fc" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 17 12:27:22 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 17 12:27:22 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/bnx2x/bnx2x.h\n\tdrivers/net/wireless/iwlwifi/iwl-1000.c\n\tdrivers/net/wireless/iwlwifi/iwl-6000.c\n\tdrivers/net/wireless/iwlwifi/iwl-core.h\n\tdrivers/vhost/vhost.c\n" }, { "commit": "76d661586c8131453ba75a2e027c1f21511a893a", "tree": "3a3812b18ff0d959edf6be20236dde4eb8f8b524", "parents": [ "fcbdf09d9652c8919dcf47072e3ae7dcb4eb98ac" ], "author": { "name": "David Stevens", "email": "dlstevens@us.ibm.com", "time": "Tue Dec 14 08:42:16 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 16 14:41:23 2010 -0800" }, "message": "bridge: fix IPv6 queries for bridge multicast snooping\n\nThis patch fixes a missing ntohs() for bridge IPv6 multicast snooping.\n\nSigned-off-by: David L Stevens \u003cdlstevens@us.ibm.com\u003e\nAcked-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "deef4b522b814593407cfd56216840c2b75e9f15", "tree": "82e8f89a50e5ac994b50f4aa0c79b5f57d6c3102", "parents": [ "c053fd96d0d3d18c721f880b8fdd0b925894d9c4" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Dec 09 17:38:11 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 10 16:04:53 2010 -0800" }, "message": "bridge: Use consistent NF_DROP returns in nf_pre_routing\n\nThe nf_pre_routing functions in bridging have collected two\ndistinct ways of returning NF_DROP over the years, inline and\nvia goto. There is no reason for preferring either one.\n\nSo this patch arbitrarily picks the inline variant and converts\nthe all the gotos.\n\nAlso removes a redundant comment.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4c0833bcd4d302fe783b9f8286a00ca2999d6200", "tree": "9f93e17facfe15540e51e3b29b6ca0f21a0d235f", "parents": [ "eaa7dcde1d092c792cbca4be81d2e506e84c6122" ], "author": { "name": "Tobias Klauser", "email": "tklauser@distanz.ch", "time": "Fri Dec 10 03:18:04 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 10 13:00:39 2010 -0800" }, "message": "bridge: Fix return values of br_multicast_add_group/br_multicast_new_group\n\nIf br_multicast_new_group returns NULL, we would return 0 (no error) to\nthe caller of br_multicast_add_group, which is not what we want. Instead\nbr_multicast_new_group should return ERR_PTR(-ENOMEM) in this case.\nAlso propagate the error number returned by br_mdb_rehash properly.\n\nSigned-off-by: Tobias Klauser \u003ctklauser@distanz.ch\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "defb3519a64141608725e2dac5a5aa9a3c644bae", "tree": "2f44985e44aef53a0d99991b9f5c2f0eb6dbf4ad", "parents": [ "84b3cdc38cd2882d7ac3c2ae4b6faf5c199874e3" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 08 21:16:57 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 09 10:46:36 2010 -0800" }, "message": "net: Abstract away all dst_entry metrics accesses.\n\nUse helper functions to hide all direct accesses, especially writes,\nto dst_entry metrics values.\n\nThis will allow us to:\n\n1) More easily change how the metrics are stored.\n\n2) Implement COW for metrics.\n\nIn particular this will help us put metrics into the inetpeer\ncache if that is what we end up doing. We can make the _metrics\nmember a pointer instead of an array, initially have it point\nat the read-only metrics in the FIB, and then on the first set\ngrab an inetpeer entry and point the _metrics member there.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\n" }, { "commit": "5811662b15db018c740c57d037523683fd3e6123", "tree": "f820610a6024799a26699f22dc9a4ef5dee07978", "parents": [ "dd68ad2235b4625e0dc928b2b4c614d265f976d3" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Fri Nov 12 18:43:55 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 17 12:27:45 2010 -0800" }, "message": "net: use the macros defined for the members of flowi\n\nUse the macros defined for the members of flowi to clean the code up.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ec1e5610c00c7f5bc530d2aadd47faa473b90a30", "tree": "c3bc845f485911083e47e218e7f01eba4de1bbfd", "parents": [ "b5ed54e94d324f17c97852296d61a143f01b227a" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Nov 15 06:38:14 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 15 11:13:18 2010 -0800" }, "message": "bridge: add RCU annotations to bridge port lookup\n\nbr_port_get() renamed to br_port_get_rtnl() to make clear RTNL is held.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b5ed54e94d324f17c97852296d61a143f01b227a", "tree": "2104d3cde24efc1145bc71beb4b61d79ed841132", "parents": [ "61391cde9eefac5cfcf6d214aa80c77e58b1626b" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Mon Nov 15 06:38:13 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 15 11:13:17 2010 -0800" }, "message": "bridge: fix RCU races with bridge port\n\nThe macro br_port_exists() is not enough protection when only\nRCU is being used. There is a tiny race where other CPU has cleared port\nhandler hook, but is bridge port flag might still be set.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a386f99025f13b32502fe5dedf223c20d7283826", "tree": "63f137ee76576555118ae0ff6a49ee6f0412aa11", "parents": [ "e80516880019aa1f7c5c410276edfea9575ec89f" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Nov 15 06:38:11 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 15 11:13:16 2010 -0800" }, "message": "bridge: add proper RCU annotation to should_route_hook\n\nAdd br_should_route_hook_t typedef, this is the only way we can\nget a clean RCU implementation for function pointer.\n\nMove route_hook to location where it is used.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e80516880019aa1f7c5c410276edfea9575ec89f", "tree": "b17f51f56ef97e5a366f2f5bc3020935d8eb5def", "parents": [ "8a22c99a80b0926585cfcbcc423ee2c49c1fd820" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Nov 15 06:38:10 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 15 11:13:16 2010 -0800" }, "message": "bridge: add RCU annotation to bridge multicast table\n\nAdd modern __rcu annotatations to bridge multicast table.\nUse newer hlist macros to avoid direct access to hlist internals.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1e253c3b8a1aeed51eef6fc366812f219b97de65", "tree": "9263790eba3e34b51131ee8d25ced2f146fc6f1f", "parents": [ "a5c30b349b872aa2ac13babbd5ceb26737f17e95" ], "author": { "name": "Benjamin Poirier", "email": "benjamin.poirier@polymtl.ca", "time": "Mon Oct 18 16:09:35 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 21 04:25:48 2010 -0700" }, "message": "bridge: Forward reserved group addresses if !STP\n\nMake all frames sent to reserved group MAC addresses (01:80:c2:00:00:00 to\n01:80:c2:00:00:0f) be forwarded if STP is disabled. This enables\nforwarding EAPOL frames, among other things.\n\nSigned-off-by: Benjamin Poirier \u003cbenjamin.poirier@polymtl.ca\u003e\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d0280232813a6a5e2bfca6e9257b866352115c09", "tree": "a47baa9bd12f131569c40df4c5c55ee0a6fe8ce3", "parents": [ "11165f1457181e4499e5eada442434a07827ffd8" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Mon Oct 18 14:03:21 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 21 03:09:42 2010 -0700" }, "message": "bridge: make br_parse_ip_options static\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "361ff8a6cf90d62c0071b7e532e37369bfd3ae77", "tree": "f9290f6ad21ebb74ca3632f5d37383a376226675", "parents": [ "d5dbda23804156ae6f35025ade5307a49d1db6d7" ], "author": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Wed Oct 20 13:56:08 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 21 01:26:54 2010 -0700" }, "message": "bridge: Add support for TX vlan offload.\n\nIf some of the underlying devices support it, enable vlan offload on\ntransmit for bridge devices. This allows senders to take advantage of the\nhardware support, similar to other forms of acceleration.\n\nSigned-off-by: Jesse Gross \u003cjesse@nicira.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b738127dfb469bb9f595cdace30e7f881e8146b2", "tree": "a2d79958aa2da098dc38c72973205d516896c54b", "parents": [ "13937911f93ef52ae652f4652761aea6a58d3193" ], "author": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Wed Oct 20 13:56:02 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 21 01:26:50 2010 -0700" }, "message": "vlan: Rename VLAN_GROUP_ARRAY_LEN to VLAN_N_VID.\n\nVLAN_GROUP_ARRAY_LEN is simply the number of possible vlan VIDs.\nSince vlan groups will soon be more of an implementation detail\nfor vlan devices, rename the constant to be descriptive of its\nactual purpose.\n\nSigned-off-by: Jesse Gross \u003cjesse@nicira.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "13937911f93ef52ae652f4652761aea6a58d3193", "tree": "04fd08dd8678f71b0e91239e5fbea43e55d3c23b", "parents": [ "53c90536e96218ed6d60e7ea7a69a92b68805cdf" ], "author": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Wed Oct 20 13:56:01 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 21 01:26:49 2010 -0700" }, "message": "ebtables: Allow filtering of hardware accelerated vlan frames.\n\nAn upcoming commit will allow packets with hardware vlan acceleration\ninformation to be passed though more parts of the network stack, including\npackets trunked through the bridge. This adds support for matching and\nfiltering those packets through ebtables.\n\nSigned-off-by: Jesse Gross \u003cjesse@nicira.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fc66f95c68b6d4535a0ea2ea15d5cf626e310956", "tree": "ac3a7f08ad741a67ff683bf93e5669ddcae95ed7", "parents": [ "0ed8ddf4045fcfcac36bad753dc4046118c603ec" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri Oct 08 06:37:34 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 11 13:06:53 2010 -0700" }, "message": "net dst: use a percpu_counter to track entries\n\nstruct dst_ops tracks number of allocated dst in an atomic_t field,\nsubject to high cache line contention in stress workload.\n\nSwitch to a percpu_counter, to reduce number of time we need to dirty a\ncentral location. Place it on a separate cache line to avoid dirtying\nread only fields.\n\nStress test :\n\n(Sending 160.000.000 UDP frames,\nIP route cache disabled, dual E5540 @2.53GHz,\n32bit kernel, FIB_TRIE, SLUB/NUMA)\n\nBefore:\n\nreal 0m51.179s\nuser 0m15.329s\nsys 10m15.942s\n\nAfter:\n\nreal\t0m45.570s\nuser\t0m15.525s\nsys\t9m56.669s\n\nWith a small reordering of struct neighbour fields, subject of a\nfollowing patch, (to separate refcnt from other read mostly fields)\n\nreal\t0m41.841s\nuser\t0m15.261s\nsys\t8m45.949s\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "462fb2af9788a82a534f8184abfde31574e1cfa0", "tree": "63a8abf3657bb4ce586fdf14c89e6d81ca280725", "parents": [ "aef3ea33e85035f7c827c1db9155f97f4b7ee725" ], "author": { "name": "Bandan Das", "email": "bandan.das@stratus.com", "time": "Sun Sep 19 09:34:33 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Sep 19 12:42:34 2010 -0700" }, "message": "bridge : Sanitize skb before it enters the IP stack\n\nRelated dicussion here : http://lkml.org/lkml/2010/9/3/16\n\nIntroduce a function br_parse_ip_options that will audit the\nskb and possibly refill IP options before a packet enters the\nIP stack. If no options are present, the function will zero out\nthe skb cb area so that it is not misinterpreted as options by some\nunsuspecting IP layer routine. If packet consistency fails, drop it.\n\nSigned-off-by: Bandan Das \u003cbandan.das@stratus.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e548833df83c3554229eff0672900bfe958b45fd", "tree": "85efc4a76dc356593d6d394776aeb845dc580fb6", "parents": [ "cbd9da7be869f676afc204e1a664163778c770bd", "053d8f6622701f849fda2ca2c9ae596c13599ba9" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 09 22:27:33 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 09 22:27:33 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tnet/mac80211/main.c\n" }, { "commit": "87f94b4e91dc042620c527f3c30c37e5127ef757", "tree": "e9e3229e7e25f41cf83cfa782dd6dd47299bc34c", "parents": [ "24cd804d1dc60a74c53da983094df3516500c276" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 01 18:06:39 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 01 19:17:34 2010 -0700" }, "message": "bridge: Clear INET control block of SKBs passed into ip_fragment().\n\nIn a similar vain to commit 17762060c25590bfddd68cc1131f28ec720f405f\n(\"bridge: Clear IPCB before possible entry into IP stack\")\n\nAny time we call into the IP stack we have to make sure the state\nthere is as expected by the ipv4 code.\n\nWith help from Eric Dumazet and Herbert Xu.\n\nReported-by: Bandan Das \u003cbandan.das@stratus.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "aa7c6e5fa08bb5014b6432a690d28748f11e93fc", "tree": "71849c8ddde749739a878dd5e10446e9a3ee06ae", "parents": [ "c5dadddb8c9d310bc263f671f19fe3ba90b329fe" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Tue Aug 24 13:12:56 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 25 16:36:51 2010 -0700" }, "message": "bridge: avoid ethtool on non running interface\n\nIf bridge port is offline, don\u0027t call ethtool to query speed.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "944c794d6437e5301c8769cb242c2b919a5acf59", "tree": "ac398dfc466650b19b08f33dd34de20463041bd5", "parents": [ "b2aff96327545aa5ceb25e3116be69c8b06de703" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@linux-foundation.org", "time": "Tue Aug 24 13:08:10 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 25 16:36:50 2010 -0700" }, "message": "bridge: fix locking comment\n\nThe carrier check is not called from work queue in current code.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4c3a76abd379d9a4668b2d417baa991de9757dc2", "tree": "2b0501957c032c6acbf7dcacc23c0702dacaeca8", "parents": [ "cca77b7c81876d819a5806f408b3c29b5b61a815" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Sun Aug 22 19:03:26 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 23 20:14:36 2010 -0700" }, "message": "bridge: netfilter: fix a memory leak\n\nnf_bridge_alloc() always reset the skb-\u003enf_bridge, so we should always\nput the old one.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: Bart De Schuymer \u003cbdschuym@pandora.be\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c2368e795cec561229ef66a04ac51629b918a9e8", "tree": "2fd08484e8948dc2969ac2d01b00af175b93abb5", "parents": [ "fcb12fd2236f49aa8fdc1568ed4ebdfe4fddc6b5" ], "author": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Sun Aug 22 17:35:32 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Aug 22 21:09:04 2010 -0700" }, "message": "bridge: is PACKET_LOOPBACK unlikely()?\n\nWhile looking at using netdev_rx_handler_register for openvswitch Jesse\nGross suggested that an unlikely() might be worthwhile in that code.\nI\u0027m interested to see if its appropriate for the bridge code.\n\nCc: Jesse Gross \u003cjesse@nicira.com\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "00dad5e479531e379aba7358600cc768725d4f1f", "tree": "652199eacee32c2cf317f5a54da8265973d29978", "parents": [ "c477d0447db08068a497e7beb892b2b2a7bff64b", "3a3dfb062c2e086c202d34f09ce29634515ad256" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 02 22:22:46 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 02 22:22:46 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/e1000e/hw.h\n\tnet/bridge/br_device.c\n\tnet/bridge/br_input.c\n" }, { "commit": "3a7fda06ba48e97650fe44ea8e8a7cc385e1c100", "tree": "115a1d78f4d9c8a45f04ad35029374fe2050884a", "parents": [ "de140b0d511ad86a5dd0888c9095ae030ada2e86" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Jul 29 00:45:30 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 30 23:38:58 2010 -0700" }, "message": "bridge: Allow multicast snooping to be disabled before ifup\n\nCurrently you cannot disable multicast snooping while a device is\ndown. There is no good reason for this restriction and this patch\nremoves it.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6d1d1d398cb7db7a12c5d652d50f85355345234f", "tree": "9075ad9f7889079f91b430e7cc404a7d9cee696a", "parents": [ "a3bdb549e30e7a263f7a589747c40e9c50110315" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Jul 29 01:12:31 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 30 23:36:57 2010 -0700" }, "message": "bridge: Fix skb leak when multicast parsing fails on TX\n\nOn the bridge TX path we\u0027re leaking an skb when br_multicast_rcv\nreturns an error.\n\nReported-by: David Lamparter \u003cequinox@diac24.net\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eeaf61d8891f9c9ed12c1a667e72bf83f0857954", "tree": "daeda447800df1349559268d8f6e79c90dcd22dd", "parents": [ "ff847ac2d3e90edd94674c28bade25ae1e6a2e49" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Tue Jul 27 08:26:30 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 28 10:50:55 2010 -0700" }, "message": "bridge: add rcu_read_lock on transmit\n\nLong ago, when bridge was converted to RCU, rcu lock was equivalent\nto having preempt disabled. RCU has changed a lot since then and\nbridge code was still assuming the since transmit was called with\nbottom half disabled, it was RCU safe.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nTested-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "573201f36fd9c7c6d5218cdcd9948cee700b277d", "tree": "3fdd5cd05e26fdfe38d5d1a72b4d4aa41ecd181f", "parents": [ "45e77d314585869dfe43c82679f7e08c9b35b898" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon Jul 19 19:26:45 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 19 23:28:25 2010 -0700" }, "message": "bridge: Partially disable netpoll support\n\nThe new netpoll code in bridging contains use-after-free bugs\nthat are non-trivial to fix.\n\nThis patch fixes this by removing the code that uses skbs after\nthey\u0027re freed.\n\nAs a consequence, this means that we can no longer call bridge\nfrom the netpoll path, so this patch also removes the controller\nfunction in order to disable netpoll.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n\nThanks,\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bb7a0bd600ac2e09a8747ef89e692a2967ed8c97", "tree": "43ccfd0f128c53ee588bd538e27afc491e6cee1b", "parents": [ "2540ddb5124f883bba3d4af5d8920d44dd66e794" ], "author": { "name": "Kulikov Vasiliy", "email": "segooon@gmail.com", "time": "Thu Jul 15 08:47:33 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 15 20:27:58 2010 -0700" }, "message": "net: bridge: fix sign bug\n\nipv6_skip_exthdr() can return error code that is below zero.\n\u0027offset\u0027 is unsigned, so it makes no sense.\nipv6_skip_exthdr() returns \u0027int\u0027 so we can painlessly change type of\noffset to int.\n\nSigned-off-by: Kulikov Vasiliy \u003csegooon@gmail.com\u003e\nAcked-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "597e608a8492d662736c9bc6aa507dbf1cadc17d", "tree": "6c330cdd0a4809f67dd191b37e34f5b4318cef78", "parents": [ "acbc0f039ff4b93da737c91937b7c70018ded39f", "33b665eeeb85956ccbdf31c4c31a4e2a31133c44" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 07 15:59:38 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 07 15:59:38 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "28172739f0a276eb8d6ca917b3974c2edb036da3", "tree": "b1dc00cfa20c209992e247c6f73601f609f9ca3b", "parents": [ "217d32dc5f299c483ca0d3c8cc6811c72c0339c4" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jul 07 14:58:56 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 07 14:58:56 2010 -0700" }, "message": "net: fix 64 bit counters on 32 bit arches\n\nThere is a small possibility that a reader gets incorrect values on 32\nbit arches. SNMP applications could catch incorrect counters when a\n32bit high part is changed by another stats consumer/provider.\n\nOne way to solve this is to add a rtnl_link_stats64 param to all\nndo_get_stats64() methods, and also add such a parameter to\ndev_get_stats().\n\nRule is that we are not allowed to use dev-\u003estats64 as a temporary\nstorage for 64bit stats, but a caller provided area (usually on stack)\n\nOld drivers (only providing get_stats() method) need no changes.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "17762060c25590bfddd68cc1131f28ec720f405f", "tree": "20f774e21264c70a7d6690377db4cddd811278fc", "parents": [ "7f285fa78d4b81b8458f05e77fb6b46245121b4e" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon Jul 05 21:29:28 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 07 14:43:33 2010 -0700" }, "message": "bridge: Clear IPCB before possible entry into IP stack\n\nThe bridge protocol lives dangerously by having incestuous relations\nwith the IP stack. In this instance an abomination has been created\nwhere a bogus IPCB area from a bridged packet leads to a crash in\nthe IP stack because it\u0027s interpreted as IP options.\n\nThis patch papers over the problem by clearing the IPCB area in that\nparticular spot. To fix this properly we\u0027d also need to parse any\nIP options if present but I\u0027m way too lazy for that.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n\nCheers,\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7f285fa78d4b81b8458f05e77fb6b46245121b4e", "tree": "a4fa0d8e5cd102bb3aed7ad984de31e8a5f7575e", "parents": [ "bcfcc450baaaa44afc1d3c51ef96a53338ff0eb2" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon Jul 05 14:50:08 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 05 20:08:06 2010 -0700" }, "message": "bridge br_multicast: BUG: unable to handle kernel NULL pointer dereference\n\nOn Tue, Jul 06, 2010 at 08:48:35AM +0800, Herbert Xu wrote:\n\u003e\n\u003e bridge: Restore NULL check in br_mdb_ip_get\n\nResend with proper attribution.\n\nbridge: Restore NULL check in br_mdb_ip_get\n\nSomewhere along the line the NULL check in br_mdb_ip_get went\nAWOL, causing crashes when we receive an IGMP packet with no\nmulticast table allocated.\n\nThis patch restores it and ensures all br_mdb_*_get functions\nuse it.\n\nReported-by: Frank Arnold \u003cfrank.arnold@amd.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n\nThanks,\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e490c1defec4236a6a131fe2d13bf7ba787c02f8", "tree": "132325ca88cc86a74345a93b2774c5ca284b038a", "parents": [ "0a17d8c744e44617a3c22e7af68b4c5c9c1c5dba", "4df53d8bab65cf2c18daebd51a5a4847e03f1943" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 22:42:06 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 22:42:06 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6\n" }, { "commit": "4df53d8bab65cf2c18daebd51a5a4847e03f1943", "tree": "f776c088d9d525672eac2e95ef1d183e52d88837", "parents": [ "7eb9282cd0efac08b8377cbd5037ba297c77e3f7" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jul 02 09:32:57 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jul 02 09:32:57 2010 +0200" }, "message": "bridge: add per bridge device controls for invoking iptables\n\nSupport more fine grained control of bridge netfilter iptables invocation\nby adding seperate brnf_call_*tables parameters for each device using the\nsysfs interface. Packets are passed to layer 3 netfilter when either the\nglobal parameter or the per bridge parameter is enabled.\n\nAcked-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "8244132ea89cdd128003f5b9980fab50d8d36d72", "tree": "c6cf9327cf9b6bab5bb830bbf389a514f4d7bb95", "parents": [ "7b2ff18ee7b0ec4bc3162f821e221781aaca48bd", "38000a94a902e94ca8b5498f7871c6316de8957a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 23 18:26:27 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 23 18:26:27 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tnet/ipv4/ip_output.c\n" }, { "commit": "406818ff347cbbdae2fb21fafd1939d00cf479c5", "tree": "02c6a4d90b4a810ed28a3e61e486cf00c9404bbd", "parents": [ "16b8a4761cbe5082cd35641c066d7c4b6b83cdca" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jun 23 13:00:48 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 23 13:00:48 2010 -0700" }, "message": "bridge: 64bit rx/tx counters\n\nUse u64_stats_sync infrastructure to provide 64bit rx/tx\ncounters even on 32bit hosts.\n\nIt is safe to use a single u64_stats_sync for rx and tx,\nbecause BH is disabled on both, and we use per_cpu data.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "25442e06d20aaba7d7b16438078a562b3e4cf19b", "tree": "93df63e0e4f35d6d649150e2c49aa47af62961dd", "parents": [ "aabef8b240880439b91574c9a9e33dcc44bfd8c7" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Tue Jun 15 06:14:12 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 17 13:49:14 2010 -0700" }, "message": "bridge: fdb cleanup runs too often\n\nIt is common in end-node, non STP bridges to set forwarding\ndelay to zero; which causes the forwarding database cleanup\nto run every clock tick. Change to run only as soon as needed\nor at next ageing timer interval which ever is sooner.\n\nUse round_jiffies_up macro rather than attempting round up\nby changing value.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9f70b0fcecd134890affe627aa2823591313a413", "tree": "c702044dcd2e0f698ee7ccc2ef905f092f9a6c75", "parents": [ "5933dd2f028cdcbb4b3169dca594324704ba10ae" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Jun 15 21:43:48 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 21:43:48 2010 -0700" }, "message": "bridge: Add const to dummy br_netpoll_send_skb\n\nThe version of br_netpoll_send_skb used when netpoll is off is\nmissing a const thus causing a warning.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fed396a585d8e1870b326f2e8e1888a72957abb8", "tree": "b2a291facdc6a259e1851db9a120d05bf5422795", "parents": [ "7e43cd66d36e8f0900e87d9d287c9ee649cbdd07" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Jun 15 21:43:07 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 21:43:07 2010 -0700" }, "message": "bridge: Fix OOM crash in deliver_clone\n\nThe bridge multicast patches introduced an OOM crash in the forward\npath, when deliver_clone fails to clone the skb.\n\nReported-by: Mark Wagner \u003cmwagner@redhat.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": "16fb62b6b4d57339a0ec931b3fb8c8d0ca6414e8", "tree": "a1041342f31a626baf3a08d09d5c81a65dd8ef28", "parents": [ "a3433f35a55f7604742cae620c6dc6edfc70db6a", "f9181f4ffc71d7b7dd1906c9a11d51d6659220ae" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 13:49:24 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 13:49:24 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6\n" }, { "commit": "f350a0a87374418635689471606454abc7beaa3a", "tree": "c8210542a9848f6b5953b58d2ba1dbfb11715f14", "parents": [ "a35e2c1b6d90544b3c688783869817628e5f9607" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Tue Jun 15 06:50:45 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 11:48:58 2010 -0700" }, "message": "bridge: use rx_handler_data pointer to store net_bridge_port pointer\n\nRegister net_bridge_port pointer as rx_handler data pointer. As br_port is\nremoved from struct net_device, another netdev priv_flag is added to indicate\nthe device serves as a bridge port. Also rcuized pointers are now correctly\ndereferenced in br_fdb.c and in netfilter parts.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "93e2c32b5cb2ad92ceb1d7a4684f20a0d25bf530", "tree": "c15af2642af01702097ade735506d15d7a910c54", "parents": [ "91d2c34a4eed32876ca333b0ca44f3bc56645805" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Thu Jun 10 03:34:59 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 11:47:11 2010 -0700" }, "message": "net: add rx_handler data pointer\n\nAdd possibility to register rx_handler data pointer along with a rx_handler.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "91d2c34a4eed32876ca333b0ca44f3bc56645805", "tree": "26799e5cb1dff486a0695e1be8618064d12fe0bd", "parents": [ "c18370f5b2949d9cca519355f33690b75e1e7c8b" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Jun 10 16:12:50 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 11:00:40 2010 -0700" }, "message": "bridge: Fix netpoll support\n\nThere are multiple problems with the newly added netpoll support:\n\n1) Use-after-free on each netpoll packet.\n2) Invoking unsafe code on netpoll/IRQ path.\n3) Breaks when netpoll is enabled on the underlying device.\n\nThis patch fixes all of these problems. In particular, we now\nallocate proper netpoll structures for each underlying device.\n\nWe only allow netpoll to be enabled on the bridge when all the\ndevices underneath it support netpoll. Once it is enabled, we\ndo not allow non-netpoll devices to join the bridge (until netpoll\nis disabled again).\n\nThis allows us to do away with the npinfo juggling that caused\nproblem number 1.\n\nIncidentally this patch fixes number 2 by bypassing unsafe code\nsuch as multicast snooping and netfilter.\n\nReported-by: Qianfeng Zhang \u003cfrzhang@redhat.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": "36655042f9873efc2a90d251b9aef9b6b79d75d8", "tree": "a659ea763ee546fc695456581de4a0b1ba17bb0b", "parents": [ "c04ec8063d3a89e5ae933c7b4be04476fe65c6de" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Jun 10 16:12:43 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 10:58:38 2010 -0700" }, "message": "bridge: Remove redundant npinfo NULL setting\n\nNow that netpoll always zaps npinfo we no longer need to do it\nin bridge.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f9181f4ffc71d7b7dd1906c9a11d51d6659220ae", "tree": "194f22e8216a1b9ee2c0dd019142202d73a7dc87", "parents": [ "0902b469bd25065aa0688c3cee6f11744c817e7c", "1ab6c163dee279559e3a62d774af7e4c4c9b4c67" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Jun 15 17:31:06 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Jun 15 17:31:06 2010 +0200" }, "message": "Merge branch \u0027master\u0027 of /repos/git/net-next-2.6\n\nConflicts:\n\tinclude/net/netfilter/xt_rateest.h\n\tnet/bridge/br_netfilter.c\n\tnet/netfilter/nf_conntrack_core.c\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "d8d1f30b95a635dbd610dcc5eb641aca8f4768cf", "tree": "71424d82a96facd5fcf05cc769ef2ba52b584aeb", "parents": [ "592fcb9dfafaa02dd0edc207bf5d3a0ee7a1f8df" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Thu Jun 10 23:31:35 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 10 23:31:35 2010 -0700" }, "message": "net-next: remove useless union keyword\n\nremove useless union keyword in rtable, rt6_info and dn_route.\n\nSince there is only one member in a union, the union keyword isn\u0027t useful.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ab95bfe01f9872459c8678572ccadbf646badad0", "tree": "8e11f94077c9a80f7af52ce3dd50591a686561d7", "parents": [ "20c59de2e6b6bc74bbf714dcd4e720afe8d516cf" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Tue Jun 01 21:52:08 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 02 07:11:15 2010 -0700" }, "message": "net: replace hooks in __netif_receive_skb V5\n\nWhat this patch does is it removes two receive frame hooks (for bridge and for\nmacvlan) from __netif_receive_skb. These are replaced them with a single\nhook for both. It only supports one hook per device because it makes no\nsense to do bridging and macvlan on the same device.\n\nThen a network driver (of virtual netdev like macvlan or bridge) can register\nan rx_handler for needed net device.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a8b563894d6fee9b90b7d6ed76f8ec28ad45bcbe", "tree": "6171cda0a5668f2fa0c6570bb37a4a01cbb5f718", "parents": [ "0da529a7d996f100569040857ddf4d63a1b24e82" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Jun 01 11:48:31 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Jun 01 11:48:31 2010 +0200" }, "message": "netfilter: br_netfilter: use skb_set_noref()\n\nAvoid dirtying bridge_parent_rtable refcount, using new dst noref\ninfrastructure.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "2c3c8bea608866d8bd9dcf92657d57fdcac011c5", "tree": "f509b958d0a65c46c831dbdd447a81e706dd995a", "parents": [ "68d75ed4b84a0806ecd4bc14da4759713b23a532" ], "author": { "name": "Chris Wright", "email": "chrisw@sous-sol.org", "time": "Wed May 12 18:28:57 2010 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri May 21 09:37:31 2010 -0700" }, "message": "sysfs: add struct file* to bin_attr callbacks\n\nThis allows bin_attr-\u003eread,write,mmap callbacks to check file specific data\n(such as inode owner) as part of any privilege validation.\n\nSigned-off-by: Chris Wright \u003cchrisw@sous-sol.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "b3bcb72edb29c52fb0a065d5b1c7cf40ed9287f4", "tree": "4320495c0712e00230391404585a7cb26ba21985", "parents": [ "e7971c80a8e0299f91272ad8e8ac4167623e1862" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Tue May 18 12:26:27 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 18 12:26:27 2010 -0700" }, "message": "bridge: fix build for CONFIG_SYSFS disabled\n\nFix build when CONFIG_SYSFS is not enabled:\nnet/bridge/br_if.c:136: error: \u0027struct net_bridge_port\u0027 has no member named \u0027sysfs_name\u0027\n\nNote: dev-\u003ename \u003d\u003d sysfs_name except when change name is in\nprogress, and we are protected from that by RTNL mutex.\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nAcked-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e0f43752a942b7be1bc06b9fd74e20ae337c1cca", "tree": "892d0fbc2ecae39f2e5c4a7b711cbb988c8dc3f1", "parents": [ "28a16c97963d3bc36a2c192859f6d8025ef2967a" ], "author": { "name": "Simon Arlott", "email": "simon@fire.lp0.eu", "time": "Mon May 10 09:31:11 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat May 15 23:10:15 2010 -0700" }, "message": "bridge: update sysfs link names if port device names have changed\n\nLinks for each port are created in sysfs using the device\nname, but this could be changed after being added to the\nbridge.\n\nAs well as being unable to remove interfaces after this\noccurs (because userspace tools don\u0027t recognise the new\nname, and the kernel won\u0027t recognise the old name), adding\nanother interface with the old name to the bridge will\ncause an error trying to create the sysfs link.\n\nThis fixes the problem by listening for NETDEV_CHANGENAME\nnotifications and renaming the link.\n\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d12743\n\nSigned-off-by: Simon Arlott \u003csimon@fire.lp0.eu\u003e\nAcked-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "28a16c97963d3bc36a2c192859f6d8025ef2967a", "tree": "01d21938502412959c88757df973cc5a770d1cce", "parents": [ "cfb478da70f2213520866c84cb0aea0d7c0e1148" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Mon May 10 09:31:09 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat May 15 23:10:02 2010 -0700" }, "message": "bridge: change console message interface\n\nUse one set of macro\u0027s for all bridge messages.\n\nNote: can\u0027t use netdev_XXX macro\u0027s because bridge is purely\nvirtual and has no device parent.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cfb478da70f2213520866c84cb0aea0d7c0e1148", "tree": "bc1a1ea16bbb2be0481d3231a2fbe5611437da55", "parents": [ "c17b274dc2aa538b68c1f02b01a3c4e124b435ba" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Mon May 10 09:31:08 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat May 15 23:10:01 2010 -0700" }, "message": "bridge: netpoll cleanup\n\nMove code around so that the ifdef for NETPOLL_CONTROLLER don\u0027t have to\nshow up in main code path. The control functions should be in helpers\nthat are only compiled if needed.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e94c67436efa22af7d8b7d19c885863246042543", "tree": "5c5d926d483ba92b7a52fdf5782cd73010617bcf", "parents": [ "cba7a98a474a4f2a9316473734ba76829191a78a" ], "author": { "name": "Bart De Schuymer", "email": "bdschuym@pandora.be", "time": "Thu May 13 14:55:34 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu May 13 14:55:34 2010 +0200" }, "message": "netfilter: bridge-netfilter: fix crash in br_nf_forward_finish()\n\n[ 4593.956206] BUG: unable to handle kernel NULL pointer dereference at 0000000000000018\n[ 4593.956219] IP: [\u003cffffffffa03357a4\u003e] br_nf_forward_finish+0x154/0x170 [bridge]\n[ 4593.956232] PGD 195ece067 PUD 1ba005067 PMD 0\n[ 4593.956241] Oops: 0000 [#1] SMP\n[ 4593.956248] last sysfs file:\n/sys/devices/LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:08/ATK0110:00/hwmon/hwmon0/temp2_label\n[ 4593.956253] CPU 3\n...\n[ 4593.956380] Pid: 29512, comm: kvm Not tainted 2.6.34-rc7-net #195 P6T DELUXE/System Product Name\n[ 4593.956384] RIP: 0010:[\u003cffffffffa03357a4\u003e] [\u003cffffffffa03357a4\u003e] br_nf_forward_finish+0x154/0x170 [bridge]\n[ 4593.956395] RSP: 0018:ffff880001e63b78 EFLAGS: 00010246\n[ 4593.956399] RAX: 0000000000000608 RBX: ffff880057181700 RCX: ffff8801b813d000\n[ 4593.956402] RDX: 0000000000000000 RSI: 0000000000000002 RDI: ffff880057181700\n[ 4593.956406] RBP: ffff880001e63ba8 R08: ffff8801b9d97000 R09: ffffffffa0335650\n[ 4593.956410] R10: 0000000000000000 R11: 0000000000000000 R12: ffff8801b813d000\n[ 4593.956413] R13: ffffffff81ab3940 R14: ffff880057181700 R15: 0000000000000002\n[ 4593.956418] FS: 00007fc40d380710(0000) GS:ffff880001e60000(0000) knlGS:0000000000000000\n[ 4593.956422] CS: 0010 DS: 002b ES: 002b CR0: 000000008005003b\n[ 4593.956426] CR2: 0000000000000018 CR3: 00000001ba1d7000 CR4: 00000000000026e0\n[ 4593.956429] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000\n[ 4593.956433] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400\n[ 4593.956437] Process kvm (pid: 29512, threadinfo ffff8801ba566000, task ffff8801b8003870)\n[ 4593.956441] Stack:\n[ 4593.956443] 0000000100000020 ffff880001e63ba0 ffff880001e63ba0 ffff880057181700\n[ 4593.956451] \u003c0\u003e ffffffffa0335650 ffffffff81ab3940 ffff880001e63bd8 ffffffffa03350e6\n[ 4593.956462] \u003c0\u003e ffff880001e63c40 000000000000024d ffff880057181700 0000000080000000\n[ 4593.956474] Call Trace:\n[ 4593.956478] \u003cIRQ\u003e\n[ 4593.956488] [\u003cffffffffa0335650\u003e] ? br_nf_forward_finish+0x0/0x170 [bridge]\n[ 4593.956496] [\u003cffffffffa03350e6\u003e] NF_HOOK_THRESH+0x56/0x60 [bridge]\n[ 4593.956504] [\u003cffffffffa0335282\u003e] br_nf_forward_arp+0x112/0x120 [bridge]\n[ 4593.956511] [\u003cffffffff813f7184\u003e] nf_iterate+0x64/0xa0\n[ 4593.956519] [\u003cffffffffa032f920\u003e] ? br_forward_finish+0x0/0x60 [bridge]\n[ 4593.956524] [\u003cffffffff813f722c\u003e] nf_hook_slow+0x6c/0x100\n[ 4593.956531] [\u003cffffffffa032f920\u003e] ? br_forward_finish+0x0/0x60 [bridge]\n[ 4593.956538] [\u003cffffffffa032f800\u003e] ? __br_forward+0x0/0xc0 [bridge]\n[ 4593.956545] [\u003cffffffffa032f86d\u003e] __br_forward+0x6d/0xc0 [bridge]\n[ 4593.956550] [\u003cffffffff813c5d8e\u003e] ? skb_clone+0x3e/0x70\n[ 4593.956557] [\u003cffffffffa032f462\u003e] deliver_clone+0x32/0x60 [bridge]\n[ 4593.956564] [\u003cffffffffa032f6b6\u003e] br_flood+0xa6/0xe0 [bridge]\n[ 4593.956571] [\u003cffffffffa032f800\u003e] ? __br_forward+0x0/0xc0 [bridge]\n\nDon\u0027t call nf_bridge_update_protocol() for ARP traffic as skb-\u003enf_bridge isn\u0027t\nused in the ARP case.\n\nReported-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: Bart De Schuymer \u003cbdschuym@pandora.be\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "cba7a98a474a4f2a9316473734ba76829191a78a", "tree": "28a0ab87dba93385353bedb76a26a1fc45b3a0c6", "parents": [ "d250fe91ae129bff0968e685cc9c466d3a5e3482", "4538506be386f9736b83bf9892f829adbbb70fea" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue May 11 18:59:21 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue May 11 18:59:21 2010 +0200" }, "message": "Merge branch \u0027master\u0027 of git://dev.medozas.de/linux\n" } ], "next": "b4ba26119b06052888696491f614201817491a0d" }