)]}' { "log": [ { "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" }, { "commit": "b4ba26119b06052888696491f614201817491a0d", "tree": "d6dc2a4e0f78641b5b64a1728322c81cbad09974", "parents": [ "62fc8051083a334578c3f4b3488808f210b4565f" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Tue Jul 07 20:54:30 2009 +0200" }, "committer": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Tue May 11 18:35:27 2010 +0200" }, "message": "netfilter: xtables: change hotdrop pointer to direct modification\n\nSince xt_action_param is writable, let\u0027s use it. The pointer to\n\u0027bool hotdrop\u0027 always worried (8 bytes (64-bit) to write 1 byte!).\nSurprisingly results in a reduction in size:\n\n text data bss filename\n5457066 692730 357892 vmlinux.o-prev\n5456554 692730 357892 vmlinux.o\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\n" }, { "commit": "62fc8051083a334578c3f4b3488808f210b4565f", "tree": "9f48eb26316b19b0b8c010d774f3c936315c1aa1", "parents": [ "4b560b447df83368df44bd3712c0c39b1d79ba04" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Tue Jul 07 20:42:08 2009 +0200" }, "committer": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Tue May 11 18:33:37 2010 +0200" }, "message": "netfilter: xtables: deconstify struct xt_action_param for matches\n\nIn future, layer-3 matches will be an xt module of their own, and\nneed to set the fragoff and thoff fields. Adding more pointers would\nneedlessy increase memory requirements (esp. so for 64-bit, where\npointers are wider).\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\n" }, { "commit": "4b560b447df83368df44bd3712c0c39b1d79ba04", "tree": "b445a292e8caf1bcbfb950f461af5f86e7263c01", "parents": [ "de74c16996287250f0d947663127f80c6beebd3c" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Sun Jul 05 19:43:26 2009 +0200" }, "committer": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Tue May 11 18:31:17 2010 +0200" }, "message": "netfilter: xtables: substitute temporary defines by final name\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\n" }, { "commit": "de74c16996287250f0d947663127f80c6beebd3c", "tree": "c7e77e254c5812c8561516dd668eaec732a89a0d", "parents": [ "ef53d702c3614fb919e8a8291033e3dbccfd1aea" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Sun Jul 05 18:26:37 2009 +0200" }, "committer": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Tue May 11 18:23:43 2010 +0200" }, "message": "netfilter: xtables: combine struct xt_match_param and xt_target_param\n\nThe structures carried - besides match/target - almost the same data.\nIt is possible to combine them, as extensions are evaluated serially,\nand so, the callers end up a little smaller.\n\n text data bss filename\n-15318 740 104 net/ipv4/netfilter/ip_tables.o\n+15286 740 104 net/ipv4/netfilter/ip_tables.o\n-15333 540 152 net/ipv6/netfilter/ip6_tables.o\n+15269 540 152 net/ipv6/netfilter/ip6_tables.o\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\n" }, { "commit": "1e4b1057121bc756b91758a434b504d2010f6088", "tree": "b016cf2c728289c7e36d9e4e488f30ab0bd0ae6e", "parents": [ "3b254c54ec46eb022cb26ee6ab37fae23f5f7d6a", "3ee943728fff536edaf8f59faa58aaa1aa7366e3" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon May 10 18:39:28 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon May 10 18:39:28 2010 +0200" }, "message": "Merge branch \u0027master\u0027 of /repos/git/net-next-2.6\n\nConflicts:\n\tnet/bridge/br_device.c\n\tnet/bridge/br_forward.c\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "c06ee961d3c0e51009cbd0e123b61fbb97f37d0b", "tree": "5d5899374a6f32f5ab77a78e6baeeb4a122a4721", "parents": [ "0e34e93177fb1f642cab080e0bde664c06c7183a" ], "author": { "name": "WANG Cong", "email": "amwang@redhat.com", "time": "Thu May 06 00:48:24 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 06 00:48:24 2010 -0700" }, "message": "bridge: make bridge support netpoll\n\nBased on the previous patch, make bridge support netpoll by:\n\n1) implement the 2 methods to support netpoll for bridge;\n\n2) modify netpoll during forwarding packets via bridge;\n\n3) disable netpoll support of bridge when a netpoll-unabled device\n is added to bridge;\n\n4) enable netpoll support when all underlying devices support netpoll.\n\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nCc: Stephen Hemminger \u003cshemminger@linux-foundation.org\u003e\nCc: Matt Mackall \u003cmpm@selenic.com\u003e\nSigned-off-by: WANG Cong \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "afe0159d935ab731c682e811356914bb2be9470c", "tree": "db34bd3e0fc3289f1a92a7096e6efba2dbe81122", "parents": [ "83f6a740b4e52f88e312223df2fc94016a208618" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Tue Apr 27 15:01:07 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 27 18:13:55 2010 -0700" }, "message": "bridge: multicast_flood cleanup\n\nMove some declarations around to make it clearer which variables\nare being used inside loop.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "83f6a740b4e52f88e312223df2fc94016a208618", "tree": "7cb24cc5a3a5779fe3dd9fbba3351cac19062b1f", "parents": [ "168d40ee3d147ae20860e7916bd79b636cbe8fd5" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Tue Apr 27 15:01:06 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 27 18:13:54 2010 -0700" }, "message": "bridge: multicast port group RCU fix\n\nThe recently introduced bridge mulitcast port group list was only\npartially using RCU correctly. It was missing rcu_dereference()\nand missing the necessary barrier on deletion.\n\nThe code should have used one of the standard list methods (list or hlist)\ninstead of open coding a RCU based link list.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "168d40ee3d147ae20860e7916bd79b636cbe8fd5", "tree": "533403c281c8d397d7c061fc295f4d2b07dfaa0c", "parents": [ "7e80c124485b73146deadce14fd4da2054581806" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Tue Apr 27 15:01:05 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 27 18:13:54 2010 -0700" }, "message": "bridge: multicast flood\n\nFix unsafe usage of RCU. Would never work on Alpha SMP because\nof lack of rcu_dereference()\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7e80c124485b73146deadce14fd4da2054581806", "tree": "da7349b9a75f669bd317729543a51406c778727c", "parents": [ "dcd79aebe736e88d62aeb4a7712ac0ba7cc2aa96" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Tue Apr 27 15:01:04 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 27 18:13:53 2010 -0700" }, "message": "bridge: simplify multicast_add_router\n\nBy coding slightly differently, there are only two cases\nto deal with: add at head and add after previous entry.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "709b9326ef6fc1b7e379d47d5f39ebc27dad3f4d", "tree": "5f0355d2f858d641317f856f8a369bc0f54c59af", "parents": [ "2a1f8794161d9d5d46881160279df62767197526" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 27 16:49:58 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 27 16:49:58 2010 -0700" }, "message": "Revert \"bridge: Use hlist_for_each_entry_rcu() in br_multicast_add_router()\"\n\nThis reverts commit ff65e8275f6c96a5eda57493bd84c4555decf7b3.\n\nAs explained by Stephen Hemminger, the traversal doesn\u0027t require\nRCU handling as we hold a lock.\n\nThe list addition et al. calls, on the other hand, do.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ff65e8275f6c96a5eda57493bd84c4555decf7b3", "tree": "4ab76a13f54c13117274a9f85e6180822474410e", "parents": [ "87b6cf51acb4999fff7e6841986874b108679cb4" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 27 16:26:49 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 27 16:26:49 2010 -0700" }, "message": "bridge: Use hlist_for_each_entry_rcu() in br_multicast_add_router()\n\nNoticed by Michał Mirosław.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "dcdca2c49bb6328bbc7cd8d73434c308b5dd0df2", "tree": "a9cbb45b1cd4cffae2279f18989c5a40887a1b72", "parents": [ "7180f7751d5a1b6f1ef40285b5e928970cdd5306" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Tue Apr 27 07:13:11 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 27 12:53:24 2010 -0700" }, "message": "bridge: multicast router list manipulation\n\nI prefer that the hlist be only accessed through the hlist macro\nobjects. Explicit twiddling of links (especially with RCU) exposes\nthe code to future bugs.\n\nCompile tested only.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7180f7751d5a1b6f1ef40285b5e928970cdd5306", "tree": "5268bca14d3761439c3eb1799aad4c5b890a1971", "parents": [ "e1703b36c358dde24ececba4fd609ecd91433ba3" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Tue Apr 27 07:13:06 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 27 12:53:24 2010 -0700" }, "message": "bridge: use is_multicast_ether_addr\n\nUse existing inline function.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d4c4f07df16c767b8efbc44e7cdf795fac326b33", "tree": "109c8d4ebf15d2631d6606a30a1a99eeb6f6c1fa", "parents": [ "1fafc7a9353ef68e1b8d4bb130cb6402cf7dfd5a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 27 10:16:54 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 27 10:16:54 2010 -0700" }, "message": "bridge: Fix build of ipv6 multicast code.\n\nBased upon a report from Stephen Rothwell:\n\n--------------------\nnet/bridge/br_multicast.c: In function \u0027br_ip6_multicast_alloc_query\u0027:\nnet/bridge/br_multicast.c:469: error: implicit declaration of function \u0027csum_ipv6_magic\u0027\n\nIntroduced by commit 08b202b6726459626c73ecfa08fcdc8c3efc76c2 (\"bridge\nbr_multicast: IPv6 MLD support\") from the net tree.\n\ncsum_ipv6_magic is declared in net/ip6_checksum.h ...\n--------------------\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1fafc7a9353ef68e1b8d4bb130cb6402cf7dfd5a", "tree": "5e75cffd4a8ff91cd3f73d39db70ad784cf36565", "parents": [ "4a4771a58e13b46bfdc999fe481e550f8c6937ff" ], "author": { "name": "YOSHIFUJI Hideaki / 吉藤英明", "email": "yoshfuji@linux-ipv6.org", "time": "Sun Apr 25 08:06:40 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 26 11:26:58 2010 -0700" }, "message": "bridge br_multicast: Ensure to initialize BR_INPUT_SKB_CB(skb)-\u003emrouters_only.\n\nEven with commit 32dec5dd0233ebffa9cae25ce7ba6daeb7df4467 (\"bridge\nbr_multicast: Don\u0027t refer to BR_INPUT_SKB_CB(skb)-\u003emrouters_only\nwithout IGMP snooping.\"), BR_INPUT_SKB_CB(skb)-\u003emrouters_only is\nnot appropriately initialized if IGMP/MLD snooping support is\ncompiled and disabled, so we can see garbage.\n\nSigned-off-by: YOSHIFUJI Hideaki \u003cyoshfuji@linux-ipv6.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "08b202b6726459626c73ecfa08fcdc8c3efc76c2", "tree": "1d4c3ac1584cf445beb6de2e2fd6f22ee64d23ae", "parents": [ "8ef2a9a59854994bace13b5c4f7edc2c8d4d124e" ], "author": { "name": "YOSHIFUJI Hideaki", "email": "yoshfuji@linux-ipv6.org", "time": "Fri Apr 23 01:54:22 2010 +0900" }, "committer": { "name": "YOSHIFUJI Hideaki", "email": "yoshfuji@linux-ipv6.org", "time": "Fri Apr 23 13:35:56 2010 +0900" }, "message": "bridge br_multicast: IPv6 MLD support.\n\nSigned-off-by: YOSHIFUJI Hideaki \u003cyoshfuji@linux-ipv6.org\u003e\n" }, { "commit": "8ef2a9a59854994bace13b5c4f7edc2c8d4d124e", "tree": "ef123540d1bb398ec1c6cc9b713425e1da8b5f04", "parents": [ "6e7cb8370760ec17e10098399822292def8d84f3" ], "author": { "name": "YOSHIFUJI Hideaki", "email": "yoshfuji@linux-ipv6.org", "time": "Sun Apr 18 12:42:07 2010 +0900" }, "committer": { "name": "YOSHIFUJI Hideaki", "email": "yoshfuji@linux-ipv6.org", "time": "Fri Apr 23 13:35:55 2010 +0900" }, "message": "bridge br_multicast: Make functions less ipv4 dependent.\n\nIntroduce struct br_ip{} to store ip address and protocol\nand make functions more generic so that we can support\nboth IPv4 and IPv6 with less pain.\n\nSigned-off-by: YOSHIFUJI Hideaki \u003cyoshfuji@linux-ipv6.org\u003e\n" }, { "commit": "87eb367003887cdc81a5d183efea227b5b488961", "tree": "40f617e25a9364d573e3cd2189c9e7fa56c8a0fe", "parents": [ "ccb7c7732e2ceb4e81a7806faf1670be9681ccd2", "05d17608a69b3ae653ea5c9857283bef3439c733" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 21 01:14:25 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 21 01:14:25 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/wireless/iwlwifi/iwl-6000.c\n\tnet/core/dev.c\n" }, { "commit": "0eae88f31ca2b88911ce843452054139e028771f", "tree": "90f50197d8e1e50e3621e9c525bd4ca2634fe368", "parents": [ "cb903bf4ee2d6e53210e2174d363e10698112042" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Apr 20 19:06:52 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 20 19:06:52 2010 -0700" }, "message": "net: Fix various endianness glitches\n\nSparse can help us find endianness bugs, but we need to make some\ncleanups to be able to more easily spot real bugs.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8eabf95cb17253a3ac72b1a62ce8a80b3efecd62", "tree": "bed6cb45424195ce5dae4c92948e69cd04786e5d", "parents": [ "e46754f8c9333170f11780d8e3a70da1b1a88338" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Apr 20 03:20:05 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 20 18:51:57 2010 -0700" }, "message": "bridge: add a missing ntohs()\n\ngrec_nsrcs is in network order, we should convert to host horder in\nbr_multicast_igmp3_report()\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6c79bf0f2440fd250c8fce8d9b82fcf03d4e8350", "tree": "408e0680cac66c1a2ab6350de15a9c623da905a7", "parents": [ "62910554656cdcd6b6f84a5154c4155aae4ca231" ], "author": { "name": "Bart De Schuymer", "email": "bdschuym@pandora.be", "time": "Tue Apr 20 16:22:01 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Apr 20 16:22:01 2010 +0200" }, "message": "netfilter: bridge-netfilter: fix refragmenting IP traffic encapsulated in PPPoE traffic\n\nThe MTU for IP traffic encapsulated inside PPPoE traffic is smaller\nthan the MTU of the Ethernet device (1500). Connection tracking\ngathers all IP packets and sometimes will refragment them in\nip_fragment(). We then need to subtract the length of the\nencapsulating header from the mtu used in ip_fragment(). The check in\nbr_nf_dev_queue_xmit() which determines if ip_fragment() has to be\ncalled is also updated for the PPPoE-encapsulated packets.\nnf_bridge_copy_header() is also updated to make sure the PPPoE data\nlength field has the correct value.\n\nSigned-off-by: Bart De Schuymer \u003cbdschuym@pandora.be\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "62910554656cdcd6b6f84a5154c4155aae4ca231", "tree": "dcf14004f6fd2ef7154362ff948bfeba0f3ea92d", "parents": [ "22265a5c3c103cf8c50be62e6c90d045eb649e6d", "ab9304717f7624c41927f442e6b6d418b2d8b3e4" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Apr 20 16:02:01 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Apr 20 16:02:01 2010 +0200" }, "message": "Merge branch \u0027master\u0027 of /repos/git/net-next-2.6\n\nConflicts:\n\tDocumentation/feature-removal-schedule.txt\n\tnet/ipv6/netfilter/ip6t_REJECT.c\n\tnet/netfilter/xt_limit.c\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "e179e6322ac334e21a3c6d669d95bc967e5d0a80", "tree": "eee21d4e85ffeed02c6a25a8b224845cb9ed0fd2", "parents": [ "ea2d9b41bd418894d1ee25de1642c3325d71c397" ], "author": { "name": "Bart De Schuymer", "email": "bdschuym@pandora.be", "time": "Thu Apr 15 12:26:39 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Apr 15 12:26:39 2010 +0200" }, "message": "netfilter: bridge-netfilter: Fix MAC header handling with IP DNAT\n\n- fix IP DNAT on vlan- or pppoe-encapsulated traffic: The functions\nneigh_hh_output() or dst-\u003eneighbour-\u003eoutput() overwrite the complete\nEthernet header, although we only need the destination MAC address.\nFor encapsulated packets, they ended up overwriting the encapsulating\nheader. The new code copies the Ethernet source MAC address and\nprotocol number before calling dst-\u003eneighbour-\u003eoutput(). The Ethernet\nsource MAC and protocol number are copied back in place in\nbr_nf_pre_routing_finish_bridge_slow(). This also makes the IP DNAT\nmore transparent because in the old scheme the source MAC of the\nbridge was copied into the source address in the Ethernet header. We\nalso let skb-\u003eprotocol equal ETH_P_IP resp. ETH_P_IPV6 during the\nexecution of the PF_INET resp. PF_INET6 hooks.\n\n- Speed up IP DNAT by calling neigh_hh_bridge() instead of\nneigh_hh_output(): if dst-\u003ehh is available, we already know the MAC\naddress so we can just copy it.\n\nSigned-off-by: Bart De Schuymer \u003cbdschuym@pandora.be\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "ea2d9b41bd418894d1ee25de1642c3325d71c397", "tree": "e8187786c8d83123da104476fc0eb7132ec29045", "parents": [ "9c6eb28aca52d562f3ffbaebaa56385df9972a43" ], "author": { "name": "Bart De Schuymer", "email": "bdschuym@pandora.be", "time": "Thu Apr 15 12:14:51 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Apr 15 12:14:51 2010 +0200" }, "message": "netfilter: bridge-netfilter: simplify IP DNAT\n\nRemove br_netfilter.c::br_nf_local_out(). The function\nbr_nf_local_out() was needed because the PF_BRIDGE::LOCAL_OUT hook\ncould be called when IP DNAT happens on to-be-bridged traffic. The\nnew scheme eliminates this mess.\n\nSigned-off-by: Bart De Schuymer \u003cbdschuym@pandora.be\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "e26c28e8bffe12b27df5b828404afed9e1949191", "tree": "ca36914aa924c8528c1c7518ffe6fb4c2934f467", "parents": [ "8237908e145b84d4b020790df0f9315d2f71e980" ], "author": { "name": "Bart De Schuymer", "email": "bdschuym@pandora.be", "time": "Tue Apr 13 11:41:39 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Apr 13 11:41:39 2010 +0200" }, "message": "netfilter: bridge-netfilter: update a comment in br_forward.c about ip_fragment()\n\nip_refrag isn\u0027t used anymore in the bridge-netfilter code\n\nSigned-off-by: Bart De Schuymer \u003cbdschuym@pandora.be\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "8237908e145b84d4b020790df0f9315d2f71e980", "tree": "d02fade9463953c388d4181ea0ebe58962e656b0", "parents": [ "22068311b62858ea7eb71653a07564fd73d7a9b0" ], "author": { "name": "Bart De Schuymer", "email": "bdschuym@pandora.be", "time": "Tue Apr 13 11:40:41 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Apr 13 11:40:41 2010 +0200" }, "message": "netfilter: bridge-netfilter: cleanup br_netfilter.c\n\nbridge-netfilter: cleanup br_netfilter.c\n\n- remove some of the graffiti at the head of br_netfilter.c\n- remove __br_dnat_complain()\n- remove KERN_INFO messages when CONFIG_NETFILTER_DEBUG is defined\n\nSigned-off-by: Bart De Schuymer \u003cbdschuym@pandora.be\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "871039f02f8ec4ab2e5e9010718caa8e085786f1", "tree": "f0d2b3127fc48c862967d68c46c2d46668137515", "parents": [ "e4077e018b5ead3de9951fc01d8bf12eeeeeefed", "4a1032faac94ebbf647460ae3e06fc21146eb280" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 11 14:53:53 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 11 14:53:53 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/stmmac/stmmac_main.c\n\tdrivers/net/wireless/wl12xx/wl1271_cmd.c\n\tdrivers/net/wireless/wl12xx/wl1271_main.c\n\tdrivers/net/wireless/wl12xx/wl1271_spi.c\n\tnet/core/ethtool.c\n\tnet/mac80211/scan.c\n" }, { "commit": "4a1032faac94ebbf647460ae3e06fc21146eb280", "tree": "7f31b97beb0406faa1523e619289ad0ab07c9787", "parents": [ "ae4e8d63b5619d4d95f1d2bfa2b836caa6e62d06", "0eddb519b9127c73d53db4bf3ec1d45b13f844d1" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 11 02:44:30 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 11 02:44:30 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of /home/davem/src/GIT/linux-2.6/\n" }, { "commit": "fd218cf9557b9bf7061365a8fe7020a56d3f767c", "tree": "f96f035cb73060da366a9fdfdb10915cd7ce7089", "parents": [ "94824f3dbe0d3f62470603bbb18efb5510aaf07c" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Wed Apr 07 21:20:47 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 07 21:20:47 2010 -0700" }, "message": "bridge: Fix IGMP3 report parsing\n\nThe IGMP3 report parsing is looking at the wrong address for\ngroup records. This patch fixes it.\n\nReported-by: Banyeer \u003cbanyeer@yahoo.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": "5a0e3ad6af8660be21ca98a971cd00f331318c05", "tree": "5bfb7be11a03176a87296a43ac6647975c00a1d1", "parents": [ "ed391f4ebf8f701d3566423ce8f17e614cde9806" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Mar 24 17:04:11 2010 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Mar 30 22:02:32 2010 +0900" }, "message": "include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h\n\npercpu.h is included by sched.h and module.h and thus ends up being\nincluded when building most .c files. percpu.h includes slab.h which\nin turn includes gfp.h making everything defined by the two files\nuniversally available and complicating inclusion dependencies.\n\npercpu.h -\u003e slab.h dependency is about to be removed. Prepare for\nthis change by updating users of gfp and slab facilities include those\nheaders directly instead of assuming availability. As this conversion\nneeds to touch large number of source files, the following script is\nused as the basis of conversion.\n\n http://userweb.kernel.org/~tj/misc/slabh-sweep.py\n\nThe script does the followings.\n\n* Scan files for gfp and slab usages and update includes such that\n only the necessary includes are there. ie. if only gfp is used,\n gfp.h, if slab is used, slab.h.\n\n* When the script inserts a new include, it looks at the include\n blocks and try to put the new include such that its order conforms\n to its surrounding. It\u0027s put in the include block which contains\n core kernel includes, in the same order that the rest are ordered -\n alphabetical, Christmas tree, rev-Xmas-tree or at the end if there\n doesn\u0027t seem to be any matching order.\n\n* If the script can\u0027t find a place to put a new include (mostly\n because the file doesn\u0027t have fitting include block), it prints out\n an error message indicating which .h file needs to be added to the\n file.\n\nThe conversion was done in the following steps.\n\n1. The initial automatic conversion of all .c files updated slightly\n over 4000 files, deleting around 700 includes and adding ~480 gfp.h\n and ~3000 slab.h inclusions. The script emitted errors for ~400\n files.\n\n2. Each error was manually checked. Some didn\u0027t need the inclusion,\n some needed manual addition while adding it to implementation .h or\n embedding .c file was more appropriate for others. This step added\n inclusions to around 150 files.\n\n3. The script was run again and the output was compared to the edits\n from #2 to make sure no file was left behind.\n\n4. Several build tests were done and a couple of problems were fixed.\n e.g. lib/decompress_*.c used malloc/free() wrappers around slab\n APIs requiring slab.h to be added manually.\n\n5. The script was run on all .h files but without automatically\n editing them as sprinkling gfp.h and slab.h inclusions around .h\n files could easily lead to inclusion dependency hell. Most gfp.h\n inclusion directives were ignored as stuff from gfp.h was usually\n wildly available and often used in preprocessor macros. Each\n slab.h inclusion directive was examined and added manually as\n necessary.\n\n6. percpu.h was updated not to include slab.h.\n\n7. Build test were done on the following configurations and failures\n were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my\n distributed build env didn\u0027t work with gcov compiles) and a few\n more options had to be turned off depending on archs to make things\n build (like ipr on powerpc/64 which failed due to missing writeq).\n\n * x86 and x86_64 UP and SMP allmodconfig and a custom test config.\n * powerpc and powerpc64 SMP allmodconfig\n * sparc and sparc64 SMP allmodconfig\n * ia64 SMP allmodconfig\n * s390 SMP allmodconfig\n * alpha SMP allmodconfig\n * um on x86_64 SMP allmodconfig\n\n8. percpu.h modifications were reverted so that it could be applied as\n a separate patch and serve as bisection point.\n\nGiven the fact that I had only a couple of failures from tests on step\n6, I\u0027m fairly confident about the coverage of this conversion patch.\nIf there is a breakage, it\u0027s likely to be something in one of the arch\nheaders which should be easily discoverable easily on most builds of\nthe specific arch.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nGuess-its-ok-by: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Lee Schermerhorn \u003cLee.Schermerhorn@hp.com\u003e\n" }, { "commit": "d6b00a5345ce4e86e8b00a88bb84a2c0c1f69ddc", "tree": "11d68bb08584fbbae02a7bf22599bdd67da4408e", "parents": [ "bd414ee605ff3ac5fcd79f57269a897879ee4cde" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Thu Mar 25 16:34:45 2010 +0100" }, "committer": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Thu Mar 25 16:55:49 2010 +0100" }, "message": "netfilter: xtables: change targets to return error code\n\nPart of the transition of done by this semantic patch:\n// \u003csmpl\u003e\n@ rule1 @\nstruct xt_target ops;\nidentifier check;\n@@\n ops.checkentry \u003d check;\n\n@@\nidentifier rule1.check;\n@@\n check(...) { \u003c...\n-return true;\n+return 0;\n ...\u003e }\n\n@@\nidentifier rule1.check;\n@@\n check(...) { \u003c...\n-return false;\n+return -EINVAL;\n ...\u003e }\n// \u003c/smpl\u003e\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\n" }, { "commit": "bd414ee605ff3ac5fcd79f57269a897879ee4cde", "tree": "3cff5d1f3fd43791341e9cde23dabb4dfbc94bd3", "parents": [ "135367b8f6a18507af6b9a6910a14b5699415309" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Tue Mar 23 16:35:56 2010 +0100" }, "committer": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Thu Mar 25 16:55:24 2010 +0100" }, "message": "netfilter: xtables: change matches to return error code\n\nThe following semantic patch does part of the transformation:\n// \u003csmpl\u003e\n@ rule1 @\nstruct xt_match ops;\nidentifier check;\n@@\n ops.checkentry \u003d check;\n\n@@\nidentifier rule1.check;\n@@\n check(...) { \u003c...\n-return true;\n+return 0;\n ...\u003e }\n\n@@\nidentifier rule1.check;\n@@\n check(...) { \u003c...\n-return false;\n+return -EINVAL;\n ...\u003e }\n// \u003c/smpl\u003e\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\n" }, { "commit": "135367b8f6a18507af6b9a6910a14b5699415309", "tree": "462e8efb6f4e634421b5c01e96b02280c512eeab", "parents": [ "b0f38452ff73da7e9e0ddc68cd5c6b93c897ca0d" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Fri Mar 19 17:16:42 2010 +0100" }, "committer": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Thu Mar 25 16:04:33 2010 +0100" }, "message": "netfilter: xtables: change xt_target.checkentry return type\n\nRestore function signatures from bool to int so that we can report\nmemory allocation failures or similar using -ENOMEM rather than\nalways having to pass -EINVAL back.\n\n// \u003csmpl\u003e\n@@\ntype bool;\nidentifier check, par;\n@@\n-bool check\n+int check\n (struct xt_tgchk_param *par) { ... }\n// \u003c/smpl\u003e\n\nMinus the change it does to xt_ct_find_proto.\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\n" }, { "commit": "b0f38452ff73da7e9e0ddc68cd5c6b93c897ca0d", "tree": "fd1bbb75556c88a581fc9dfe9faa045578e468ff", "parents": [ "9f5673174161cc026a6c87f70d9b457e7ad82a80" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Fri Mar 19 17:16:42 2010 +0100" }, "committer": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Thu Mar 25 16:03:13 2010 +0100" }, "message": "netfilter: xtables: change xt_match.checkentry return type\n\nRestore function signatures from bool to int so that we can report\nmemory allocation failures or similar using -ENOMEM rather than\nalways having to pass -EINVAL back.\n\nThis semantic patch may not be too precise (checking for functions\nthat use xt_mtchk_param rather than functions referenced by\nxt_match.checkentry), but reviewed, it produced the intended result.\n\n// \u003csmpl\u003e\n@@\ntype bool;\nidentifier check, par;\n@@\n-bool check\n+int check\n (struct xt_mtchk_param *par) { ... }\n// \u003c/smpl\u003e\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\n" }, { "commit": "713aefa3fb3929ce36305d4d1b7b4059d87ed115", "tree": "d73b898fa5920b434bffd60dce669c48758a2b5d", "parents": [ "5dc7a6d5749d3ddbf9fbea9512cb45762428512c" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Tue Mar 23 04:07:21 2010 +0100" }, "committer": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Thu Mar 25 16:00:29 2010 +0100" }, "message": "netfilter: bridge: use NFPROTO values for NF_HOOK invocation\n\nThe first argument to NF_HOOK* is an nfproto since quite some time.\nCommit v2.6.27-2457-gfdc9314 was the first to practically start using\nthe new names. Do that now for the remaining NF_HOOK calls.\n\nThe semantic patch used was:\n// \u003csmpl\u003e\n@@\n@@\n(NF_HOOK\n|NF_HOOK_THRESH\n)(\n-PF_BRIDGE,\n+NFPROTO_BRIDGE,\n ...)\n\n@@\n@@\n NF_HOOK(\n-PF_INET6,\n+NFPROTO_IPV6,\n ...)\n\n@@\n@@\n NF_HOOK(\n-PF_INET,\n+NFPROTO_IPV4,\n ...)\n// \u003c/smpl\u003e\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\n" }, { "commit": "fd0ec0e6216baea854465bbdb177f2d1b2ccaf22", "tree": "47a935d96deae38aa0a030039e303b071a7803e0", "parents": [ "d2a7b6bad2c38e41eddb0b24d03627d9e7aa3f7b" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Fri Jul 10 19:27:47 2009 +0200" }, "committer": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Thu Mar 25 15:02:19 2010 +0100" }, "message": "netfilter: xtables: consolidate code into xt_request_find_match\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\n" }, { "commit": "d2a7b6bad2c38e41eddb0b24d03627d9e7aa3f7b", "tree": "826eb9d112029819aa44925346a55f887b1c3baf", "parents": [ "ff67e4e42bd178b1179c4d8e5c1fde18758ce84f" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Fri Jul 10 18:55:11 2009 +0200" }, "committer": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Thu Mar 25 15:02:19 2010 +0100" }, "message": "netfilter: xtables: make use of xt_request_find_target\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\n" }, { "commit": "ff67e4e42bd178b1179c4d8e5c1fde18758ce84f", "tree": "5d4cc857d4bac40c3d78f90f8e21f12c424737a4", "parents": [ "0d34545563f99886b997be7da63f0e8084af3bc5" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Fri Mar 19 21:08:16 2010 +0100" }, "committer": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Thu Mar 25 15:00:04 2010 +0100" }, "message": "netfilter: xt extensions: use pr_\u003clevel\u003e (2)\n\nSupplement to 1159683ef48469de71dc26f0ee1a9c30d131cf89.\n\nDowngrade the log level to INFO for most checkentry messages as they\nare, IMO, just an extra information to the -EINVAL code that is\nreturned as part of a parameter \"constraint violation\". Leave errors\nto real errors, such as being unable to create a LED trigger.\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\n" } ], "next": "7668448ea91cda36661878da54c851f8eb239d8e" }