)]}' { "log": [ { "commit": "19eb5cc559f716dc98ce03a5bad6030fdc71e897", "tree": "52a6ab3702e19b9982144295936b2aeab68fc47b", "parents": [ "5a0d2268d259886f0c87131639d19eb4a67b4532" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Wed Nov 24 13:14:50 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 28 10:47:19 2010 -0800" }, "message": "8021q: vlan device is lockless do not transfer real_num_{tx|rx}_queues\n\nNow that the vlan device is lockless and single queue do not\ntransfer the real num queues. This is causing a BUG_ON to occur.\n\nkernel BUG at net/8021q/vlan.c:345!\nCall Trace:\n[\u003cffffffff813fd6e8\u003e] ? fib_rules_event+0x28/0x1b0\n[\u003cffffffff814ad2b5\u003e] notifier_call_chain+0x55/0x80\n[\u003cffffffff81089156\u003e] raw_notifier_call_chain+0x16/0x20\n[\u003cffffffff813e5af7\u003e] call_netdevice_notifiers+0x37/0x70\n[\u003cffffffff813e6756\u003e] netdev_features_change+0x16/0x20\n[\u003cffffffffa02995be\u003e] ixgbe_fcoe_enable+0xae/0x100 [ixgbe]\n[\u003cffffffffa01da06a\u003e] vlan_dev_fcoe_enable+0x2a/0x30 [8021q]\n[\u003cffffffffa02d08c3\u003e] fcoe_create+0x163/0x630 [fcoe]\n[\u003cffffffff811244d5\u003e] ? mmap_region+0x255/0x5a0\n[\u003cffffffff81080ef0\u003e] param_attr_store+0x50/0x80\n[\u003cffffffff810809b6\u003e] module_attr_store+0x26/0x30\n[\u003cffffffff811b9db2\u003e] sysfs_write_file+0xf2/0x180\n[\u003cffffffff8114fc88\u003e] vfs_write+0xc8/0x190\n[\u003cffffffff81150621\u003e] sys_write+0x51/0x90\n[\u003cffffffff8100c0b2\u003e] system_call_fastpath+0x16/0x1b\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "213b15ca818adf7766cd7162c2159a6ecdd3bab8", "tree": "e6655afbd3b1b5830543d102e0d2e9f47da9b36a", "parents": [ "4af429d29b341bb1735f04c2fb960178ed5d52e7" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Nov 11 09:42:45 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 16 11:17:42 2010 -0800" }, "message": "vlan: remove ndo_select_queue() logic\n\nNow vlan are lockless, we dont need special ndo_select_queue() logic.\ndev_pick_tx() will do the multiqueue stuff on the real device transmit.\n\nSuggested-by: Jesse Gross \u003cjesse@nicira.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4af429d29b341bb1735f04c2fb960178ed5d52e7", "tree": "b5179224883dc56cde57058014480e4bcf22b75b", "parents": [ "8ffab51b3dfc54876f145f15b351c41f3f703195" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Nov 10 23:42:00 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 16 11:15:08 2010 -0800" }, "message": "vlan: lockless transmit path\n\nvlan is a stacked device, like tunnels. We should use the lockless\nmechanism we are using in tunnels and loopback.\n\nThis patch completely removes locking in TX path.\n\ntx stat counters are added into existing percpu stat structure, renamed\nfrom vlan_rx_stats to vlan_pcpu_stats.\n\nNote : this partially reverts commit 2e59af3dcbdf (vlan: multiqueue vlan\ndevice)\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e1f2d8c2cc61d2b9472efe44e8a2b098336914b4", "tree": "cdea26bf2fa8eec991a5628f5df5ab6f313b4b4e", "parents": [ "900fcf091e95fbcc773b72c770afcd2e8eda4da2" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 15 10:37:30 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 15 10:37:30 2010 -0800" }, "message": "vlan: Fix build warning in vlandev_seq_show()\n\nnet/8021q/vlanproc.c: In function \u0027vlandev_seq_show\u0027:\nnet/8021q/vlanproc.c:283:20: warning: unused variable \u0027fmt\u0027\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "636e19a34275d7d6fda0fefa965b1e2a715e2b02", "tree": "134160c8880adef0d9afc159da22dc577b9fa3c8", "parents": [ "8f5549f381ced6a255f2c7127b2b3b3b05fdfd6e" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Sat Oct 30 14:22:42 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 15 10:11:40 2010 -0800" }, "message": "net: consolidate 8021q tagging\n\nNow that VLAN packets are tagged in dev_hard_start_xmit()\nat the bottom of the stack we no longer need to tag them\nin the 8021Q module (Except in the !VLAN_FLAG_REORDER_HDR\ncase).\n\nThis allows the accel path and non accel paths to be consolidated.\nHere the vlan_tci in the skb is always set and we allow the\nstack to add the actual tag in dev_hard_start_xmit().\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nAcked-by: Jesse Gross \u003cjesse@nicira.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8f5549f381ced6a255f2c7127b2b3b3b05fdfd6e", "tree": "495c1ed3e1031a8f07b659cf3772ed2be22ea9d3", "parents": [ "029f5fc31cdb35d6c8a7fe9a54bf21556e175988" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Sat Oct 30 14:22:37 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 15 10:11:40 2010 -0800" }, "message": "net: remove check for headroom in vlan_dev_create\n\nIt is possible for the headroom to be smaller then the\nhard_header_len for a short period of time after toggling\nthe vlan offload setting.\n\nThis is not a hard error and skb_cow_head is called in\n__vlan_put_tag() to resolve this.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nAcked-by: Jesse Gross \u003cjesse@nicira.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "029f5fc31cdb35d6c8a7fe9a54bf21556e175988", "tree": "6b30ca1d4e93095f8c0dce87f54a8f2bd55c4b53", "parents": [ "58e998c6d23988490162cef0784b19ea274d90bb" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Sat Oct 30 14:22:32 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 15 10:11:39 2010 -0800" }, "message": "8021q: set hard_header_len when VLAN offload features are toggled\n\nToggling the vlan tx|rx hw offloads needs to set the hard_header_len\nas well otherwise we end up using LL_RESERVED_SPACE incorrectly.\nThis results in pskb_expand_head() being used unnecessarily.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nAcked-by: Jesse Gross \u003cjesse@nicira.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b616b09afabf6d569aa31176aa86f05d2586de3e", "tree": "9765278f9825a612c27fea34aba0c614594b88c5", "parents": [ "5202e173d7bc5ff832a4f36e66f26e00feb343c6" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sun Oct 24 21:31:58 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 25 13:09:43 2010 -0700" }, "message": "vlan: rcu annotations\n\n(struct net_device)-\u003evlgrp is rcu protected :\n\nadd __rcu annotation and proper rcu primitives.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3701e51382a026cba10c60b03efabe534fba4ca4", "tree": "9f205d8ad0edf65b4405d9b60cb65f3cd8e44ae4", "parents": [ "65ac6a5fa658b90f1be700c55e7cd72e4611015d" ], "author": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Wed Oct 20 13:56:06 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 21 01:26:53 2010 -0700" }, "message": "vlan: Centralize handling of hardware acceleration.\n\nCurrently each driver that is capable of vlan hardware acceleration\nmust be aware of the vlan groups that are configured and then pass\nthe stripped tag to a specialized receive function. This is\n\ndifferent from other types of hardware offload in that it places a\nsignificant amount of knowledge in the driver itself rather keeping\nit in the networking core.\n\nThis makes vlan offloading function more similarly to other forms\nof offloading (such as checksum offloading or TSO) by doing the\nfollowing:\n* On receive, stripped vlans are passed directly to the network\ncore, without attempting to check for vlan groups or reconstructing\nthe header if no group\n* vlans are made less special by folding the logic into the main\nreceive routines\n* On transmit, the device layer will add the vlan header in software\nif the hardware doesn\u0027t support it, instead of spreading that logic\nout in upper layers, such as bonding.\n\nThere are a number of advantages to this:\n* Fixes all bugs with drivers incorrectly dropping vlan headers at once.\n* Avoids having to disable VLAN acceleration when in promiscuous mode\n(good for bridging since it always puts devices in promiscuous mode).\n* Keeps VLAN tag separate until given to ultimate consumer, which\navoids needing to do header reconstruction as in tg3 unless absolutely\nnecessary.\n* Consolidates common code in core networking.\n\nSigned-off-by: Jesse Gross \u003cjesse@nicira.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "65ac6a5fa658b90f1be700c55e7cd72e4611015d", "tree": "7330c3234101c6d4c952f4abec9c8064df0e685a", "parents": [ "7b9c60903714bf0a19d746b228864bad3497284e" ], "author": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Wed Oct 20 13:56:05 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 21 01:26:53 2010 -0700" }, "message": "vlan: Avoid hash table lookup to find group.\n\nA struct net_device always maps to zero or one vlan groups and we\nalways know the device when we are looking up a group. We currently\ndo a hash table lookup on the device to find the group but it is\nmuch simpler to just store a pointer.\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": "caf586e5f23cebb2a68cbaf288d59dbbf2d74052", "tree": "5c0dfcf5a14c55501f9225835c83abddb8d1876e", "parents": [ "a00eac0c459abecb539fb2a2abd3122dd7ca5d4a" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Sep 30 21:06:55 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 05 14:47:55 2010 -0700" }, "message": "net: add a core netdev-\u003erx_dropped counter\n\nIn various situations, a device provides a packet to our stack and we\ndrop it before it enters protocol stack :\n- softnet backlog full (accounted in /proc/net/softnet_stat)\n- bad vlan tag (not accounted)\n- unknown/unregistered protocol (not accounted)\n\nWe can handle a per-device counter of such dropped frames at core level,\nand automatically adds it to the device provided stats (rx_dropped), so\nthat standard tools can be used (ifconfig, ip link, cat /proc/net/dev)\n\nThis is a generalization of commit 8990f468a (net: rx_dropped\naccounting), thus reverting it.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "21a180cda012e1f93e362dd4a9b0bfd3d8c92940", "tree": "0e0d10baa3fdcd8ffbc6881076ff1695808dad9d", "parents": [ "c7d4426a98a5f6654cd0b4b33d9dab2e77192c18", "51e97a12bef19b7e43199fc153cf9bd5f2140362" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 04 11:56:38 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 04 11:56:38 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/Kconfig\n\tnet/ipv4/tcp_timer.c\n" }, { "commit": "173e79fb70a98b5b223f8dc09c22990d777bdd78", "tree": "0812b62ac5ae74b605109372437aaaacb6495234", "parents": [ "92629195314d8adefabeb78b13d681ad1c01e778" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Sep 30 02:16:44 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 30 18:04:21 2010 -0700" }, "message": "vlan: dont drop packets from unknown vlans in promiscuous mode\n\nRoger Luethi noticed packets for unknown VLANs getting silently dropped\neven in promiscuous mode.\n\nCheck for promiscuous mode in __vlan_hwaccel_rx() and vlan_gro_common()\nbefore drops.\n\nAs suggested by Patrick, mark such packets to have skb-\u003epkt_type set to\nPACKET_OTHERHOST to make sure they are dropped by IP stack.\n\nReported-by: Roger Luethi \u003crl@hellgate.ch\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5df8dbd7e517b581e0b8cbd72a99da17914a20b0", "tree": "65b1a3390fcc1106adb18a252637f226e7bc2491", "parents": [ "c4f4adc7b7e03f9c0bfc81fccc8ad85d06dc8d88" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Mon Sep 27 08:32:59 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 27 22:09:57 2010 -0700" }, "message": "8021q: Use netif_copy_real_num_queues() to set queue counts\n\nThis covers RX if necessary, as well as TX.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "af5ef241133b602a77b682009f112e7c3f7604e5", "tree": "42c63b445d60c1a0e1311580ad2bed646c7eb50e", "parents": [ "8d98efa84b790bdd62248eb0dfff17e9baf5c844" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sun Sep 26 22:47:09 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 27 21:30:41 2010 -0700" }, "message": "vlan: use this_cpu_ptr() in vlan_skb_recv()\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a02cec2155fbea457eca8881870fd2de1a4c4c76", "tree": "cfbfc4b32bfe10f9cd803d46c31607d13f1858f5", "parents": [ "6a08d194ee40806e0ccd5f36ed768e64cbfc979f" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Sep 22 20:43:57 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 23 14:33:39 2010 -0700" }, "message": "net: return operator cleanup\n\nChange \"return (EXPR);\" to \"return EXPR;\"\n\nreturn is not a function, parentheses are not required.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8990f468ae9010ab0af4be8f51bf7ab833a67202", "tree": "e84ad358ed67da6011b1e20f3d8039d1f9f07e4a", "parents": [ "462fb2af9788a82a534f8184abfde31574e1cfa0" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Sep 20 00:12:11 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 20 10:08:58 2010 -0700" }, "message": "net: rx_dropped accounting\n\nUnder load, netif_rx() can drop incoming packets but administrators dont\nhave a chance to spot which device needs some tuning (RPS activation for\nexample)\n\nThis patch adds rx_dropped accounting in vlans and tunnels.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3b27e105550f7c4a79ecb6d6a9c49c651c59ae9b", "tree": "5603f5c9322f40d40a63efe5519c0a9bf164b972", "parents": [ "b71c7aaa1e2a9858f0c469026098fbd6e046d7bb" ], "author": { "name": "David Lamparter", "email": "equinox@diac24.net", "time": "Fri Sep 17 03:22:19 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Sep 17 16:46:04 2010 -0700" }, "message": "netns: keep vlan slaves on master netns move\n\npreviously, if a vlan master device was moved from one network namespace\nto another, all 802.1q and macvlan slaves were deleted.\n\nwe can use dev-\u003ereg_state to figure out whether dev_change_net_namespace\nis happening, since that won\u0027t set dev-\u003ereg_state NETREG_UNREGISTERING.\nso, this changes 8021q and macvlan to ignore NETDEV_UNREGISTER when\nreg_state is not NETREG_UNREGISTERING.\n\nSigned-off-by: David Lamparter \u003cequinox@diac24.net\u003e\nReviewed-by: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nAcked-by: Daniel Lezcano \u003cdaniel.lezcano@free.fr\u003e\nAcked-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "72ed62f7c9f0abe11231d073195a722ee43d6ec1", "tree": "7be4b4f359060c067cd6e3d419a6d2d51acd847f", "parents": [ "01b38606bded44bf8b7ca42e8fe5f2cad5d28121" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Tue Aug 31 04:58:18 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 31 13:37:05 2010 -0700" }, "message": "vlan: Use vlan_dev_real_dev in vlan_hwaccel_do_receive\n\n[patch net-next-2.6] vlan: Use vlan_dev_real_dev in vlan_hwaccel_do_receive\n\nUse helper as in other places.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "40d0802b3eb47d57e2d57a5244a18cbbe9632e13", "tree": "fd45987286080e1f711c2448f6fbdc7d362a0241", "parents": [ "250ad8f55c06eb866cfb57f8d3ea6ff961a7d1d7" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Aug 26 22:03:08 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 26 22:03:08 2010 -0700" }, "message": "gro: __napi_gro_receive() optimizations\n\ncompare_ether_header() can have a special implementation on 64 bit\narches if CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is defined.\n\n__napi_gro_receive() and vlan_gro_common() can avoid a conditional\nbranch to perform device match.\n\nOn x86_64, __napi_gro_receive() has now 38 instructions instead of 53\n\nAs gcc-4.4.3 still choose to not inline it, add inline keyword to this\nperformance critical function.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "05532121da0728eaedac2a0a5c3cecad3a95d765", "tree": "1b1ff9e02b87527868c7698f0369d00d4c86a0a0", "parents": [ "2436243a39de56f03d38c74139261cc61bea8456" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Sun Aug 22 21:03:33 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Aug 22 21:03:33 2010 -0700" }, "message": "net: 802.1q: make vlan_hwaccel_do_receive() return void\n\nvlan_hwaccel_do_receive() always returns 0, so make it return void.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0ac820eebe9008094040955d294ef7b33b418413", "tree": "5ce37697c91666fd5c83930c32cf8181dc7e67c7", "parents": [ "0645bab7da3cb021157e5c661ef35f1d1226785a" ], "author": { "name": "Phil Oester", "email": "kernel@linuxace.com", "time": "Tue Aug 17 18:45:08 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 19 00:26:46 2010 -0700" }, "message": "vlan: Match underlying dev carrier on vlan add\n\nWhen adding a new vlan, if the underlying interface has no carrier,\nthen the newly added vlan interface should also have no carrier.\nAt present, this is not true - the newly added vlan is added with\ncarrier up. Fix by checking state of real device.\n\nSigned-off-by: Phil Oester \u003ckernel@linuxace.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ad1afb00393915a51c21b1ae8704562bf036855f", "tree": "68ead91b78624a66f4aabb9699f4b414b914a762", "parents": [ "01893c82b4e6949f4e3a453c4faea34970359d76" ], "author": { "name": "Pedro Garcia", "email": "pedro.netdev@dondevamos.com", "time": "Sun Jul 18 15:38:44 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 18 15:38:44 2010 -0700" }, "message": "vlan_dev: VLAN 0 should be treated as \"no vlan tag\" (802.1p packet)\n\n- Without the 8021q module loaded in the kernel, all 802.1p packets \n(VLAN 0 but QoS tagging) are silently discarded (as expected, as \nthe protocol is not loaded).\n \n- Without this patch in 8021q module, these packets are forwarded to \nthe module, but they are discarded also if VLAN 0 is not configured,\nwhich should not be the default behaviour, as VLAN 0 is not really\na VLANed packet but a 802.1p packet. Defining VLAN 0 makes it almost\nimpossible to communicate with mixed 802.1p and non 802.1p devices on\nthe same network due to arp table issues.\n\n- Changed logic to skip vlan specific code in vlan_skb_recv if VLAN \nis 0 and we have not defined a VLAN with ID 0, but we accept the \npacket with the encapsulated proto and pass it later to netif_rx.\n\n- In the vlan device event handler, added some logic to add VLAN 0 \nto HW filter in devices that support it (this prevented any traffic\nin VLAN 0 to reach the stack in e1000e with HW filter under 2.6.35,\nand probably also with other HW filtered cards, so we fix it here).\n\n- In the vlan unregister logic, prevent the elimination of VLAN 0 \nin devices with HW filter.\n\n- The default behaviour is to ignore the VLAN 0 tagging and accept\nthe packet as if it was not tagged, but we can still define a \nVLAN 0 if desired (so it is backwards compatible).\n\nSigned-off-by: Pedro Garcia \u003cpedro.netdev@dondevamos.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3cfde79c6c7c8002375c4a8e5be7f602fbb9675d", "tree": "53fe969e9f8bb45531c1e84c82e822ff47ea015c", "parents": [ "cc7b86c1a8f207c8aa77aad6941475d8294a83c4" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Fri Jul 09 09:11:52 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 09 17:41:56 2010 -0700" }, "message": "net: Get rid of rtnl_link_stats64 / net_device_stats union\n\nIn commit be1f3c2c027cc5ad735df6a45a542ed1db7ec48b \"net: Enable 64-bit\nnet device statistics on 32-bit architectures\" I redefined struct\nnet_device_stats so that it could be used in a union with struct\nrtnl_link_stats64, avoiding the need for explicit copying or\nconversion between the two. However, this is unsafe because there is\nno locking required and no lock consistently held around calls to\ndev_get_stats() and use of the statistics structure it returns.\n\nIn commit 28172739f0a276eb8d6ca917b3974c2edb036da3 \"net: fix 64 bit\ncounters on 32 bit arches\" Eric Dumazet dealt with that problem by\nrequiring callers of dev_get_stats() to provide storage for the\nresult. This means that the net_device::stats64 field and the padding\nin struct net_device_stats are now redundant, so remove them.\n\nUpdate the comment on net_device_ops::ndo_get_stats64 to reflect its\nnew usage.\n\nChange dev_txq_stats_fold() to use struct rtnl_link_stats64, since\nthat is what all its callers are really using and it is no longer\ngoing to be compatible with struct net_device_stats.\n\nEric Dumazet suggested the separate function for the structure\nconversion.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a204b48ed4dc31acf61090e530430ce3272b6aab", "tree": "1c7615f3483720a79b83f03bc4d14f2dad622744", "parents": [ "dd4ba83dc1becbb3bb383851381c10c372e47247" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Jul 08 23:12:21 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 08 23:12:21 2010 -0700" }, "message": "vlan: allow TSO setting on vlan interfaces\n\nWhen we need to shape traffic using low speeds, we need to\ndisable tso on network interface :\n\nethtool -K eth0.2240 tso off\n\nIt seems vlan interfaces miss the set_tso() ethtool method.\n\nBefore enabling TSO, we must check real device supports\nTSO for VLAN-tagged packets and enables TSO.\n\nNote that a TSO change on real device propagates TSO setting\non all vlans, even if admin selected a different TSO setting.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\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": "9618e2ffd78aaa43a5815e1dd456b4dd95f9e53b", "tree": "2d75562cd72aa8492154054b90a6d659a80ac4ee", "parents": [ "bc66154efe163a80f269d448572f7906756e9338" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Jun 24 00:55:06 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 28 23:24:31 2010 -0700" }, "message": "vlan: 64 bit rx counters\n\nUse u64_stats_sync infrastructure to implement 64bit rx stats.\n\n(tx stats are addressed later)\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "be1f3c2c027cc5ad735df6a45a542ed1db7ec48b", "tree": "c97815a7cf25ea62e8f3a6b3597cfa8957f40b81", "parents": [ "d19b51499967baddf4f9f12a0067146c2554527a" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Tue Jun 08 07:19:54 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 12 15:51:22 2010 -0700" }, "message": "net: Enable 64-bit net device statistics on 32-bit architectures\n\nUse struct rtnl_link_stats64 as the statistics structure.\n\nOn 32-bit architectures, insert 32 bits of padding after/before each\nfield of struct net_device_stats to make its layout compatible with\nstruct rtnl_link_stats64. Add an anonymous union in net_device; move\nstats into the union and add struct rtnl_link_stats64 stats64.\n\nAdd net_device_ops::ndo_get_stats64, implementations of which will\nreturn a pointer to struct rtnl_link_stats64. Drivers that implement\nthis operation must not update the structure asynchronously.\n\nChange dev_get_stats() to call ndo_get_stats64 if available, and to\nreturn a pointer to struct rtnl_link_stats64. Change callers of\ndev_get_stats() accordingly.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "597a264b1a9c7e36d1728f677c66c5c1f7e3b837", "tree": "22db16f0a7b54ece127e127e152e9172456d9e1c", "parents": [ "00d9d6a185de89edc0649ca4ead58f0283dfcbac" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Thu Jun 03 09:30:11 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 10 22:23:34 2010 -0700" }, "message": "net: deliver skbs on inactive slaves to exact matches\n\nCurrently, the accelerated receive path for VLAN\u0027s will\ndrop packets if the real device is an inactive slave and\nis not one of the special pkts tested for in\nskb_bond_should_drop(). This behavior is different then\nthe non-accelerated path and for pkts over a bonded vlan.\n\nFor example,\n\nvlanx -\u003e bond0 -\u003e ethx\n\nwill be dropped in the vlan path and not delivered to any\npacket handlers at all. However,\n\nbond0 -\u003e vlanx -\u003e ethx\n\nand\n\nbond0 -\u003e ethx\n\nwill be delivered to handlers that match the exact dev,\nbecause the VLAN path checks the real_dev which is not a\nslave and netif_recv_skb() doesn\u0027t drop frames but only\ndelivers them to exact matches.\n\nThis patch adds a sk_buff flag which is used for tagging\nskbs that would previously been dropped and allows the\nskb to continue to skb_netif_recv(). Here we add\nlogic to check for the deliver_no_wcard flag and if it\nis set only deliver to handlers that match exactly. This\nmakes both paths above consistent and gives pkt handlers\na way to identify skbs that come from inactive slaves.\nWithout this patch in some configurations skbs will be\ndelivered to handlers with exact matches and in others\nbe dropped out right in the vlan path.\n\nI have tested the following 4 configurations in failover modes\nand load balancing modes.\n\n# bond0 -\u003e ethx\n\n# vlanx -\u003e bond0 -\u003e ethx\n\n# bond0 -\u003e vlanx -\u003e ethx\n\n# bond0 -\u003e ethx\n |\n vlanx -\u003e --\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "194dbcc8a1a97cbac9a619a563e5f6b7f7d5a485", "tree": "fbfae006dc8400c82ce387f1f4e39b8488c00e31", "parents": [ "08f382ebb8a9efb898840aa74cf55148c7a98af6" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Wed May 12 21:31:06 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 02 03:35:18 2010 -0700" }, "message": "net: init_vlan should not copy slave or master flags\n\nThe vlan device should not copy the slave or master flags from\nthe real device. It is not in the bond until added nor is it\na master.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ccbd6a5a4f76e821ed36f69fdaf59817c3a7f18e", "tree": "9fd681809e588913cc312f63ae0e701f18599afc", "parents": [ "935e2a26b85003c0bd52b6c92712c2f77a5f9d33" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Fri May 14 10:58:26 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 17 17:44:35 2010 -0700" }, "message": "net: Remove unnecessary semicolons after switch statements\n\nAlso added an explicit break; to avoid\na fallthrough in net/ipv4/tcp_input.c\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2d6c9ffcca7808f42ba6b953da0ba60e19a9cbbd", "tree": "c2406d2059ae2a554a26ee0d67c4aa45d02e2635", "parents": [ "a465419b1febb603821f924805529cff89cafeed" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon May 10 04:51:02 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 16 00:42:15 2010 -0700" }, "message": "net: congestion notifications are not dropped packets\n\nvlan/macvlan start_xmit() can inform caller of congestion with\nNET_XMIT_CN return value. This doesnt mean packet was dropped.\nIncrement normal stat counters instead of tx_dropped.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.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": "4a35ecf8bf1c4b039503fa554100fe85c761de76", "tree": "9b75f5d5636004d9a9aa496924377379be09aa1f", "parents": [ "b4d562e3c3553ac58c7120555c4e4aefbb090a2a", "fb9e2d887243499b8d28efcf80821c4f6a092395" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 06 23:53:30 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 06 23:53:30 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/bonding/bond_main.c\n\tdrivers/net/via-velocity.c\n\tdrivers/net/wireless/iwlwifi/iwl-agn.c\n" }, { "commit": "a748ee2426817a95b1f03012d8f339c45c722ae1", "tree": "37cb9f8836f05bd49b86eb52ddeff3e98185cc58", "parents": [ "9fc4178b149ae8b0a2fbf83f2f4df3cf8789177b" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Thu Apr 01 21:22:09 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Apr 03 14:22:11 2010 -0700" }, "message": "net: move address list functions to a separate file\n\n+little renaming of unicast functions to be smooth with multicast ones\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\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": "f6b9f4b263f3178fc0f23f0e67d04386528cc727", "tree": "6f749e6baeaf910ff53a9dfa0075dfbd5c856ddd", "parents": [ "669d3e0babb40018dd6e78f4093c13a2eac73866" ], "author": { "name": "Vasu Dev", "email": "vasu.dev@intel.com", "time": "Tue Mar 23 14:42:05 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 24 11:11:38 2010 -0700" }, "message": "vlan: updates vlan real_num_tx_queues\n\nUpdates real_num_tx_queues in case underlying real device\nhas changed real_num_tx_queues.\n\n-v2\n As per Eric Dumazet\u003ceric.dumazet@gmail.com\u003e comment:-\n -- adds BUG_ON to catch case of real_num_tx_queues exceeding num_tx_queues.\n -- created this self contained patch to just update real_num_tx_queues.\n\nSigned-off-by: Vasu Dev \u003cvasu.dev@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "669d3e0babb40018dd6e78f4093c13a2eac73866", "tree": "b463681d16ac806ddc889b02623361c64047d281", "parents": [ "31b24b955c3ebbb6f3008a6374e61cf7c05a193c" ], "author": { "name": "Vasu Dev", "email": "vasu.dev@intel.com", "time": "Tue Mar 23 14:41:45 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 24 11:11:38 2010 -0700" }, "message": "vlan: adds vlan_dev_select_queue\n\nThis is required to correctly select vlan tx queue for a driver\nsupporting multi tx queue with ndo_select_queue implemented since\ncurrently selected vlan tx queue is unaligned to selected queue by\nreal net_devce ndo_select_queue.\n\nUnaligned vlan tx queue selection causes thrash with higher vlan\ntx lock contention for least fcoe traffic and wrong socket tx\nqueue_mapping for ixgbe having ndo_select_queue implemented.\n\n-v2\n\nAs per Eric Dumazet\u003ceric.dumazet@gmail.com\u003e comments, mirrored\nvlan net_device_ops to have them with and without vlan_dev_select_queue\nand then select according to real dev ndo_select_queue present or not\nfor a vlan net_device. This is to completely skip vlan_dev_select_queue\ncalling for real net_device not supporting ndo_select_queue.\n\nSigned-off-by: Vasu Dev \u003cvasu.dev@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e77c8e83dd587f2616d7ff20d23a897891e6e20d", "tree": "ba5d2ce6541119f329b2fd51181aaae8528b38f0", "parents": [ "641cb85e68945878d520d5fc3c2dc64aa1dda868", "af98441397227a5a4f212cd48710eea72a14dbdb" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 20 15:24:29 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 20 15:24:29 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "0641e4fbf2f824faee00ea74c459a088d94905fd", "tree": "54fdd8bc2e3a928ff0f7621c06e1e604eaf0529c", "parents": [ "54d259d474e1fee6f6bb8f0f1360d85195199ac5" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Mar 18 21:16:45 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 18 21:16:45 2010 -0700" }, "message": "net: Potential null skb-\u003edev dereference\n\nWhen doing \"ifenslave -d bond0 eth0\", there is chance to get NULL\ndereference in netif_receive_skb(), because dev-\u003emaster suddenly becomes\nNULL after we tested it.\n\nWe should use ACCESS_ONCE() to avoid this (or rcu_dereference())\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1c01fe14a87332cc88266fbd6e598319322eb96f", "tree": "e80491a8120724db96f7f6c6d2e2334d33383e6c", "parents": [ "3ca5b4042ecae5e73c59de62e4ac0db31c10e0f8" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Wed Mar 10 10:30:19 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 18 20:00:02 2010 -0700" }, "message": "net: forbid underlaying devices to change its type\n\nIt\u0027s not desired for underlaying devices to change type. At the time,\nthere is for example possible to have bond with changed type from\nEthernet to Infiniband as a port of a bridge. This patch fixes this.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: Jay Vosburgh \u003cfubar@us.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7d720c3e4f0c4fc152a6bf17e24244a3c85412d2", "tree": "36e037187ce79acb211702bea22e99c625787757", "parents": [ "2bb4646fce8d09916b351d1a62f98db7cec6fc41" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Feb 16 15:20:26 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 16 23:05:38 2010 -0800" }, "message": "percpu: add __percpu sparse annotations to net\n\nAdd __percpu sparse annotations to net.\n\nThese annotations are to make sparse consider percpu variables to be\nin a different address space and warn if accessed without going\nthrough percpu accessors. This patch doesn\u0027t affect normal builds.\n\nThe macro and type tricks around snmp stats make things a bit\ninteresting. DEFINE/DECLARE_SNMP_STAT() macros mark the target field\nas __percpu and SNMP_UPD_PO_STATS() macro is updated accordingly. All\nsnmp_mib_*() users which used to cast the argument to (void **) are\nupdated to cast it to (void __percpu **).\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: Patrick McHardy \u003ckaber@trash.net\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@ghostprotocols.net\u003e\nCc: Vlad Yasevich \u003cvladislav.yasevich@hp.com\u003e\nCc: netdev@vger.kernel.org\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8a83a00b0735190384a348156837918271034144", "tree": "f69d903405e2424c196d8648bb6cb18443359373", "parents": [ "6884b348ed759184032306c9435a727741a72298" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Jan 30 12:23:03 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 03 20:20:32 2010 -0800" }, "message": "net: maintain namespace isolation between vlan and real device\n\nIn the vlan and macvlan drivers, the start_xmit function forwards\ndata to the dev_queue_xmit function for another device, which may\npotentially belong to a different namespace.\n\nTo make sure that classification stays within a single namespace,\nthis resets the potentially critical fields.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "05ba712d7eb156009753e18e5116cabd869cc6e2", "tree": "1ad850d6889f6b3671a5636653940f20a7d22bdf", "parents": [ "257ddbdad13cd3c4f7d03b85af632c508aa8abc9", "b473946a0853860e13b51c28add5524741117786" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 28 06:12:38 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 28 06:12:38 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "2dc85e91d05be91343033df78e4e6d99dc7ea50e", "tree": "64d63c2cd1cf0ee6f768261f5992010d0110bde6", "parents": [ "e071041be037eca208b62b84469a06bdfc692bea" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sun Jan 24 19:52:24 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 24 19:52:24 2010 -0800" }, "message": "vlan: fix vlan_skb_recv()\n\nBruno Prémont found commit 9793241fe92f7d930\n(vlan: Precise RX stats accounting) added a regression for non\nhw accelerated vlans.\n\n[ 26.390576] BUG: unable to handle kernel NULL pointer dereference at (null)\n[ 26.396369] IP: [\u003cdf856b89\u003e] vlan_skb_recv+0x89/0x280 [8021q]\n\nvlan_dev_info() was used with original device, instead of\nskb-\u003edev. Also spotted by Américo Wang.\n\nReported-By: Bruno Prémont \u003cbonbons@linux-vserver.org\u003e\nTested-By: Bruno Prémont \u003cbonbons@linux-vserver.org\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2c8c1e7297e19bdef3c178c3ea41d898a7716e3e", "tree": "4d336562e8d5379732a0646e17b0bb1750111ef6", "parents": [ "72659ecce68588b74f6c46862c2b4cec137d7a5a" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Sun Jan 17 03:35:32 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 17 19:16:02 2010 -0800" }, "message": "net: spread __net_init, __net_exit\n\n__net_init/__net_exit are apparently not going away, so use them\nto full extent.\n\nIn some cases __net_init was removed, because it was called from\n__net_exit code.\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1f3c8804acba841b5573b953f5560d2683d2db0d", "tree": "453fae141b4a37e72ee0513ea1816fbff8f1cf8a", "parents": [ "3a999e6eb5d277cd6a321dcda3fc43c3d9e4e4b8" ], "author": { "name": "Andy Gospodarek", "email": "andy@greyhouse.net", "time": "Mon Dec 14 10:48:58 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 03 21:17:16 2010 -0800" }, "message": "bonding: allow arp_ip_targets on separate vlans to use arp validation\n\nThis allows a bond device to specify an arp_ip_target as a host that is\nnot on the same vlan as the base bond device and still use arp\nvalidation. A configuration like this, now works:\n\nBONDING_OPTS\u003d\"mode\u003dactive-backup arp_interval\u003d1000 arp_ip_target\u003d10.0.100.1 arp_validate\u003d3\"\n\n1: lo: \u003cLOOPBACK,UP,LOWER_UP\u003e mtu 16436 qdisc noqueue\n link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00\n inet 127.0.0.1/8 scope host lo\n inet6 ::1/128 scope host\n valid_lft forever preferred_lft forever\n2: eth1: \u003cBROADCAST,MULTICAST,SLAVE,UP,LOWER_UP\u003e mtu 1500 qdisc pfifo_fast master bond0 qlen 1000\n link/ether 00:13:21:be:33:e9 brd ff:ff:ff:ff:ff:ff\n3: eth0: \u003cBROADCAST,MULTICAST,SLAVE,UP,LOWER_UP\u003e mtu 1500 qdisc pfifo_fast master bond0 qlen 1000\n link/ether 00:13:21:be:33:e9 brd ff:ff:ff:ff:ff:ff\n8: bond0: \u003cBROADCAST,MULTICAST,MASTER,UP,LOWER_UP\u003e mtu 1500 qdisc noqueue\n link/ether 00:13:21:be:33:e9 brd ff:ff:ff:ff:ff:ff\n inet6 fe80::213:21ff:febe:33e9/64 scope link\n valid_lft forever preferred_lft forever\n9: bond0.100@bond0: \u003cBROADCAST,MULTICAST,MASTER,UP,LOWER_UP\u003e mtu 1500 qdisc noqueue\n link/ether 00:13:21:be:33:e9 brd ff:ff:ff:ff:ff:ff\n inet 10.0.100.2/24 brd 10.0.100.255 scope global bond0.100\n inet6 fe80::213:21ff:febe:33e9/64 scope link\n valid_lft forever preferred_lft forever\n\nEthernet Channel Bonding Driver: v3.6.0 (September 26, 2009)\n\nBonding Mode: fault-tolerance (active-backup)\nPrimary Slave: None\nCurrently Active Slave: eth1\nMII Status: up\nMII Polling Interval (ms): 0\nUp Delay (ms): 0\nDown Delay (ms): 0\nARP Polling Interval (ms): 1000\nARP IP target/s (n.n.n.n form): 10.0.100.1\n\nSlave Interface: eth1\nMII Status: up\nLink Failure Count: 1\nPermanent HW addr: 00:40:05:30:ff:30\n\nSlave Interface: eth0\nMII Status: up\nLink Failure Count: 0\nPermanent HW addr: 00:13:21:be:33:e9\n\nSigned-off-by: Andy Gospodarek \u003candy@greyhouse.net\u003e\nSigned-off-by: Jay Vosburgh \u003cfubar@us.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bf9ae5386bca8836c16e69ab8fdbe46767d7452a", "tree": "1184d7062dd74f7ad2b85379a5bd40ab5b8ca4d6", "parents": [ "f83d664eef180478c2dc0a0099e9d7bc1c8177ff" ], "author": { "name": "Octavian Purdila", "email": "opurdila@ixiacom.com", "time": "Sat Dec 26 11:50:59 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Dec 26 20:38:23 2009 -0800" }, "message": "llc: use dev_hard_header\n\nUsing dev_hard_header allows us to use LLC with VLANs and potentially\nother Ethernet/TokernRing specific encapsulations. It also removes code\nduplication between LLC and Ethernet/TokenRing core code.\n\nSigned-off-by: Octavian Purdila \u003copurdila@ixiacom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fc4a7489663250360cd40d5adf06a08d1c5d54df", "tree": "ce8fed0a2dfc175b03834bb94717f5f2970c9146", "parents": [ "012093f6d5d89e6ed6e89c55c383f84b1cff7a78" ], "author": { "name": "Patrick Mullaney", "email": "pmullaney@novell.com", "time": "Thu Dec 03 15:59:22 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 03 15:59:22 2009 -0800" }, "message": "netdevice: provide common routine for macvlan and vlan operstate management\n\nProvide common routine for the transition of operational state for a leaf\ndevice during a root device transition.\n\nSigned-off-by: Patrick Mullaney \u003cpmullaney@novell.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "91e2ff3528ac90b9dbcb04b76488e8ad74e3d3d9", "tree": "33b346ebaab318dab8beb1f433453ceae65bced1", "parents": [ "650de8de16aa7c168c34d1b6a3191e4a5e2648c8" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Wed Dec 02 13:19:08 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 02 22:10:24 2009 -0800" }, "message": "net: Teach vlans to cleanup as a pernet subsystem\n\nTake advantage of the fact that an explicit rtnl_kill_links is\nunnecessary (and skipping it improves batching), as network namespace\nexit calls dellink on all remaining virtual devices, and\nrtnl_link_unregister calls dellink on all outstanding devices in that\nnetwork namespace. To do this we need to leave the vlan proc\ndirectories in place until after network device exit time, which is\ndone by using register_pernet_subsys instead of\nregister_pernet_device.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "946d1a9298c9e592b189a168326603c92d782b5f", "tree": "170e0e7410172146c99068ed17159a80c9d02f94", "parents": [ "15449745e5d181ae214ceaf0880350bb4e63512a" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Sun Nov 29 15:46:05 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 01 16:15:53 2009 -0800" }, "message": "net: Simplify vlan pernet operations.\n\nTake advantage of the new pernet automatic storage management,\nand stop using compatibility network namespace functions.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5e7565930524410f097f5b04f8aba663089a6ffc", "tree": "7575fb4b06fdad1e2e9796e0dc99ca011e59980e", "parents": [ "cc83f6d6922018a1b762f67af539867a6b05398e" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Wed Nov 25 07:54:54 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 26 16:00:36 2009 -0800" }, "message": "vlan: support \"loose binding\" to the underlying network device\n\nCurrently the UP/DOWN state of VLANs is synchronized to the state of the\nunderlying device, meaning all VLANs are set down once the underlying\ndevice is set down. This causes all routes to the VLAN devices to vanish.\n\nAdd a flag to specify a \"loose binding\" mode, in which only the operstate\nis transfered, but the VLAN device state is independant.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3505d1a9fd65e2d3e00827857b6795d9d8983658", "tree": "941cfafdb57c427bb6b7ebf6354ee93b2a3693b5", "parents": [ "dfef948ed2ba69cf041840b5e860d6b4e16fa0b1", "66b00a7c93ec782d118d2c03bd599cfd041e80a1" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 18 22:19:03 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 18 22:19:03 2009 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/sfc/sfe4001.c\n\tdrivers/net/wireless/libertas/cmd.c\n\tdrivers/staging/Kconfig\n\tdrivers/staging/Makefile\n\tdrivers/staging/rtl8187se/Kconfig\n\tdrivers/staging/rtl8192e/Kconfig\n" }, { "commit": "f99189b186f3922ede4fa33c02f6edc735b8c981", "tree": "e216447fc284d6ec98ac1550638ac3a79d71e084", "parents": [ "615534bc490606685621d63a40c0670d0f049d86" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Nov 17 10:42:49 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 18 05:03:25 2009 -0800" }, "message": "netns: net_identifiers should be read_mostly\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9793241fe92f7d9303fb221e43fc598eb065f267", "tree": "5f7a347c3a6b32a49e54f1f6ead1c96f2351208c", "parents": [ "d83345adf96bc13a5e360f4649a2e68ef968dec0" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Nov 17 04:53:09 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 17 23:51:55 2009 -0800" }, "message": "vlan: Precise RX stats accounting\n\nWith multi queue devices, its possible that several cpus call\nvlan RX routines simultaneously for the same vlan device.\n\nWe update RX stats counter without any locking, so we can\nget slightly wrong counters.\n\nOne possible fix is to use percpu counters, to get precise\naccounting and also get guarantee of no cache line ping pongs\nbetween cpus.\n\nNote: this adds 16 bytes (32 bytes on 64bit arches) of percpu\ndata per vlan device.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6b863d1d3239eff0f45c2e6e672f5b56db828db0", "tree": "8384f6f29891d684725015e1dad5a96e6d9fb8fc", "parents": [ "69c0cab120a85471054614418b447349caba22d7" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Nov 17 06:45:04 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 17 06:45:04 2009 -0800" }, "message": "vlan: Fix register_vlan_dev() error path\n\nIn case register_netdevice() returns an error, and a new vlan_group\nwas allocated and inserted in vlan_group_hash[] we call\nvlan_group_free() without deleting group from hash table. Future\nlookups can give infinite loops or crashes.\n\nWe must delete the vlan_group using RCU safe procedure.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b93ab837a2d3eb394082c9eae4ee0a4f83060027", "tree": "7189349bad6a0d145c6ba6a051e8eb79d07bc1ec", "parents": [ "c5d5d1721763842a516529e553433d13b11c3f31" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri Nov 13 06:33:11 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 15 22:21:33 2009 -0800" }, "message": "vlan: Use __vlan_hwaccel_put_tag() in rx\n\nCommit 05423b241311c9380 (vlan: allow null VLAN ID to be used)\nforgot to update __vlan_hwaccel_rx() \u0026 vlan_gro_common()\n\nWe need to set VLAN_TAG_PRESENT flag in skb-\u003evlan_tci\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cbbef5e183079455763fc470ccf69008f92ab4b6", "tree": "04063bfe9498e622623ed3e46155bcbd9b18c9c0", "parents": [ "572a9d7b6fc7f20f573664063324c086be310c42" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Nov 10 06:14:24 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Nov 13 14:07:33 2009 -0800" }, "message": "vlan/macvlan: propagate transmission state to upper layers\n\nBoth vlan and macvlan devices usually don\u0027t use a qdisc and immediately\nqueue packets to the underlying device. Propagate transmission state of\nthe underlying device to the upper layers so they can react on congestion\nand/or inform the sending process.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9e067597ee0e51a07bc158e9e2703ca676920e8b", "tree": "07436378544524a78d834aa664819ce64f969e19", "parents": [ "254245d23396aca1f9100d500163d7bd6019ab6f" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Tue Nov 10 07:54:48 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 10 22:26:30 2009 -0800" }, "message": "vlan: eliminate use of dev_base_lock\n\nDo not need to use read_lock(\u0026dev_base_lock), use RCU instead.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "81adee47dfb608df3ad0b91d230fb3cef75f0060", "tree": "e9d7a41872f84c1395e21915e5f92c05ab872e69", "parents": [ "f7a3a1d8affe563846fc17f0e7c0cc1500190c57" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@aristanetworks.com", "time": "Sun Nov 08 00:53:51 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 08 00:53:51 2009 -0800" }, "message": "net: Support specifying the network namespace upon device creation.\n\nThere is no good reason to not support userspace specifying the\nnetwork namespace during device creation, and it makes it easier\nto create a network device and pass it to a child network namespace\nwith a well known name.\n\nWe have to be careful to ensure that the target network namespace\nfor the new device exists through the life of the call. To keep\nthat logic clear I have factored out the network namespace grabbing\nlogic into rtnl_link_get_net.\n\nIn addtion we need to continue to pass the source network namespace\nto the rtnl_link_ops.newlink method so that we can find the base\ndevice source network namespace.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@aristanetworks.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\n" }, { "commit": "29906f6a427d2004a515ebbcdc7b28bae8f6c19c", "tree": "12749e2d6afd82ec9c1b40aa08d012a5d4709cc6", "parents": [ "f0816ce39d8de7646301aac52cc7351a2424d97f" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Oct 29 23:43:00 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 29 23:43:00 2009 -0700" }, "message": "vlan: cleanup multiple unregistrations\n\nThe temporary copy of the VLAN group is not neccessary since the lower device\nis already in the process of being unregistered, if it was neccessary the\nmemset of the global group would introduce a race condition.\n\nWith this removed, the changes to the original code are only a few lines, so\nremove the new function and move the code back into vlan_device_event().\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c7c4b3b6e976b95facbb723951bdcd554a3530a4", "tree": "9a53a7f850eec755b3c66d4a129d31ce4a8591da", "parents": [ "5b252f0c2f98df21fadf0f6cf189b87a0b938228" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Thu Oct 29 21:36:53 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 29 21:36:53 2009 -0700" }, "message": "gro: Change all receive functions to return GRO result codes\n\nThis will allow drivers to adjust their receive path dynamically\nbased on whether GRO is being applied successfully.\n\nCurrently all in-tree callers ignore the return values of these\nfunctions and do not need to be changed.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nAcked-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5b252f0c2f98df21fadf0f6cf189b87a0b938228", "tree": "d3003625d8c5fd6d54466f81cffab1b5459bb98f", "parents": [ "0519d83d83ed485b5a1f9222ff69d7d6c9bb8a01" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Thu Oct 29 07:17:09 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 29 21:33:55 2009 -0700" }, "message": "gro: Name the GRO result enumeration type\n\nThis clarifies which return and parameter types are GRO result codes\nand not RX result codes.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nAcked-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d6534799410d2b53e5e80b8a90d6a8bab3de30ed", "tree": "14b585f2282cb6a19d181684bccbe8decc5f7851", "parents": [ "61a1fa102ada6d8ee9f2293d126ed9f580ca0751" ], "author": { "name": "Yi Zou", "email": "yi.zou@intel.com", "time": "Wed Oct 28 18:25:16 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 29 01:04:04 2009 -0700" }, "message": "vlan: Add support to netdev_ops.ndo_fcoe_get_wwn for VLAN device\n\nImplements the netdev_ops.ndo_fcoe_get_wwn for VLAN device.\n\nSigned-off-by: Yi Zou \u003cyi.zou@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "63c8099d90096db56ee1c66c31f05d4fcfbc1c69", "tree": "1c0393ab776d49476858a4f97b3d60597330f370", "parents": [ "23289a37e2b127dfc4de1313fba15bb4c9f0cd5b" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Oct 27 07:06:49 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 28 02:22:08 2009 -0700" }, "message": "vlan: Optimize multiple unregistration\n\nUse unregister_netdevice_many() to speedup master device unregister.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "23289a37e2b127dfc4de1313fba15bb4c9f0cd5b", "tree": "209edb2cb43dedb97477e1297873ada4759a1066", "parents": [ "9b5e383c11b08784eb0087617f880077982ef769" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Oct 27 07:06:36 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 28 02:22:07 2009 -0700" }, "message": "net: add a list_head parameter to dellink() method\n\nAdding a list_head parameter to rtnl_link_ops-\u003edellink() methods\nallow us to queue devices on a list, in order to dismantle\nthem all at once.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "05423b241311c9380b7280179295bac7794281b6", "tree": "8a84aca48cbc30b142bdf143dbf11fdbab9cad67", "parents": [ "9dbb58d867e90d2528752339751216c955523e62" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Oct 26 18:40:35 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 27 01:02:33 2009 -0700" }, "message": "vlan: allow null VLAN ID to be used\n\nWe currently use a 16 bit field (vlan_tci) to store VLAN ID/PRIO on a skb.\n\nNull value is used as a special value, meaning vlan tagging not enabled.\nThis forbids use of null vlan ID.\n\nAs pointed by David, some drivers use the 3 high order bits (PRIO)\n\nAs VLAN ID is 12 bits, we can use the remaining bit (CFI) as a flag, and\nallow null VLAN ID.\n\nIn case future code really wants to use VLAN_CFI_MASK, we\u0027ll have to use\na bit outside of vlan_tci.\n\n#define VLAN_PRIO_MASK 0xe000 /* Priority Code Point */\n#define VLAN_PRIO_SHIFT 13\n#define VLAN_CFI_MASK 0x1000 /* Canonical Format Indicator */\n#define VLAN_TAG_PRESENT VLAN_CFI_MASK\n#define VLAN_VID_MASK 0x0fff /* VLAN Identifier */\n\nReported-by: Gertjan Hofman \u003cgertjan_hofman@yahoo.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fc482cc54e56bde012585905eb0f3565bec18ff5", "tree": "e8e9c493268c34ba2b729d9a21dcd2b74b99f9fa", "parents": [ "a71b4f5e2b42a773947625ce0a6367837f8d9359" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Fri Sep 25 13:11:24 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Sep 26 20:16:07 2009 -0700" }, "message": "net: fix vlan_get_size to include vlan_flags size\n\nFix vlan_get_size to include vlan-\u003eflags. Currently, the\nsize of the vlan flags is not included in the nlmsg size.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1a123a3168566b10f87f228ae963770b26f27420", "tree": "cebf893e0ae4de5ee5077b69002f41d8f61d45f9", "parents": [ "2c11455321f37da6fe6cc36353149f9ac9183334" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Sep 03 00:39:16 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 03 20:02:17 2009 -0700" }, "message": "vlan: adds drops accounting\n\nIts hard to tell if vlans are dropping frames, since\nevery frame given to vlan_???_start_xmit() functions\nis accounted as fully transmitted by lower device.\n\nWe can test dev_queue_xmit() return values to\nproperly account for dropped frames.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2f8bc32b7a08502a79e0ccec8697000f2977f2fd", "tree": "c08fc64bc8b7cfe5b71d832ca9854f2dc21e6991", "parents": [ "d1b19dff9159bb88fe839c30a7c071faf4761933" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Sep 03 02:19:58 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 03 02:19:58 2009 -0700" }, "message": "vlan: enable multiqueue xmits\n\nvlan_dev_hard_start_xmit() \u0026 vlan_dev_hwaccel_hard_start_xmit()\nselect txqueue number 0, instead of using index provided by\nskb_get_queue_mapping().\n\nThis is not correct after commit 2e59af3dcbdf11635c03f\n[vlan: multiqueue vlan device] because\ntxq-\u003etx_packets \u0026 txq-\u003etx_bytes changes are performed on\na single location, and not the right locking.\n\nFix is to take the appropriate struct netdev_queue pointer\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n\n" }, { "commit": "2e59af3dcbdf11635c03f22bfc9706744465d589", "tree": "c01e87c0ef6568bae987f4628a8656ba0d05aa23", "parents": [ "5848cc096a23b80b3d15c27d72299f79caf7c517" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Sep 02 18:03:00 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 02 18:03:00 2009 -0700" }, "message": "vlan: multiqueue vlan device\n\nvlan devices are currently not multi-queue capable.\n\nWe can do that with a new rtnl_link_ops method,\nget_tx_queues(), called from rtnl_create_link()\n\nThis new method gets num_tx_queues/real_num_tx_queues\nfrom real device.\n\nregister_vlan_device() is also handled.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0af46d997fcbfd25a9e166c2431bfebc03720a36", "tree": "9516091be48bed458de11e9c6da529c16c2dffc3", "parents": [ "cb45439977d3602b91dd0aca2d94fa3b32aebba6" ], "author": { "name": "Yi Zou", "email": "yi.zou@intel.com", "time": "Mon Aug 31 12:31:55 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Sep 01 01:24:23 2009 -0700" }, "message": "vlan: Add support for net_devices_ops.ndo_fcoe_enable/_disable to VLAN\n\nThis adds implementation of the net_devices_ops.ndo_fcoe_enable/_disable to\nthe VLAN driver. It checks if the real_dev has support for ndo_fcoe_enable/\nndo_fcoe_disable and if so, passes on to call the associated real_dev.\n\nSigned-off-by: Yi Zou \u003cyi.zou@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6fef4c0c8eeff7de13007a5f56113475444a253d", "tree": "216bafb88ab84c5e0a048598cd6c05f7eb8f438d", "parents": [ "dc1f8bf68b311b1537cb65893430b6796118498a" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Mon Aug 31 19:50:41 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Sep 01 01:13:07 2009 -0700" }, "message": "netdev: convert pseudo-devices to netdev_tx_t\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b85daa5324a3c9e560a4351c17d18f49c647eb5c", "tree": "0616b7adcb0b785560b4826a211517aeb84f03d3", "parents": [ "cf9911166113e471e1796eaf273982d8e43b138d" ], "author": { "name": "Vasu Dev", "email": "vasu.dev@intel.com", "time": "Fri Aug 14 12:41:07 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Aug 14 16:12:06 2009 -0700" }, "message": "vlan: adds fcoe offload related net_device_ops and updates fcoe_ddp_xid field\n\nAdds fcoe offload related net_device_ops functions vlan_dev_fcoe_ddp_setup\nand vlan_dev_fcoe_ddp_done, their implementation simply calls real eth device\nnet_device_ops for FCoE DDP setup and done operations.\n\nUpdates VLAN netdev field value for fcoe_ddp_xid from real eth device netdev.\n\nAbove changes are required for fcoe DDP offload working on a VLAN interface.\n\nSigned-off-by: Vasu Dev \u003cvasu.dev@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "36cbd3dcc10384f813ec0814255f576c84f2bcd4", "tree": "c3579edea972519d2f9ae99d7da9a5dd56e6f5c1", "parents": [ "db71789c01ae7b641f83c5aa64e7df25122f4b28" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Wed Aug 05 10:42:58 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 05 10:42:58 2009 -0700" }, "message": "net: mark read-only arrays as const\n\nString literals are constant, and usually, we can also tag the array\nof pointers const too, moving it to the .rodata section.\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b4076d1715b8a38138db0805a85932b3b650d583", "tree": "3b7ab6f84953f16a8ea8bed8aa40617e71308fad", "parents": [ "573dd788ccd919f90c78f971c0da124ffa4b8bff" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Thu Jul 30 13:16:45 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 30 13:16:45 2009 -0700" }, "message": "vlan: allow creating vlan when real device is not up\n\nThere is no reason for the arbitrary restriction that device must be\nup to create a vlan. This patch was added to Vyatta kernel to resolve startup\nordering issues where vlan\u0027s are created but real device was disabled.\n\nNote: the vlan already correctly inherits the operstate from real device; so\nif vlan is created and real device is marked down, the vlan is marked\ndown.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2e477c9bd2bb6a1606e498adb53ba913378ecdf2", "tree": "fc1e7b9488cac5a66ac1c5f2196a2400fe5fdf52", "parents": [ "37cf2b8d1622897cf57e70cdab9eba57feb5ff6c" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon Jul 20 07:35:37 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 20 07:35:37 2009 -0700" }, "message": "vlan: Propagate physical MTU changes\n\nWhen the physical MTU changes we want to ensure that all existing\nVLAN device MTUs do not exceed the new underlying MTU. This patch\nadds that propagation.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6e327c11a91d190650df9aabe7d3694d4838bfa1", "tree": "14e1df4f759109548dea22372ad971624e23b8ab", "parents": [ "1abb0de2f89c1f9c454c973356b9e4867722f10a" ], "author": { "name": "Jesper Dangaard Brouer", "email": "hawk@comx.dk", "time": "Mon Jun 08 03:11:28 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 10 01:11:22 2009 -0700" }, "message": "8021q: Vlan driver should use rcu_barrier() on unload instead of syncronize_net()\n\nThe VLAN 8021q driver needs to call rcu_barrier() when unloading the module,\ninstead of syncronize_net(). This is needed to make sure that outstanding\ncall_rcu() callbacks have completed, before the callback function code is\nremoved on module unload.\n\nSigned-off-by: Jesper Dangaard Brouer \u003chawk@comx.dk\u003e\nReviewed-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nAcked-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ccffad25b5136958d4769ed6de5e87992dd9c65c", "tree": "cd5f36fe67f4deeae23d76436f7a032a201cba44", "parents": [ "ae63e808f508c38fe65e23a1480c85d5bd00ecbd" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Fri May 22 23:22:17 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 29 22:12:32 2009 -0700" }, "message": "net: convert unicast addr list\n\nThis patch converts unicast address list to standard list_head using\npreviously introduced struct netdev_hw_addr. It also relaxes the\nlocking. Original spinlock (still used for multicast addresses) is not\nneeded and is no longer used for a protection of this list. All\nreading and writing takes place under rtnl (with no changes).\n\nI also removed a possibility to specify the length of the address\nwhile adding or deleting unicast address. It\u0027s always dev-\u003eaddr_len.\n\nThe convertion touched especially e1000 and ixgbe codes when the\nchange is not so trivial.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\n\n drivers/net/bnx2.c | 13 +--\n drivers/net/e1000/e1000_main.c | 24 +++--\n drivers/net/ixgbe/ixgbe_common.c | 14 ++--\n drivers/net/ixgbe/ixgbe_common.h | 4 +-\n drivers/net/ixgbe/ixgbe_main.c | 6 +-\n drivers/net/ixgbe/ixgbe_type.h | 4 +-\n drivers/net/macvlan.c | 11 +-\n drivers/net/mv643xx_eth.c | 11 +-\n drivers/net/niu.c | 7 +-\n drivers/net/virtio_net.c | 7 +-\n drivers/s390/net/qeth_l2_main.c | 6 +-\n drivers/scsi/fcoe/fcoe.c | 16 ++--\n include/linux/netdevice.h | 18 ++--\n net/8021q/vlan.c | 4 +-\n net/8021q/vlan_dev.c | 10 +-\n net/core/dev.c | 195 +++++++++++++++++++++++++++-----------\n net/dsa/slave.c | 10 +-\n net/packet/af_packet.c | 4 +-\n 18 files changed, 227 insertions(+), 137 deletions(-)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e3804cbebb67887879102925961d41b503f7fbe3", "tree": "0c2290608f511bf97978767e159121e3009c56e3", "parents": [ "c649c0e31d5736a4b7c5c3454182091dda4bbe62" ], "author": { "name": "Alexander Beregalov", "email": "a.beregalov@gmail.com", "time": "Mon May 25 01:53:53 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 25 01:53:53 2009 -0700" }, "message": "net: remove COMPAT_NET_DEV_OPS\n\nAll drivers are already converted to new net_device_ops API\nand nobody uses old API anymore.\n\nSigned-off-by: Alexander Beregalov \u003ca.beregalov@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "93f154b594fe47e4a7e5358b309add449a046cd3", "tree": "479d9f2db25922a2312547c97e73d5a11b68bb1c", "parents": [ "496a60cdcd5d0d884dddf6c3b4ea912923a70f13" ], "author": { "name": "Eric Dumazet", "email": "dada1@cosmosbay.com", "time": "Mon May 18 22:19:19 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 18 22:19:19 2009 -0700" }, "message": "net: release dst entry in dev_hard_start_xmit()\n\nOne point of contention in high network loads is the dst_release() performed\nwhen a transmited skb is freed. This is because NIC tx completion calls\ndev_kree_skb() long after original call to dev_queue_xmit(skb).\n\nCPU cache is cold and the atomic op in dst_release() stalls. On SMP, this is\nquite visible if one CPU is 100% handling softirqs for a network device,\nsince dst_clone() is done by other cpus, involving cache line ping pongs.\n\nIt seems right place to release dst is in dev_hard_start_xmit(), for most\ndevices but ones that are virtual, and some exceptions.\n\nDavid Miller suggested to define a new device flag, set in alloc_netdev_mq()\n(so that most devices set it at init time), and carefuly unset in devices\nwhich dont want a NULL skb-\u003edst in their ndo_start_xmit().\n\nList of devices that must clear this flag is :\n\n- loopback device, because it calls netif_rx() and quoting Patrick :\n \"ip_route_input() doesn\u0027t accept loopback addresses, so loopback packets\n already need to have a dst_entry attached.\"\n- appletalk/ipddp.c : needs skb-\u003edst in its xmit function\n\n- And all devices that call again dev_queue_xmit() from their xmit function\n(as some classifiers need skb-\u003edst) : bonding, vlan, macvlan, eql, ifb, hdlc_fr\n\nSigned-off-by: Eric Dumazet \u003cdada1@cosmosbay.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "450c4ea15ecb89567e6a75b89cbb8a598a7efb75", "tree": "5e99e5e58ca2e5e046d47963773ef66857bec46a", "parents": [ "7004bf252c53da18f6b55103e0c92f777f846806" ], "author": { "name": "Eric Dumazet", "email": "dada1@cosmosbay.com", "time": "Mon May 18 00:35:38 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 18 15:15:06 2009 -0700" }, "message": "vlan: use struct netdev_queue counters instead of dev-\u003estats\n\nWe can update netdev_queue tx_bytes/tx_packets/tx_dropped counters instead\nof dev-\u003estats ones, to reduce number of cache lines dirtied in xmit path.\n\nThis fixes a performance problem on SMP when many different cpus take\nvlan tx path.\n\nSigned-off-by: Eric Dumazet \u003cdada1@cosmosbay.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "aba7453037c3a90714caae77a622dceaf1173786", "tree": "bf07f9f432b0d8e9db9486f1f32ad065c0aa7c5c", "parents": [ "a4fe91ee711f4e955ea85ab05b092cfe384b073e", "93af7aca44f0e82e67bda10a0fb73d383edcc8bd" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 29 20:30:35 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 29 20:30:35 2009 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tDocumentation/isdn/00-INDEX\n\tdrivers/net/wireless/iwlwifi/iwl-scan.c\n\tdrivers/net/wireless/rndis_wlan.c\n\tnet/mac80211/main.c\n" }, { "commit": "adc667e84f086aa110d810f3476c494e48eaabaa", "tree": "4a1267f1d2aa44893e2dc6c779ae686a01db409d", "parents": [ "1c41e238e0beaac530c5c9d629e8dfbbadc4a099" ], "author": { "name": "Jay Vosburgh", "email": "fubar@us.ibm.com", "time": "Sat Apr 25 18:03:35 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Apr 25 18:03:35 2009 -0700" }, "message": "vlan: update vlan carrier state for admin up/down\n\n\tCurrently, the VLAN event handler does not adjust the VLAN\ndevice\u0027s carrier state when the real device or the VLAN device is set\nadministratively up or down.\n\n\tThe following patch adds a transfer of operating state from the\nreal device to the VLAN device when the real device is administratively\nset up or down, and sets the carrier state up or down during init, open\nand close of the VLAN device.\n\n\tThis permits observers above the VLAN device that care about the\ncarrier state (bonding\u0027s link monitor, for example) to receive updates\nfor administrative changes by more closely mimicing the behavior of real\ndevices.\n\nSigned-off-by: Jay Vosburgh \u003cfubar@us.ibm.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "b1b67dd45a6b629eb41553856805aaa1614fbb83", "tree": "23d2b8dc59223b649f466564dac338c899595a7c", "parents": [ "4510d7cb8b4e7d389652b8a4f89fad469a5ecc92" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon Apr 20 04:49:28 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 21 02:00:51 2009 -0700" }, "message": "net: factor out ethtool invocation of vlan/macvlan drivers\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e5e9743bb7429f53c83ad69b432f7b661e74c3f0", "tree": "db3691aef0d46c4aed4a2be6dc8ab7c44c3488cb", "parents": [ "a0f82f64e26929776c58a5c93c2ecb38e3d82815", "775d8d931581764a1ec982ebe5a927b12762fb6d" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 21 01:32:26 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 21 01:32:26 2009 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tnet/core/dev.c\n" }, { "commit": "7816a0a862d851d0b05710e7d94bfe390f3180e2", "tree": "0b4f9099df21b1f7295637e8c28aa72721150b7d", "parents": [ "75a241f959a65ec9bde237d1af1a34ef794f0c9c" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Apr 17 15:59:23 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 17 15:59:23 2009 -0700" }, "message": "vlan/macvlan: fix NULL pointer dereferences in ethtool handlers\n\nCheck whether the underlying device provides a set of ethtool ops before\nchecking for individual handlers to avoid NULL pointer dereferences.\n\nReported-by: Art van Breemen \u003card@telegraafnet.nl\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a54bfa40fd16aeb90bc556189221576f746f8567", "tree": "176bb7a99ffab5f42f0dd4e9671f335be3f3efa0", "parents": [ "fe957c40ec5e2763b9977c565beab3bde3aaf85b", "134ffb4cad92a6aa534e55a9be145bca780a32c1" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 16 17:35:26 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 16 17:35:26 2009 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "76620aafd66f0004829764940c5466144969cffc", "tree": "38041e6938121b5611546c582cd23f289db047b0", "parents": [ "861ab44059350e5cab350238606cf8814abab93b" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Thu Apr 16 02:02:07 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 16 02:02:07 2009 -0700" }, "message": "gro: New frags interface to avoid copying shinfo\n\nIt turns out that copying a 16-byte area at ~800k times a second\ncan be really expensive :) This patch redesigns the frags GRO\ninterface to avoid copying that area twice.\n\nThe two disciples of the frags interface have been converted.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1db9e29bb0ff3c9366e8a50fb09ca8dbc364bfd6", "tree": "2fc6f44fed9784fa3d136bbafa6bc7a3ab50c4bb", "parents": [ "03a980d162eb48a79ce21d47f45b9ec7d9db20e9" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon Apr 13 04:41:01 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 13 15:44:50 2009 -0700" }, "message": "gro: Normalise skb before bypassing GRO on netpoll VLAN path\n\nHi:\n\ngro: Normalise skb before bypassing GRO on netpoll VLAN path\n\nWhen we detect netpoll RX on the GRO VLAN path we bail out and\ncall the normal VLAN receive handler. However, the packet needs\nto be normalised by calling eth_type_trans since that\u0027s what the\nnormal path expects (normally the GRO path does the fixup).\n\nThis patch adds the necessary call to vlan_gro_frags.\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": "2ffb4558194037133121e260022baa0d21590473", "tree": "15e070b0b42ba4466a23ee61a5352e59bf1bd4fc", "parents": [ "d1c76af9e2434fac3add561e26c61b06503de986" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Mar 17 13:10:52 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 17 13:10:52 2009 -0700" }, "message": "gro: Fix vlan/netpoll check again\n\nJarek Poplawski pointed out that my previous fix is broken for\nVLAN+netpoll as if netpoll is enabled we\u0027d end up in the normal\nreceive path instead of the VLAN receive path.\n\nThis patch fixes it by calling the VLAN receive hook.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d1c76af9e2434fac3add561e26c61b06503de986", "tree": "cbedc7c96c4b7db3d7a5a8300117804c5e0230d9", "parents": [ "afece1c6587010cc81d1a43045c855774e8234a3" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon Mar 16 10:50:02 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 16 10:50:02 2009 -0700" }, "message": "GRO: Move netpoll checks to correct location\n\nAs my netpoll fix for net doesn\u0027t really work for net-next, we\nneed this update to move the checks into the right place. As it\nstands we may pass freed skbs to netpoll_receive_skb.\n\nThis patch also introduces a netpoll_rx_on function to avoid GRO\ncompletely if we\u0027re invoked through netpoll. This might seem\nparanoid but as netpoll may have an external receive hook it\u0027s\nbetter to be safe than sorry. I don\u0027t think we need this for\n2.6.29 though since there\u0027s nothing immediately broken by it.\n\nThis patch also moves the GRO_* return values to netdevice.h since\nVLAN needs them too (I tried to avoid this originally but alas\nthis seems to be the easiest way out). This fixes a bug in VLAN\nwhere it continued to use the old return value 2 instead of the\ncorrect GRO_DROP.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7546dd97d27306d939c13e03318aae695badaa88", "tree": "ced310466fd679ceae4e676ae8c31fd78b7bd72f", "parents": [ "3f612132c7164d5cc9ed677a2fdf8950222d2170" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Mon Mar 09 08:18:29 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 10 05:22:43 2009 -0700" }, "message": "net: convert usage of packet_type to read_mostly\n\nProtocols that use packet_type can be __read_mostly section for better\nlocality. Elminate any unnecessary initializations of NULL.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "508827ff0ac3981d420edac64a70de7f4e304d38", "tree": "b0cee8ddef9f0ceab68c388e4ae46b7295eb2cb5", "parents": [ "2c3c3d02f28801d7ad2da4952b2c7ca6621ef221", "72e2240f181871675d3a979766330c91d48a1673" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 05 02:06:47 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 05 02:06:47 2009 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/tokenring/tmspci.c\n\tdrivers/net/ucc_geth_mii.c\n" }, { "commit": "9d40bbda599def1e1d155d7f7dca14fe8744bd2b", "tree": "d246fbaec294830ecab0bb4b3b38d925abb5ffd8", "parents": [ "54acd0efab072cb70e87206329d561b297f93bbb" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 04 23:46:25 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 04 23:46:25 2009 -0800" }, "message": "vlan: Fix vlan-in-vlan crashes.\n\nAs analyzed by Patrick McHardy, vlan needs to reset it\u0027s\nnetdev_ops pointer in it\u0027s -\u003einit() function but this\nleaves the compat method pointers stale.\n\nAdd a netdev_resync_ops() and call it from the vlan code.\n\nAny other driver which changes -\u003enetdev_ops after register_netdevice()\nwill need to call this new function after doing so too.\n\nWith help from Patrick McHardy.\n\nTested-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "aa4abc9bcce0d2a7ec189e897f8f8c58ca04643b", "tree": "22ef88d84a2e06380bb6a853c3ba28657e4e5f92", "parents": [ "814c01dc7c533033b4e99981a2e24a6195bfb43c", "52c0326beaa3cb0049d0f1c51c6ad5d4a04e4430" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Mar 01 21:35:16 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Mar 01 21:35:16 2009 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/wireless/iwlwifi/iwl-tx.c\n\tnet/8021q/vlan_core.c\n\tnet/core/dev.c\n" }, { "commit": "4ead443163b798661c2a2ede5e512e116a9e41e7", "tree": "7fb2f0cf1446315805c9ddc3362b124c374c8695", "parents": [ "18963caaf55240d6a0491bdb27b7fef2882ffb15" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Sun Mar 01 00:11:52 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Mar 01 00:11:52 2009 -0800" }, "message": "netpoll: Add drop checks to all entry points\n\nThe netpoll entry checks are required to ensure that we don\u0027t\nreceive normal packets when invoked via netpoll. Unfortunately\nit only ever worked for the netif_receive_skb/netif_rx entry\npoints. The VLAN (and subsequently GRO) entry point didn\u0027t\nhave the check and therefore can trigger all sorts of weird\nproblems.\n\nThis patch adds the netpoll check to all entry points.\n\nI\u0027m still uneasy with receiving at all under netpoll (which\napparently is only used by the out-of-tree kdump code). The\nreason is it is perfectly legal to receive all data including\nheaders into highmem if netpoll is off, but if you try to do\nthat with netpoll on and someone gets a printk in an IRQ handler \nyou\u0027re going to get a nice BUG_ON.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "aa4b9f533ed5a22952e038b9fac2447ccc682124", "tree": "91722b13a63dcd0e49695388e633cfa91b856b80", "parents": [ "4ae5544f9a33e4ae306e337f96951eb3ff2df6d9" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Sun Feb 08 18:00:37 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Feb 08 20:22:18 2009 -0800" }, "message": "gro: Optimise Ethernet header comparison\n\nThis patch optimises the Ethernet header comparison to use 2-byte\nand 4-byte xors instead of memcmp. In order to facilitate this,\nthe actual comparison is now carried out by the callers of the\nshared dev_gro_receive function.\n\nThis has a significant impact when receiving 1500B packets through\n10GbE.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "09640e6365c679b5642b1c41b6d7078f51689ddf", "tree": "a2b80c153bd23fe59db8c6994fda29923819fcea", "parents": [ "ee437770c42088b9b653e8b3bf28a61fa647f84e" ], "author": { "name": "Harvey Harrison", "email": "harvey.harrison@gmail.com", "time": "Sun Feb 01 00:45:17 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Feb 01 00:45:17 2009 -0800" }, "message": "net: replace uses of __constant_{endian}\n\nBase versions handle constant folding now.\n\nSigned-off-by: Harvey Harrison \u003charvey.harrison@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" } ], "next": "86911732d3996a9da07914b280621450111bb6da" }