)]}' { "log": [ { "commit": "5e152b4c9e0fce6149c74406346a7ae7e7a17727", "tree": "12503a50142797c1babfd87099c193b3e4d54f93", "parents": [ "a77febbef105554c5a37241cf903f48ab7bc03c7", "9251bac97d47fdaea406ea0595c2d0aa50022f12" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 15:39:34 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 23 15:39:34 2011 -0700" }, "message": "Merge branch \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6\n\n* \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (27 commits)\n PCI: Don\u0027t use dmi_name_in_vendors in quirk\n PCI: remove unused AER functions\n PCI/sysfs: move bus cpuaffinity to class dev_attrs\n PCI: add rescan to /sys/.../pci_bus/.../\n PCI: update bridge resources to get more big ranges when allocating space (again)\n KVM: Use pci_store/load_saved_state() around VM device usage\n PCI: Add interfaces to store and load the device saved state\n PCI: Track the size of each saved capability data area\n PCI/e1000e: Add and use pci_disable_link_state_locked()\n x86/PCI: derive pcibios_last_bus from ACPI MCFG\n PCI: add latency tolerance reporting enable/disable support\n PCI: add OBFF enable/disable support\n PCI: add ID-based ordering enable/disable support\n PCI hotplug: acpiphp: assume device is in state D0 after powering on a slot.\n PCI: Set PCIE maxpayload for card during hotplug insertion\n PCI/ACPI: Report _OSC control mask returned on failure to get control\n x86/PCI: irq and pci_ids patch for Intel Panther Point DeviceIDs\n PCI: handle positive error codes\n PCI: check pci_vpd_pci22_wait() return\n PCI: Use ICH6_GPIO_EN in ich6_lpc_acpi_gpio\n ...\n\nFix up trivial conflicts in include/linux/pci_ids.h: commit a6e5e2be4461\nmoved the intel SMBUS ID definitons to the i2c-i801.c driver.\n" }, { "commit": "70c71606190e9115e5f8363bfcd164c582eb314a", "tree": "17c7f6b5df814b9ed319bc0d839969a0de741433", "parents": [ "281dc5c5ec0fb299514567cbc358562649c1af95" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sun May 22 16:47:17 2011 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 22 21:41:57 2011 -0700" }, "message": "Add appropriate \u003clinux/prefetch.h\u003e include for prefetch users\n\nAfter discovering that wide use of prefetch on modern CPUs\ncould be a net loss instead of a win, net drivers which were\nrelying on the implicit inclusion of prefetch.h via the list\nheaders showed up in the resulting cleanup fallout. Give\nthem an explicit include via the following $0.02 script.\n\n \u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n #!/bin/bash\n MANUAL\u003d\"\"\n for i in `git grep -l \u0027prefetch(.*)\u0027 .` ; do\n \tgrep -q \u0027\u003clinux/prefetch.h\u003e\u0027 $i\n \tif [ $? \u003d 0 ] ; then\n \t\tcontinue\n \tfi\n\n \t(\techo \u0027?^#include \u003clinux/?a\u0027\n \t\techo \u0027#include \u003clinux/prefetch.h\u003e\u0027\n \t\techo .\n \t\techo w\n \t\techo q\n \t) | ed -s $i \u003e /dev/null 2\u003e\u00261\n \tif [ $? !\u003d 0 ]; then\n \t\techo $i needs manual fixup\n \t\tMANUAL\u003d\"$i $MANUAL\"\n \tfi\n done\n echo ------------------- 8\\\u003c----------------------\n echo vi $MANUAL\n \u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\nSigned-off-by: Paul \u003cpaul.gortmaker@windriver.com\u003e\n[ Fixed up some incorrect #include placements, and added some\n non-network drivers and the fib_trie.c case - Linus ]\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9f728f53dd70396f3183d2f0861022259471824b", "tree": "e5591f2bec0d94c0eb753958c511a21b6bd00d8e", "parents": [ "a3170c1f924ce2565c4e160b9b095e65c03b2dc6" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Thu May 12 17:11:47 2011 -0700" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Sat May 21 12:16:44 2011 -0700" }, "message": "PCI/e1000e: Add and use pci_disable_link_state_locked()\n\nNeed to use it in _e1000e_disable_aspm. This routine is used for error\nrecovery, where the pci_bus_sem is already held, and we don\u0027t want\npci_disable_link_state to try to take it again. So add a locked variant\nfor use in cases like this.\n\nFound lock up:\n\n[ 2374.654557] kworker/32:1 D ffff881027f6b0f0 0 6075 2 0x00000000\n[ 2374.654816] ffff88503f099a68 0000000000000046 ffff88503f098000 0000000000004000\n[ 2374.654837] 00000000001d1ec0 ffff88503f099fd8 00000000001d1ec0 ffff88503f099fd8\n[ 2374.654860] 0000000000004000 00000000001d1ec0 ffff88503dcc8000 ffff88503f090000\n[ 2374.654880] Call Trace:\n[ 2374.654898] [\u003cffffffff810b1302\u003e] ? __lock_acquired+0x3a/0x224\n[ 2374.654914] [\u003cffffffff81c2b59c\u003e] ? _raw_spin_unlock_irq+0x30/0x36\n[ 2374.654925] [\u003cffffffff810b069d\u003e] ? trace_hardirqs_on_caller+0x1f/0x178\n[ 2374.654936] [\u003cffffffff81c2ab24\u003e] rwsem_down_failed_common+0xd3/0x103\n[ 2374.654945] [\u003cffffffff810b158f\u003e] ? __lock_contended+0x3a/0x2a2\n[ 2374.654955] [\u003cffffffff81c2ab7b\u003e] rwsem_down_read_failed+0x12/0x14\n[ 2374.654967] [\u003cffffffff813371e4\u003e] call_rwsem_down_read_failed+0x14/0x30\n[ 2374.654981] [\u003cffffffff8135df20\u003e] ? pci_disable_link_state+0x5f/0xf5\n[ 2374.654990] [\u003cffffffff81c2a0e6\u003e] ? down_read+0x7e/0x91\n[ 2374.654999] [\u003cffffffff8135df20\u003e] ? pci_disable_link_state+0x5f/0xf5\n[ 2374.655008] [\u003cffffffff8135df20\u003e] pci_disable_link_state+0x5f/0xf5\n[ 2374.655024] [\u003cffffffff81661796\u003e] e1000e_disable_aspm+0x55/0x5a\n[ 2374.655037] [\u003cffffffff816677eb\u003e] e1000_io_slot_reset+0x59/0xea\n[ 2374.655048] [\u003cffffffff8135fe0d\u003e] ? report_mmio_enabled+0x5d/0x5d\n[ 2374.655057] [\u003cffffffff8135fe3b\u003e] report_slot_reset+0x2e/0x5d\n[ 2374.655072] [\u003cffffffff8135369e\u003e] pci_walk_bus+0x8a/0xb7\n[ 2374.655081] [\u003cffffffff8135fe0d\u003e] ? report_mmio_enabled+0x5d/0x5d\n[ 2374.655091] [\u003cffffffff813603be\u003e] broadcast_error_message+0xa4/0xb2\n[ 2374.655101] [\u003cffffffff81352c71\u003e] ? pci_bus_read_config_dword+0x72/0x80\n[ 2374.655110] [\u003cffffffff813606df\u003e] do_recovery+0x9e/0xf9\n[ 2374.655120] [\u003cffffffff81360786\u003e] handle_error_source+0x4c/0x51\n[ 2374.655129] [\u003cffffffff81360974\u003e] aer_isr_one_error+0x1e9/0x21a\n[ 2374.655138] [\u003cffffffff81360a6c\u003e] aer_isr+0xc7/0xcc\n[ 2374.655147] [\u003cffffffff813609a5\u003e] ? aer_isr_one_error+0x21a/0x21a\n[ 2374.655159] [\u003cffffffff81096d9f\u003e] process_one_work+0x237/0x3ec\n[ 2374.655168] [\u003cffffffff81096d10\u003e] ? process_one_work+0x1a8/0x3ec\n[ 2374.655178] [\u003cffffffff8109728d\u003e] worker_thread+0x17c/0x240\n[ 2374.655186] [\u003cffffffff810b0803\u003e] ? trace_hardirqs_on+0xd/0xf\n[ 2374.655196] [\u003cffffffff81097111\u003e] ? manage_workers+0xab/0xab\n[ 2374.655209] [\u003cffffffff8109c8ed\u003e] kthread+0xa0/0xa8\n[ 2374.655223] [\u003cffffffff81c332d4\u003e] kernel_thread_helper+0x4/0x10\n[ 2374.655232] [\u003cffffffff81c2b880\u003e] ? retint_restore_args+0xe/0xe\n[ 2374.655243] [\u003cffffffff8109c84d\u003e] ? __init_kthread_worker+0x5b/0x5b\n[ 2374.655252] [\u003cffffffff81c332d0\u003e] ? gs_change+0xb/0xb\n\nwhen aer happens,\npci_walk_bus already have down_read(\u0026pci_bus_sem)...\nthen report_slot_reset\n \u003d\u003d\u003e e1000_io_slot_reset\n \u003d\u003d\u003e e1000e_disable_aspm\n \u003d\u003d\u003e pci_disable_link_state...\n\nWe can not use pci_disable_link_state, and it will try to hold pci_bus_sem again.\n\nTry to have __pci_disable_link_state that will not need to hold pci_bus_sem.\n\n-v2: change name to pci_disable_link_state_locked() according to Jesse.\n\n[jbarnes: make sure new function is exported for modules]\n\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "d64a6f4dca0b45495dd5be8116b618d9cc004eea", "tree": "f9f8ca4dee844de54f47239aadd76e3063c860b6", "parents": [ "7be799a70ba3dd90a59e8d2c72bbe06020005b3f" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Fri May 13 07:19:58 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Sat May 14 17:50:01 2011 -0700" }, "message": "e1000e: minor comment cleanups\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Aaron Brown \u003caaron.f.brown@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "14ad2513ed5b709e566a853f4b515d91c5d83311", "tree": "19ce2e6deefaa0725533612df85c51b99d2513cb", "parents": [ "fbef7139a8b89a7f49ba1410593ed894b4c8b017" ], "author": { "name": "David Decotigny", "email": "decot@google.com", "time": "Wed Apr 27 18:32:43 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 29 14:03:03 2011 -0700" }, "message": "net/igb/e1000/e1000e: more robust ethtool duplex/speed configuration\n\nThis makes sure that one cannot request a 99Mbps full-duplex and get a\n100Mbps half-duplex configuration in return due to the way the\nspeed/duplex parameters are handled internally.\n\nTested: e1000 works\nSigned-off-by: David Decotigny \u003cdecot@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "707394972093e2056e1e8cc39be19cf9bcb3e7b3", "tree": "f6dc95219bca6895adf304b79241e9d60561f8f5", "parents": [ "25db0338813a8915457636b1f6abe6a28fa73f8d" ], "author": { "name": "David Decotigny", "email": "decot@google.com", "time": "Wed Apr 27 18:32:40 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 29 14:03:01 2011 -0700" }, "message": "ethtool: cosmetic: Use ethtool ethtool_cmd_speed API\n\nThis updates the network drivers so that they don\u0027t access the\nethtool_cmd::speed field directly, but use ethtool_cmd_speed()\ninstead.\n\nFor most of the drivers, these changes are purely cosmetic and don\u0027t\nfix any problem, such as for those 1GbE/10GbE drivers that indirectly\ncall their own ethtool get_settings()/mii_ethtool_gset(). The changes\nare meant to enforce code consistency and provide robustness with\nfuture larger throughputs, at the expense of a few CPU cycles for each\nethtool operation.\n\nAll drivers compiled with make allyesconfig ion x86_64 have been\nupdated.\n\nTested: make allyesconfig on x86_64 + e1000e/bnx2x work\nSigned-off-by: David Decotigny \u003cdecot@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "25db0338813a8915457636b1f6abe6a28fa73f8d", "tree": "29ea39e45de1342beb4e3c58da0cfbc9915b617e", "parents": [ "8ae6daca85c8bbd6a32c382db5e2a2a989f8bed2" ], "author": { "name": "David Decotigny", "email": "decot@google.com", "time": "Wed Apr 27 18:32:39 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 29 14:03:00 2011 -0700" }, "message": "ethtool: Use full 32 bit speed range in ethtool\u0027s set_settings\n\nThis makes sure the ethtool\u0027s set_settings() callback of network\ndrivers don\u0027t ignore the 16 most significant bits when ethtool calls\ntheir set_settings().\n\nAll drivers compiled with make allyesconfig on x86_64 have been\nupdated.\n\nSigned-off-by: David Decotigny \u003cdecot@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "dbf80dcbd8ca0c50f343401fedd2d6200cb8097e", "tree": "e6804f597018b03055daca6087f03eaaa6f32a45", "parents": [ "2bd93d7af1581d40e3c4b25242472661cb7c637a" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Sat Apr 16 00:34:40 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Wed Apr 27 02:05:53 2011 -0700" }, "message": "e1000e: implement ethtool set_phys_id\n\nBased on a patch from Stephen Hemminger \u003cshemminger@vyatta.com\u003e.\n\nThe new ethtool set_phys_id takes over controlling the LED for\nidentifying boards. This fixes the lockout during that period.\nFor this device lots of extra infrastructure can also be removed by\nusing set_phys_id.\n\nv2: - return blink frequency for parts that do not support blink in h/w\n - add blink_led function pointers for devices that do support blink\n in h/w to cleanup the test for this functionality\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nCc: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nTested-by: Aaron Brown \u003caaron.f.brown@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "78cd29d5a92ae5067377ad42089f2c8781312f4a", "tree": "fb9845f2fdb6c28890478c7fa8fbcfec79e4543d", "parents": [ "2084b114e3fb0d84e5882f5ee6c7039be52da715" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Thu Mar 24 03:09:03 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Wed Apr 13 19:19:22 2011 -0700" }, "message": "e1000e: If ASPM L0s needs to be disabled, do it prior to enabling device\n\nBased on a patch from Naga Chumbalkar \u003cnagananda.chumbalkar@hp.com\u003e:\n\nIf ASPM L0s needs to be disabled due to HW errata, do it prior to\n\"enabling\" the device. This way if the kernel ever defaults its\naspm_policy to POLICY_POWERSAVE, then the e1000e driver will get a\nchance to disable ASPM on the misbehaving device *prior* to calling\npci_enable_device_mem(). This will be useful in situations\nwhere the BIOS indicates ASPM support on the server by clearing the\nACPI FADT \"ASPM Controls\" bit.\n\nNote:\nThe kernel (2.6.38) currently uses the BIOS \"default\" as its aspm_policy.\nHowever, Linux distros can diverge from that and set the default to\n\"powersave\".\n\nv2: o cleanup namespace pollution of e1000e_disable_aspm(),\n o fix type and initialization of the new aspm_disable_flag in a few\n functions, and\n o redefine FLAG2_DISABLE_ASPM_L0S to the first unused bit in\n adapter-\u003eflags2.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nCc: Naga Chumbalkar \u003cnagananda.chumbalkar@hp.com\u003e\nTested-by: Aaron Brown \u003caaron.f.brown@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "2084b114e3fb0d84e5882f5ee6c7039be52da715", "tree": "45ac55b9cd72f72493f5c69c43996c3ea45e7b6a", "parents": [ "86d70e532c352bd309dab5f1d18d113f441cb3ae" ], "author": { "name": "Flavio Leitner", "email": "fleitner@redhat.com", "time": "Tue Apr 05 04:27:43 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Wed Apr 13 19:18:57 2011 -0700" }, "message": "e1000e: fix stats locking in e1000_watchdog_task\n\nJust move the unlock down a bit because it unlocks too\nearly leaving a chance for get_stats64() run in parallel\nwhile it is still accessing the stats.\n\nSigned-off-by: Flavio Leitner \u003cfleitner@redhat.com\u003e\nAcked-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Aaron Brown \u003caaron.f.brown@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "86d70e532c352bd309dab5f1d18d113f441cb3ae", "tree": "f905aa3db40ff99c23e1d7574a919c0c458183e4", "parents": [ "a5cc764206a3d01dce8ebc17b4e1534afb53c495" ], "author": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Mar 25 16:01:01 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Wed Apr 13 19:17:50 2011 -0700" }, "message": "e1000e: convert to new VLAN model\n\nThis switches the e1000e driver to use the new VLAN interfaces.\n\nCC: Jesse Gross \u003cjesse@nicira.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\n" }, { "commit": "a5cc764206a3d01dce8ebc17b4e1534afb53c495", "tree": "4cd52876a13f7405d915adfcc7d4a3a251253dbf", "parents": [ "1bba4386ab4f67a53c9649268dd9c83bc6110a9b" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Sat Mar 19 00:31:23 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Wed Apr 13 19:17:27 2011 -0700" }, "message": "e1000e: PCIe link speed in GT/s, not GB/s\n\nCorrect the log message when driver loads.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Aaron Brown \u003caaron.f.brown@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "1bba4386ab4f67a53c9649268dd9c83bc6110a9b", "tree": "5519c317c5f2828422c7cb44fa6251bae5b5aff9", "parents": [ "563988dcfe706457ec7049d59e18d6147179bb0a" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Sat Mar 19 00:27:20 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Wed Apr 13 19:17:06 2011 -0700" }, "message": "e1000e: convert short duration msleep() to usleep_range()\n\nWith durations less than 20ms, the jiffies or legacy timer backed msleep()\nmay sleep ~20ms which might not be what the caller expects. Instead, it\nis recommended to use the hrtimers backed usleep_range(). For more, see\nDocumentation/timers/timers-howto.txt. Issues reported by checkpatch.\n\nIn addition, remove unnecessary sleep in e1000e_write_nvm_spi().\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Aaron Brown \u003caaron.f.brown@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "25985edcedea6396277003854657b5f3cb31a628", "tree": "f026e810210a2ee7290caeb737c23cb6472b7c38", "parents": [ "6aba74f2791287ec407e0f92487a725a25908067" ], "author": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Wed Mar 30 22:57:33 2011 -0300" }, "committer": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Thu Mar 31 11:26:23 2011 -0300" }, "message": "Fix common misspellings\n\nFixes generated by \u0027codespell\u0027 and manually reviewed.\n\nSigned-off-by: Lucas De Marchi \u003clucas.demarchi@profusion.mobi\u003e\n" }, { "commit": "7a6362800cb7d1d618a697a650c7aaed3eb39320", "tree": "087f9bc6c13ef1fad4b392c5cf9325cd28fa8523", "parents": [ "6445ced8670f37cfc2c5e24a9de9b413dbfc788d", "ceda86a108671294052cbf51660097b6534672f5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 16:29:25 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 16:29:25 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1480 commits)\n bonding: enable netpoll without checking link status\n xfrm: Refcount destination entry on xfrm_lookup\n net: introduce rx_handler results and logic around that\n bonding: get rid of IFF_SLAVE_INACTIVE netdev-\u003epriv_flag\n bonding: wrap slave state work\n net: get rid of multiple bond-related netdevice-\u003epriv_flags\n bonding: register slave pointer for rx_handler\n be2net: Bump up the version number\n be2net: Copyright notice change. Update to Emulex instead of ServerEngines\n e1000e: fix kconfig for crc32 dependency\n netfilter ebtables: fix xt_AUDIT to work with ebtables\n xen network backend driver\n bonding: Improve syslog message at device creation time\n bonding: Call netif_carrier_off after register_netdevice\n bonding: Incorrect TX queue offset\n net_sched: fix ip_tos2prio\n xfrm: fix __xfrm_route_forward()\n be2net: Fix UDP packet detected status in RX compl\n Phonet: fix aligned-mode pipe socket buffer header reserve\n netxen: support for GbE port settings\n ...\n\nFix up conflicts in drivers/staging/brcm80211/brcmsmac/wl_mac80211.c\nwith the staging updates.\n" }, { "commit": "aa33860158114d0df3c7997bc1dd41c0168e1c2a", "tree": "a1ae98c42232835780618b0a5dea78c5478ed58c", "parents": [ "196ec243224bb38fc5c41d9fa4050f70708b7fb4" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Feb 11 00:06:54 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Tue Mar 15 00:43:15 2011 +0100" }, "message": "PM: Remove CONFIG_PM_OPS\n\nAfter redefining CONFIG_PM to depend on (CONFIG_PM_SLEEP ||\nCONFIG_PM_RUNTIME) the CONFIG_PM_OPS option is redundant and can be\nreplaced with CONFIG_PM.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "70d279a7e2a6e308530822ba2bf4134cc0f5c091", "tree": "9941f793703bc2944c7e1088cb24a390a13f6ec9", "parents": [ "4a29e15515ea56b8ec78ebb77529b1ad5c268bb9" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Sat Feb 26 03:12:19 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Mar 11 02:25:09 2011 -0800" }, "message": "e1000e: bump version number\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "4a29e15515ea56b8ec78ebb77529b1ad5c268bb9", "tree": "de83f15c260c4d3c5abdae208cef03b340f8c6fa", "parents": [ "23e4f061306798dfb1941bd2f399949b705822c6" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Fri Mar 04 09:07:01 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Mar 11 02:24:15 2011 -0800" }, "message": "e1000e: do not suggest the driver supports Wake-on-ARP\n\nThe driver doesn\u0027t support Wake-on-ARP, so don\u0027t advertise through ethtool\nthat it does.\n\nCleanup some coding style issues in the same functions.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "23e4f061306798dfb1941bd2f399949b705822c6", "tree": "c5e5dcf8e64dffc9a5de9577f0cf78e85b5b3abe", "parents": [ "6cc7aaed70c96c3933fbacbad582fc79b7d6e335" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Fri Feb 25 07:44:51 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Mar 11 02:23:21 2011 -0800" }, "message": "e1000e: disable jumbo frames on 82579 when MACsec enabled in EEPROM\n\nIf/when an OEM enables MACsec in the 82579 EEPROM, disable jumbo frames\nsupport in the driver due to an interoperability issue in hardware that\nprevents jumbo packets from being transmitted or received.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "6cc7aaed70c96c3933fbacbad582fc79b7d6e335", "tree": "b01610d2eb974637e20d96364bb6bc513f0a3da4", "parents": [ "1effb45cca29e22e4b2209bb567770b7e20a3a2b" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Fri Feb 25 06:25:18 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Mar 11 02:14:56 2011 -0800" }, "message": "e1000e: do not toggle LANPHYPC value bit when PHY reset is blocked\n\nWhen PHY reset is intentionally blocked on 82577/8/9, do not toggle the\nLANPHYPC value bit (essentially performing a hard power reset of the\ndevice) otherwise the PHY can be put into an unknown state.\n\nCleanup whitespace in the same function.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "1effb45cca29e22e4b2209bb567770b7e20a3a2b", "tree": "32ea3837ac121d6d5777b673aa5ea8204134c1c2", "parents": [ "5661aeb08edcef6799861f92817f593c1fd7b272" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Fri Feb 25 06:58:03 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Mar 11 02:05:26 2011 -0800" }, "message": "e1000e: extend EEE LPI timer to prevent dropped link\n\nThe link can be unexpectedly dropped when the timer for entering EEE low-\npower-idle quiet state expires too soon. The timer needs to be extended\nfrom 196usec to 200usec after every LCD (PHY) reset to prevent this from\nhappening.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "5661aeb08edcef6799861f92817f593c1fd7b272", "tree": "1cbf6d455075e98a03fdadf059c696693bcd2cb6", "parents": [ "d8d5f8aebb857f979fbe9099c9acc2ed486706be" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Fri Feb 25 06:36:25 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Mar 11 02:03:35 2011 -0800" }, "message": "e1000e: extend timeout for ethtool link test diagnostic\n\nWith some PHYs supported by this driver, link establishment can take a\nlittle longer when connected to certain switches. Extend the timeout to\nreduce the number of false diagnostic failures, and cleanup a code style\nissue in the same function.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "d8d5f8aebb857f979fbe9099c9acc2ed486706be", "tree": "9083c428cebef0efdb05014dcaaf4d9d8ea4fab0", "parents": [ "ef5ab89cf7edc2e2cb996d62201a2b356d5e9286" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Fri Feb 25 07:09:37 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Mar 11 01:52:40 2011 -0800" }, "message": "e1000e: magic number cleanup - ETH_ALEN\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "ef5ab89cf7edc2e2cb996d62201a2b356d5e9286", "tree": "f61fe87f93fd32c03a2f53a78a41f68aff5df49b", "parents": [ "23633b13ff7e1e1380bd2e11c49eb5ddbdf37ea9" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Thu Feb 10 08:17:21 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Mar 11 01:51:58 2011 -0800" }, "message": "e1000e: use dev_kfree_skb_irq() instead of dev_kfree_skb()\n\nBased on a report and patch originally submitted by Prasanna Panchamukhi.\n\nUse dev_kfree_skb_irq() in e1000_clean_jumbo_rx_irq() since this latter\nfunction is called only in interrupt context. This avoids \"Warning:\nkfree_skb on hard IRQ\" messages.\n\nCc: \"Prasanna S. Panchamukhi\" \u003cprasanna.panchamukhi@riverbed.com\u003e\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "0a0e9ae1bd788bc19adc4d4ae08c98b233697402", "tree": "13825eeb5bbeae27d66e95f12168eff4b60701ab", "parents": [ "01a16b21d6adf992aa863186c3c4e561a57c1714", "b65a0e0c84cf489bfa00d6aa6c48abc5a237100f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 03 21:27:42 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Mar 03 21:27:42 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/bnx2x/bnx2x.h\n" }, { "commit": "4def99bbfd46e05c5e03b5b282cb4ee30e27ff19", "tree": "43374554b271221540baf64179b5d328c935ee3a", "parents": [ "9dc441f3c5a9ea1b9888ce15b1ccb3f30a79e323" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Wed Feb 02 09:30:36 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Wed Mar 02 03:34:27 2011 -0800" }, "message": "e1000e: disable broken PHY wakeup for ICH10 LOMs, use MAC wakeup instead\n\nWhen support for 82577/82578 was added[1] in 2.6.31, PHY wakeup was in-\nadvertently enabled (even though it does not function properly) on ICH10\nLOMs. This patch makes it so that the ICH10 LOMs use MAC wakeup instead\nas was done with the initial support for those devices (i.e. 82567LM-3,\n82567LF-3 and 82567V-4).\n\n[1] commit a4f58f5455ba0efda36fb33c37074922d1527a10\n\nReported-by: Aurelien Jarno \u003caurelien@aurel32.net\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "ff938e43d39e926de74b32a3656c190f979ab642", "tree": "b914a3f7cc9923013133462a55f5dbe9e7a7799c", "parents": [ "63d8ea7f93e1fb9d1aa9509ab3e1a71199245c80" ], "author": { "name": "Sergei Shtylyov", "email": "sshtylyov@ru.mvista.com", "time": "Mon Feb 28 11:57:33 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Feb 28 11:57:33 2011 -0800" }, "message": "net: use pci_dev-\u003erevision, again\n\nSeveral more network drivers that read the device\u0027s revision ID\nfrom the PCI configuration register were merged after the commit\n44c10138fd4bbc4b6d6bff0873c24902f2a9da65 (PCI: Change all drivers\nto use pci_device-\u003erevision), so it\u0027s time to do another pass of\nconversion to using the \u0027revision\u0027 field of \u0027struct pci_dev\u0027...\n\nSigned-off-by: Sergei Shtylyov \u003csshtylyov@ru.mvista.com\u003e\nAcked-by: \"John W. Linville\" \u003clinville@tuxdriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "da935c66bacb3ed9ada984b053297f87c2dff63a", "tree": "46278da2b312c73f1375b830d7e5912bf23abd78", "parents": [ "9435eb1cf0b76b323019cebf8d16762a50a12a19", "2205a6ea93fea76f88b43727fea53f3ce3790d6f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Feb 19 19:17:35 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Feb 19 19:17:35 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tDocumentation/feature-removal-schedule.txt\n\tdrivers/net/e1000e/netdev.c\n\tnet/xfrm/xfrm_policy.c\n" }, { "commit": "713b3c9e4c1a6da6b45da6474ed554ed0a48de69", "tree": "9c578651c91b70da176e3a65a5537aad53814e15", "parents": [ "615b32af9730def64330e4c0c95c973e90bd9c6d" ], "author": { "name": "Jesse Brandeburg", "email": "jesse.brandeburg@intel.com", "time": "Wed Feb 02 10:19:50 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Thu Feb 17 01:11:21 2011 -0800" }, "message": "e1000e: flush all writebacks before unload\n\nThe driver was not flushing all writebacks before unloading, possibly\ncausing memory to be written by the hardware after the driver had\nreinitialized the rings.\n\nThis adds missing functionality to flush any pending writebacks and is\ncalled in all spots where descriptors should be completed before the driver\nbegins processing.\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nReviewed-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "615b32af9730def64330e4c0c95c973e90bd9c6d", "tree": "8d439d0a42c6f7cb02e2737faf04bbd7443c81e4", "parents": [ "6d90e8f45697c633f522269368297d7416fd8783" ], "author": { "name": "Jesse Brandeburg", "email": "jesse.brandeburg@intel.com", "time": "Wed Feb 02 10:19:45 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Thu Feb 17 00:45:06 2011 -0800" }, "message": "e1000e: check down flag in tasks\n\nThis change is part of a fix to avoid any tasks running while the driver is\nexiting and deinitializing resources.\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "5962bc21ceaaba81e04fa1bb5671c65251805d3e", "tree": "ead360a95ba1767bd311957b50bd4f5bc45725b7", "parents": [ "5c1bda0aa32e4614c32a45ce5662ed6914bae38a" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Thu Jan 20 06:58:07 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Feb 11 08:42:15 2011 -0800" }, "message": "e1000e: return appropriate errors for \u0027ethtool -r\u0027\n\n...when invoked while interface is not up or when auto-negotiation is\ndisabled as done by other drivers.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "5c1bda0aa32e4614c32a45ce5662ed6914bae38a", "tree": "381eadf748b7cd0b9c7ba7e1542b522bbfac0c1b", "parents": [ "79f5e840143703b258717aab12647018320f4a5f" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Wed Jan 19 04:23:39 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Feb 11 08:34:45 2011 -0800" }, "message": "e1000e: use correct pointer when memcpy\u0027ing a 2-dimensional array\n\n*e1000_gstrings_test is not the same size as e1000_gstrings_test.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "79f5e840143703b258717aab12647018320f4a5f", "tree": "a1eab3adf497f4ce5fdf8252b4a5e3a03daca600", "parents": [ "6431cbc25fa21635ee04eb0516ba6c51389fbfac" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Wed Jan 19 04:20:59 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Feb 11 08:34:28 2011 -0800" }, "message": "e1000e: replace unbounded sprintf with snprintf\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "263fb5b1bf9265d0e4ce59ff6ea92f478b5b61ea", "tree": "5ee497d530185d32421122729af86cf77d0dc649", "parents": [ "8d13a2a9fb3e5e3f68e9d3ec0de3c8fcfa56a224", "c69b90920a36b88ab0d649963d81355d865eeb05" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 08 17:19:01 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 08 17:19:01 2011 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/e1000e/netdev.c\n" }, { "commit": "463342741222c79469303cdab8ce99c8bc2d80e8", "tree": "7035f10116ca4aeafa1ced081110e3ed727a6478", "parents": [ "429a01a70f301baf0c8fc780f891a18c296d5e24" ], "author": { "name": "Jesse Brandeburg", "email": "jesse.brandeburg@intel.com", "time": "Wed Feb 02 10:19:55 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Tue Feb 08 01:10:17 2011 -0800" }, "message": "e1000e: tx_timeout should not increment for non-hang events\n\nCurrently the driver increments the tx_timeout counter (an error counter)\nwhen simply resetting the part with outstanding transmit work pending.\nThis is an unnecessary count of an error, when all we should be doing is\njust resetting the part and discarding the transmits. With this change the\nonly increment of tx_timeout is when the stack calls the watchdog reset\nfunction due to a true Tx timeout.\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nReviewed-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "05b9321405efcca9ab217fb65c91915244ebf526", "tree": "00b2e8106dbe2de7b2367a7ae4a7c2aff6e015c6", "parents": [ "90da06692532541a38f9857972e1fd6b1cdfb45a" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Wed Jan 05 07:10:38 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Mon Jan 24 00:14:03 2011 -0800" }, "message": "e1000e: Use kmemdup rather than duplicating its implementation\n\nThe semantic patch that makes this output is available\nin scripts/coccinelle/api/memdup.cocci.\n\nMore information about semantic patching is available at\nhttp://coccinelle.lip6.fr/\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "90da06692532541a38f9857972e1fd6b1cdfb45a", "tree": "b57994ef65c615e0cf34a57f692fed67b95f3dd1", "parents": [ "67fd4fcb78a7ced369a6bd8a131ec8c65ebd2bbb" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Thu Jan 06 07:02:53 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Mon Jan 24 00:13:56 2011 -0800" }, "message": "e1000e: reduce scope of some variables, remove unnecessary ones\n\nStatic analysis of the driver code found some variables for which the scope\ncan be reduced, or remove the variable altogether.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "67fd4fcb78a7ced369a6bd8a131ec8c65ebd2bbb", "tree": "53747c0e34152d47c440f9dbb8318301747ccbab", "parents": [ "bb134d2298b49f50cf6d9388410fba96272905dc" ], "author": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Jan 07 05:12:09 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Mon Jan 24 00:13:37 2011 -0800" }, "message": "e1000e: convert to stats64\n\nBased on the patch provided by Flavio Leitner \u003cfleitner@redhat.com\u003e\nProvides accurate stats at the time user reads them.\n\nv2: fixed whitespace/merging issues (by Jeff Kirsher)\nv3: fixed namespacing issues (by Bruce Allan)\n\nCC: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Flavio Leitner \u003cfleitner@redhat.com\u003e\n" }, { "commit": "d018b6f4f1539f3679fbdc2d02d58d09e76be84a", "tree": "317b9e04d8e7a73a4d07c69a5cb5455ec34f47e5", "parents": [ "18bce371ae09af6c20ee62c1092a4d1d0e84dd49", "0f73f2c5a3ebb957ee66718c903c17ed71a4fc2e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 14 13:25:30 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 14 13:25:30 2011 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (47 commits)\n GRETH: resolve SMP issues and other problems\n GRETH: handle frame error interrupts\n GRETH: avoid writing bad speed/duplex when setting transfer mode\n GRETH: fixed skb buffer memory leak on frame errors\n GRETH: GBit transmit descriptor handling optimization\n GRETH: fix opening/closing\n GRETH: added raw AMBA vendor/device number to match against.\n cassini: Fix build bustage on x86.\n e1000e: consistent use of Rx/Tx vs. RX/TX/rx/tx in comments/logs\n e1000e: update Copyright for 2011\n e1000: Avoid unhandled IRQ\n r8169: keep firmware in memory.\n netdev: tilepro: Use is_unicast_ether_addr helper\n etherdevice.h: Add is_unicast_ether_addr function\n ks8695net: Use default implementation of ethtool_ops::get_link\n ks8695net: Disable non-working ethtool operations\n USB CDC NCM: Don\u0027t deref NULL in cdc_ncm_rx_fixup() and don\u0027t use uninitialized variable.\n vxge: Remember to release firmware after upgrading firmware\n netdev: bfin_mac: Remove is_multicast_ether_addr use in netdev_for_each_mc_addr\n ipsec: update MAX_AH_AUTH_LEN to support sha512\n ...\n" }, { "commit": "af667a29dd3dfc0464f83bac30cc3c63fe5d0206", "tree": "09c18e2b935024e5050ebf7db94f23045c877cb6", "parents": [ "0d6057e48b9d2004024e97252da83dce0661b131" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Fri Dec 31 06:10:01 2010 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Jan 14 02:06:23 2011 -0800" }, "message": "e1000e: consistent use of Rx/Tx vs. RX/TX/rx/tx in comments/logs\n\nSome minor comment errors and whitespace issues discovered while looking\ninto this are also addressed.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "0d6057e48b9d2004024e97252da83dce0661b131", "tree": "66c238556a61e4a81715d998fafea593a724c84f", "parents": [ "4c11b8adbc48bd21885fbc671df2f8ac04a75473" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Tue Jan 04 01:16:44 2011 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Jan 14 02:04:01 2011 -0800" }, "message": "e1000e: update Copyright for 2011\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "008d23e4852d78bb2618f2035f8b2110b6a6b968", "tree": "81c88f744f6f3fc84132527c1ddc0b4da410c5e2", "parents": [ "8f685fbda43deccd130d192c9fcef1444649eaca", "bfc672dcf323877228682aff79dff8ecd9f30ff8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:05:56 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:05:56 2011 -0800" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)\n Documentation/trace/events.txt: Remove obsolete sched_signal_send.\n writeback: fix global_dirty_limits comment runtime -\u003e real-time\n ppc: fix comment typo singal -\u003e signal\n drivers: fix comment typo diable -\u003e disable.\n m68k: fix comment typo diable -\u003e disable.\n wireless: comment typo fix diable -\u003e disable.\n media: comment typo fix diable -\u003e disable.\n remove doc for obsolete dynamic-printk kernel-parameter\n remove extraneous \u0027is\u0027 from Documentation/iostats.txt\n Fix spelling milisec -\u003e ms in snd_ps3 module parameter description\n Fix spelling mistakes in comments\n Revert conflicting V4L changes\n i7core_edac: fix typos in comments\n mm/rmap.c: fix comment\n sound, ca0106: Fix assignment to \u0027channel\u0027.\n hrtimer: fix a typo in comment\n init/Kconfig: fix typo\n anon_inodes: fix wrong function name in comment\n fix comment typos concerning \"consistent\"\n poll: fix a typo in comment\n ...\n\nFix up trivial conflicts in:\n - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)\n - fs/ext4/ext4.h\n\nAlso fix missed \u0027diabled\u0027 typo in drivers/net/bnx2x/bnx2x.h while at it.\n" }, { "commit": "77996d1d4c1cf0059f5c2d1cea9d5135ac1b8c91", "tree": "0cdb5515487f49e7e6f09d5ce8a8c7831d727ee2", "parents": [ "31dbe5b4ac6fca72dec946e4d0fa7f0913f1d9b1" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Thu Jan 06 14:29:53 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 09 23:44:09 2011 -0800" }, "message": "e1000e: add custom set_d[0|3]_lplu_state function pointer for 82574\n\n82574 needs to configure Low Power Link Up (or LPLU) differently than\nthe other parts in the 8257x family supported by the driver.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Emil Tantilov \u003cemil.s.tantilov@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": "31dbe5b4ac6fca72dec946e4d0fa7f0913f1d9b1", "tree": "8774e4836c881a7a2c18ddb02f253b66c82aec6c", "parents": [ "fe46f58fa61f025564a3c1e80b789885cb4b0f30" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Thu Jan 06 14:29:52 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 09 23:44:09 2011 -0800" }, "message": "e1000e: power off PHY after reset when interface is down\n\nSome Phys supported by the driver do not remain powered off across a reset\nof the device when the interface is down, e.g. on 82571, but not on 82574.\nThis patch powers down (only when WoL is disabled) the PHY after a reset if\nthe interface is down and the ethtool diagnostics are not currently running.\n\nThe ethtool diagnostic function required a minor re-factor as a result, and\nthe e1000_[get|put]_hw_control() functions are renamed since they are no\nlonger static to netdev.c as they are needed by the ethtool diagnostics.\nA couple minor whitespace issues were cleaned up, too.\n\nReported-by: Arthur Jones \u003cajones@riverbed.com\u003e\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@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": "fe46f58fa61f025564a3c1e80b789885cb4b0f30", "tree": "6ec14729d0ccb1df72b4e63574dcadec79f8e496", "parents": [ "e0dc4f125456e57347a6d016bd7209f064135b1d" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Thu Jan 06 14:29:51 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 09 23:44:08 2011 -0800" }, "message": "e1000e: use either_crc_le() rather than re-write it\n\nFor the 82579 jumbo frame workaround, there is no need to re-write the CRC\ncalculation functionality already found in the kernel\u0027s ether_crc_le().\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@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": "e0dc4f125456e57347a6d016bd7209f064135b1d", "tree": "6458f1eaf49dabf7e08e65ec0493077cd84e260c", "parents": [ "482fed85e64958f678a138a4b5f8891190d2b169" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Thu Jan 06 14:29:50 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 09 23:44:08 2011 -0800" }, "message": "e1000e: properly bounds-check string functions\n\nUse string functions with bounds checking rather than their non-bounds\nchecking counterparts, and do not hard code these boundaries.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Emil Tantilov \u003cemil.s.tantilov@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": "482fed85e64958f678a138a4b5f8891190d2b169", "tree": "5904011346d4659039122c083741d63f48379c54", "parents": [ "dd93f95e92283498f2497a632a81c167444668b5" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Thu Jan 06 14:29:49 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 09 23:44:07 2011 -0800" }, "message": "e1000e: convert calls of ops.[read|write]_reg to e1e_[r|w]phy\n\nCleans up the code a bit by using the driver-specific e1e_rphy and\ne1e_wphy macros instead of the full function pointer variants. Fix\na couple whitespace issue with two already existing calls to e1e_wphy.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@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": "dd93f95e92283498f2497a632a81c167444668b5", "tree": "fa5067184bc32c77bec6931a5a9862d8d137c270", "parents": [ "0363466866d901fbc658f4e63dd61e7cc93dd0af" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Thu Jan 06 14:29:48 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 09 23:44:06 2011 -0800" }, "message": "e1000e: cleanup variables set but not used\n\nThe ICR register is clear on read and we don\u0027t care what the returned value\nis when resetting the hardware so the icr variable(s) can be removed. We\nshould not ignore the return from e1000_lv_jumbo_workaround_ich8lan() and\nfrom e1000_get_phy_id_82571() (dump a debug message when it fails and when\nan unknown Phy id is returned).\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Emil Tantilov \u003cemil.s.tantilov@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": "b1cdfead0e532d7614b5d5b97044df94cc8945ae", "tree": "921241c8bac9f03705965a82daf3256cc8033d8d", "parents": [ "6480641eb741cabbba8e196d4f17db7fb80d101c" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Sat Dec 11 05:53:47 2010 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Dec 24 21:31:49 2010 -0800" }, "message": "e1000e: checkpatch warnings - braces\n\nWARNING: braces {} are not necessary for any arm of this statement\nWARNING: braces {} are not necessary for single statement blocks\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Emil Tantilov \u003cemil.s.tantilov@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "6480641eb741cabbba8e196d4f17db7fb80d101c", "tree": "d4a11108f260cb49cbf98f295ace5f55cdf58018", "parents": [ "184125a389cf2c81980de5d5f365c786cc76d229" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Sat Dec 11 05:53:42 2010 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Dec 24 21:30:46 2010 -0800" }, "message": "e1000e: checkpatch error - open braces\n\nERROR: that open brace { should be on the previous line\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Emil Tantilov \u003cemil.s.tantilov@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "184125a389cf2c81980de5d5f365c786cc76d229", "tree": "8b10c05b38b8acb85054afb69f6f717f2a722ac8", "parents": [ "f0f1a172b2a9e26319b9aa95fa6c322ebb01089d" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Sat Dec 11 05:53:37 2010 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Dec 24 21:29:34 2010 -0800" }, "message": "e1000e: checkpatch error - trailing statements\n\nERROR: trailing statements should be on next line\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Emil Tantilov \u003cemil.s.tantilov@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "f0f1a172b2a9e26319b9aa95fa6c322ebb01089d", "tree": "b4d37fada398b2c91706317d992e01aa6be72931", "parents": [ "68f20d948c86bd6bbc075052f6b6c45b8f56957e" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Sat Dec 11 05:53:32 2010 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Dec 24 21:28:18 2010 -0800" }, "message": "e1000e: checkpatch error - macro panethesis\n\nERROR: Macros with complex values should be enclosed in parenthesis\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Emil Tantilov \u003cemil.s.tantilov@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "0d0b16727f24f8258eeb33818347ca0f4557f982", "tree": "e89fec837700b02aff0d08de1c5cbae3ff5060a8", "parents": [ "55508d601dab7df5cbcc7a63f4be8620eface204" ], "author": { "name": "Michał Mirosław", "email": "mirq-linux@rere.qmqm.pl", "time": "Tue Dec 14 15:24:08 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 16 14:43:15 2010 -0800" }, "message": "net: Fix drivers advertising HW_CSUM feature to use csum_start\n\nSome drivers are using skb_transport_offset(skb) instead of skb-\u003ecsum_start\nfor NETIF_F_HW_CSUM offload. This does not matter now, but if someone\nimplements checksumming of encapsulated packets then this will break silently.\n\nTSO output paths are left as they are, since they are for IP+TCP only\n(might be worth converting though).\n\nSigned-off-by: Michał Mirosław \u003cmirq-linux@rere.qmqm.pl\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "23f333a2bfafba80339315b724808982a9de57d9", "tree": "55819e6a8eeb9c2d34b42c77e7e38f7f6571baf9", "parents": [ "6e07ebd84eef00be9e169a6d15a0bc20b06578fa" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Dec 12 16:45:14 2010 +0100" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Dec 12 16:45:14 2010 +0100" }, "message": "drivers/net: don\u0027t use flush_scheduled_work()\n\nflush_scheduled_work() is on its way out. This patch contains simple\nconversions to replace flush_scheduled_work() usage with direct\ncancels and flushes.\n\nDirectly cancel the used works on driver detach and flush them in\nother cases.\n\nThe conversions are mostly straight forward and the only dangers are,\n\n* Forgetting to cancel/flush one or more used works.\n\n* Cancelling when a work should be flushed (ie. the work must be\n executed once scheduled whether the driver is detaching or not).\n\nI\u0027ve gone over the changes multiple times but it would be much\nappreciated if you can review with the above points in mind.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Jay Cliburn \u003cjcliburn@gmail.com\u003e\nCc: Michael Chan \u003cmchan@broadcom.com\u003e\nCc: Divy Le Ray \u003cdivy@chelsio.com\u003e\nCc: e1000-devel@lists.sourceforge.net\nCc: Vasanthy Kolluri \u003cvkolluri@cisco.com\u003e\nCc: Samuel Ortiz \u003csamuel@sortiz.org\u003e\nCc: Lennert Buytenhek \u003cbuytenh@wantstofly.org\u003e\nCc: Andrew Gallatin \u003cgallatin@myri.com\u003e\nCc: Francois Romieu \u003cromieu@fr.zoreil.com\u003e\nCc: Ramkrishna Vepa \u003cramkrishna.vepa@exar.com\u003e\nCc: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nCc: David Brownell \u003cdbrownell@users.sourceforge.net\u003e\nCc: Shreyas Bhatewara \u003csbhatewara@vmware.com\u003e\nCc: netdev@vger.kernel.org\n" }, { "commit": "c920aa8b87bfec3dbd926ae777430e613e5088df", "tree": "341d11dfa2f29baf0b2202edecff4dc4b0890eac", "parents": [ "61c758166701c4f156c0aba10260f5729b1a6f43" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Wed Dec 01 08:45:24 2010 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Dec 10 22:13:57 2010 -0800" }, "message": "e1000e: increment the driver version\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "61c758166701c4f156c0aba10260f5729b1a6f43", "tree": "73ae69878b55a8f493b7d037a7edde819f9a2251", "parents": [ "e9262447233037e9336d5866628821156a17366f" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Thu Dec 09 23:04:25 2010 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Dec 10 22:13:49 2010 -0800" }, "message": "e1000e: static analysis tools complain of a possible null ptr p dereference\n\nAdding this default case resolves the issue.\n\nv2- Removed \"break\" in default case based on feedback\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Emil Tantilov \u003cemil.s.tantilov@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "e9262447233037e9336d5866628821156a17366f", "tree": "737a8ff9edb9aed1f80b8739c30a8369454a06ef", "parents": [ "36b973df713e1395b79896de667ad7dbb1925fa7" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Wed Nov 24 06:02:06 2010 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Dec 10 22:13:46 2010 -0800" }, "message": "e1000e: minor error message corrections\n\nCorrect error messages when setting up Rx resources and when checking\nmodule parameters.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "36b973df713e1395b79896de667ad7dbb1925fa7", "tree": "087d9cff2e4b786b9af7b62984294e05b0428e41", "parents": [ "073287c037083497ebaaf75ead469b769f218615" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Wed Nov 24 07:42:43 2010 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Dec 10 22:13:41 2010 -0800" }, "message": "e1000e: prevent null ptr dereference in e1000_tx_queue()\n\ntx_desc can be dereferenced as a null pointer when count is passed in\nas 0.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Emil Tantilov \u003cemil.s.tantilov@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "073287c037083497ebaaf75ead469b769f218615", "tree": "42ebaf5df93e5dd9666039af6d3424b1684823af", "parents": [ "664dc878ed6f0476b875547547a49e06f7a4e73b" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Wed Nov 24 06:01:51 2010 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Dec 10 22:13:37 2010 -0800" }, "message": "e1000e: support new PBA format from EEPROM\n\nProvide support to e1000e for displaying the new format of the PBA found\nin the EEPROM. The unique PBA identifier is no longer restricted to\nhexadecimal numbers and must now be read and displayed as a string.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "664dc878ed6f0476b875547547a49e06f7a4e73b", "tree": "ae17b4d149081ed45d344894ba8aff79b3b425e8", "parents": [ "ce54afd16d874ac07378a8bb55d26f7f5b613c0e" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Wed Nov 24 06:01:46 2010 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Dec 10 22:13:34 2010 -0800" }, "message": "e1000e: 82579 PHY incorrectly identified during init\n\nDuring init, reading the 2 PHY ID registers back-to-back in the default\nfast mode could return invalid data (all F\u0027s) and in slow mode could\nreturn data to the second read the data from the first read. To resolve\nthe issue in fast mode, set to slow mode before any PHY accesses; to\nresolve the issue in slow mode, put in a delay for every 82579 PHY access.\nSince this PHY is currently only paired with the pch2lan MAC and the PHY\ntype is not known before the first PHY access which can fail this way,\ncheck for this based on MAC-type.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "ce54afd16d874ac07378a8bb55d26f7f5b613c0e", "tree": "abad7c3150c4acbf3012168d71d611523459694a", "parents": [ "d9c76f99c2a79feb413e3e751362d59c0f5323f6" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Wed Nov 24 06:01:41 2010 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Dec 10 22:13:27 2010 -0800" }, "message": "e1000e: 82577/8/9 mis-configured OEM bits during S0-\u003eSx\n\nThe LPLU (Low Power Link Up) and Gigabit Disable bits (a.k.a. OEM bits)\nwere being configured incorrectly when device goes to D3 state.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "d9c76f99c2a79feb413e3e751362d59c0f5323f6", "tree": "77a7e393c0f7e465d9eb30b440b92d455e33d732", "parents": [ "cbd006cb7d4e7b76c6febf7f51e970bced132914" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Wed Nov 24 06:01:35 2010 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Dec 10 22:13:14 2010 -0800" }, "message": "e1000e: 82571 Serdes can fail to get link\n\nWhen link partner is sending continuous Config symbols, the 82571 Serdes\nFIFO can overflow resulting in Invalid bit getting set. To resolve this,\nif Sync and Config bits are both 1 ignore the Invalid bit and restart\nauto-negotiation.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Emil Tantilov \u003cemil.s.tantilov@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "cbd006cb7d4e7b76c6febf7f51e970bced132914", "tree": "4cd536bfbec78ea5efc7d67d2e328da367c0cf7b", "parents": [ "ed5c2b0b78e5467f7948bef92b21f3c76823f392" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Wed Nov 24 06:01:30 2010 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Dec 10 22:13:11 2010 -0800" }, "message": "e1000e: 82577/8 must acquire h/w semaphore before workaround\n\nThe workaround function e1000_configure_k1_pchlan() assumes the h/w\nsemaphore is already acquired. This was originally missed when setting up\nthe part for the ethtool loopback test.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "ed5c2b0b78e5467f7948bef92b21f3c76823f392", "tree": "c65953d1001154b155c4af3ff6d4fbf4652774b8", "parents": [ "a82a14f4cdcfedb27eacec8eb4d9e47d42c10d43" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Wed Nov 24 06:01:25 2010 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Dec 10 22:13:08 2010 -0800" }, "message": "e1000e: 82574/82583 performance improvement\n\nIncreasing the transmit fifo by 4K (by decreasing the receive fifo size\nspecified in .pba by the same amount) increases Tx performance.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Emil Tantilov \u003cemil.s.tantilov@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "a82a14f4cdcfedb27eacec8eb4d9e47d42c10d43", "tree": "f8d40b95aa42bbb4d8c338657139a4027631fe79", "parents": [ "9633e63bb1d82c02950983d5d3317e6656b11c8e" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Wed Nov 24 06:01:20 2010 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Dec 10 22:13:05 2010 -0800" }, "message": "e1000e: 82571-based mezzanine card can fail ethtool link test\n\nOn certain 82571-based mezzanine NICs in some blade servers, the ethtool\nlink test can fail due to the serdes_has_link flag not set correctly.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Emil Tantilov \u003cemil.s.tantilov@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "9633e63bb1d82c02950983d5d3317e6656b11c8e", "tree": "fb13f79801a120a73a2e72c78c60df3cdc30ec44", "parents": [ "9fe93afdd07aba52a018eb52784124579a80470e" ], "author": { "name": "Holger Eitzenberger", "email": "holger@eitzenberger.org", "time": "Wed Nov 17 15:43:52 2010 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Dec 10 22:13:01 2010 -0800" }, "message": "e1000e: fix double initialization in blink path\n\nThe kernel goes BUG() at the time \u0027ethtool -p eth0 3\u0027 comes\nback, which is due to adapter-\u003eled_blink_task initialized\nseveral times. At the time it is still running this results\nin a corrupted task_list of the associated workqueue.\n\nThe fix is to move the workqueue initialization to the\nprobe function instead.\n\nSigned-off-by: Holger Eitzenberger \u003cholger@eitzenberger.org\u003e\nReviewed-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nTested-by: Emil Tantilov \u003cemil.s.tantilov@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "667445008db3f45a760c235d771be0c9671e59e5", "tree": "6b6fea62bfcfeb78a6deeb851b70c8eda0700c17", "parents": [ "19a0b67afd174c4db261d587b5c67704dcd53c17" ], "author": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Wed Dec 01 19:59:50 2010 +0000" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Fri Dec 10 22:12:32 2010 -0800" }, "message": "Intel Wired LAN drivers: Use static const\n\nBased on work by Joe Perches \u003cjoe@perches.com\u003e\n\nUsing static const to decrease data and overall object size.\n\nCC: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nTested-by: Emil Tantilov \u003cemil.s.tantilov@intel.com\u003e\n" }, { "commit": "ed4ba4b5b96742d29225308ccccbdb1810b63064", "tree": "2c28a534d7b7fe4ed58925401d69b14df90323be", "parents": [ "e596e6e4d578f2639416e620d367a3af34814a40" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Thu Dec 09 12:10:25 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 10 15:55:24 2010 -0800" }, "message": "netdev: Use default implementation of ethtool_ops::get_link where possible\n\nVarious drivers are using implementations of ethtool_ops::get_link\nthat are equivalent to the default ethtool_op_get_link(). Change\nthem to use that instead.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "89bf67f1f080c947c92f8773482d9e57767ca292", "tree": "ae492f5f31a32a4f838778cd34320da0bedf9dfd", "parents": [ "fe6d2a38b2076cba515dc95b5dc1589a7ab51c17" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Nov 22 00:15:06 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 27 22:53:38 2010 -0800" }, "message": "drivers/net: use vzalloc()\n\nUse vzalloc() and vzalloc_node() in net drivers\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: Jon Mason \u003cjon.mason@exar.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "147b2c8cb4f3e16aafc87096365a913d01ee3a21", "tree": "3c65dedd8faf0f02ff01ca0fcc680acc5b273829", "parents": [ "1b98c2bb63a4b415d8d894d001b6d0256409e0d9" ], "author": { "name": "Dongdong Deng", "email": "dongdong.deng@windriver.com", "time": "Tue Nov 16 19:50:15 2010 -0800" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Tue Nov 16 19:50:15 2010 -0800" }, "message": "e1000e: add netpoll support for MSI/MSI-X IRQ modes\n\nWith enabling CONFIG_PCI_MSI, e1000e could work in MSI/MSI-X IRQ mode,\nand netpoll controller didn\u0027t deal with those IRQ modes on e1000e.\n\nThis patch add the handling MSI/MSI-X IRQ modes to netpoll controller,\nso that netconsole could work with those IRQ modes.\n\nSigned-off-by: Dongdong Deng \u003cdongdong.deng@windriver.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "1b98c2bb63a4b415d8d894d001b6d0256409e0d9", "tree": "820d02cb7aea80c034d3b85fe5fc15eba2cf572a", "parents": [ "d478eb44f7a6b53256ae399fa7e597525b4034ee" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Tue Nov 16 19:50:14 2010 -0800" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Tue Nov 16 19:50:14 2010 -0800" }, "message": "e1000e: 82574 intermittently fails to initialize with manageability f/w\n\nThe driver can fail initializing the hardware when manageability firmware\nis performing concurrent MDIO operations because the hardware semaphore\nscheme to prevent concurrent operations between software and firmware is\nincorrect for 82574/82583. Instead of using the SWSM register, the driver\nshould be using the EXTCNF_CTRL register. A software mutex is also added\nto prevent simultaneous software threads from performing similar concurrent\naccesses.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Emil Tantilov \u003cemil.s.tantilov@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "d478eb44f7a6b53256ae399fa7e597525b4034ee", "tree": "05a2e01c4ff7cbabf4f5e0eda9ef8b430e1ea441", "parents": [ "b1d670f10e8078485884f0cf7e384d890909aeaa" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Tue Nov 16 19:50:13 2010 -0800" }, "committer": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Tue Nov 16 19:50:13 2010 -0800" }, "message": "e1000e: 82571 SerDes link handle null code word from partner\n\nSerDes Link detection on certain 82571 mezzanine cards can fail when the\nlink is forced, the link partner does not recognize forced link and the\nlink partner sends null code words. Detect the null code words and return\nto auto-negotiation state which causes the link partner to begin responding\nwith valid code words. Within a reasonable interval the link will finally\nsettle as forced by both partners.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\n" }, { "commit": "1d51c4185bb369cb39ed8cc20b331508e47b35b2", "tree": "b13c3d57d2a7fb717cef7c1793bdc7ac7c1ca0b5", "parents": [ "6f38ad93e4882e84c1cc113736db7dc9252dcf11" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sun Nov 14 17:04:32 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 15 11:06:19 2010 -0800" }, "message": "drivers/net/e1000e: Remove unnecessary semicolons\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b595076a180a56d1bb170e6eceda6eb9d76f4cd3", "tree": "bc01ec7283808013e0b8ce7713fd6fc40f810429", "parents": [ "6aaccece1c483f189f76f1282b3984ff4c7ecb0a" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Mon Nov 01 15:38:34 2010 -0400" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Nov 01 15:38:34 2010 -0400" }, "message": "tree-wide: fix comment/printk typos\n\n\"gadget\", \"through\", \"command\", \"maintain\", \"maintain\", \"controller\", \"address\",\n\"between\", \"initiali[zs]e\", \"instead\", \"function\", \"select\", \"already\",\n\"equal\", \"access\", \"management\", \"hierarchy\", \"registration\", \"interest\",\n\"relative\", \"memory\", \"offset\", \"already\",\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "affa9dfb04b7e2e3a0b0e6d844ea0c9ed97505f9", "tree": "5bf0e4f0d230b237a19ddbafc2bcdb62dbd704fe", "parents": [ "ff10e13cd06f3dbe90e9fffc3c2dd2057a116e4b" ], "author": { "name": "Carolyn Wyborny", "email": "carolyn.wyborny@intel.com", "time": "Thu Oct 28 00:59:55 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 28 10:18:59 2010 -0700" }, "message": "e1000e: Add check for reset flags before displaying reset message\n\nSome parts need to execute resets during normal operation. This flag\ncheck ensures that those parts reset without needlessly alarming the\nuser. Other unexpected resets by other parts will dump debug info\nand message the reset action to the user, as originally intended.\n\nSigned-off-by: Carolyn Wyborny \u003ccarolyn.wyborny@intel.com\u003e\nAcked-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Emil Tantilov \u003cemil.s.tantilov@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": "ff10e13cd06f3dbe90e9fffc3c2dd2057a116e4b", "tree": "673e0bf9ad8a7b78cc646e0c90cb390378202f2c", "parents": [ "116c1ea0aa871a2d6554e7fae124fc2880a596c1" ], "author": { "name": "Carolyn Wyborny", "email": "carolyn.wyborny@intel.com", "time": "Thu Oct 28 00:59:53 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 28 10:18:59 2010 -0700" }, "message": "e1000e: reset PHY after errors detected\n\nSome errors can be induced in the PHY via environmental testing\n(specifically extreme temperature changes and electro static\ndischarge testing), and in the case of the PHY hanging due to\nthis input, this detects the problem and resets to continue.\nThis issue only applies to 82574 silicon.\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: Carolyn Wyborny \u003ccarolyn.wyborny@intel.com\u003e\nTested-by: Emil Tantilov \u003cemil.s.tantilov@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": "eab6d18d20fc5b5ba04a7e7fcd6f357197870e51", "tree": "8a52538666747998dd16bc68a2102b05ebfe6873", "parents": [ "b738127dfb469bb9f595cdace30e7f881e8146b2" ], "author": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Wed Oct 20 13:56:03 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 21 01:26:52 2010 -0700" }, "message": "vlan: Don\u0027t check for vlan group before vlan_tx_tag_present.\n\nMany (but not all) drivers check to see whether there is a vlan\ngroup configured before using a tag stored in the skb. There\u0027s\nnot much point in this check since it just throws away data that\nshould only be present in the expected circumstances. However,\nit will soon be legal and expected to get a vlan tag when no\nvlan group is configured, so remove this check from all drivers\nto avoid dropping the tags.\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": "c6ce3854f098e1307ecd3bde07903d65fb14a9cb", "tree": "5d53aecfa96574bea440747be4d0d68339dbf5f3", "parents": [ "a7714338aa9332e569b38c7643dc4a7bb37a0ff5" ], "author": { "name": "Carolyn Wyborny", "email": "carolyn.wyborny@intel.com", "time": "Fri Oct 15 17:35:31 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 18 07:54:30 2010 -0700" }, "message": "e1000e: Fix for offline diag test failure at first call\n\nMove link test call to later in the offline sequence, move the\nrestore settings block to afterwards and add another reset to ensure\nthe hardware is in a known state afterwards.\n\nSigned-off-by: Carolyn Wyborny \u003ccarolyn.wyborny@intel.com\u003e\nAcked-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@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": "828bac87bb074f3366621724fdfbe314f98ccc7e", "tree": "8ecc93bdabac266c288894efcc9b426e142a9f8e", "parents": [ "3a3b75860527a11ba5035c6aa576079245d09e2a" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Wed Sep 29 21:39:37 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 30 18:00:17 2010 -0700" }, "message": "e1000e: 82579 performance improvements\n\nThe initial support for 82579 was tuned poorly for performance. Adjust the\npacket buffer allocation appropriately for both standard and jumbo frames;\nand for jumbo frames increase the receive descriptor pre-fetch, disable\nadaptive interrupt moderation and set the DMA latency tolerance.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@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": "3a3b75860527a11ba5035c6aa576079245d09e2a", "tree": "0dbd487fe8910a02c39ab4f84da6d16ebe6d29e3", "parents": [ "6af3b9ebfea38d0a057fbd7bdcecc61ac5662f02" ], "author": { "name": "Jesse Brandeburg", "email": "jesse.brandeburg@intel.com", "time": "Wed Sep 29 21:38:49 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 30 17:59:31 2010 -0700" }, "message": "e1000e: use hardware writeback batching\n\nMost e1000e parts support batching writebacks. The problem with this is\nthat when some of the TADV or TIDV timers are not set, Tx can sit forever.\n\nThis is solved in this patch with write flushes using the Flush Partial\nDescriptors (FPD) bit in TIDV and RDTR.\n\nThis improves bus utilization and removes partial writes on e1000e,\nparticularly from 82571 parts in S5500 chipset based machines.\n\nOnly ES2LAN and 82571/2 parts are included in this optimization, to reduce\ntesting load.\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nTested-by: Emil Tantilov \u003cemil.s.tantilov@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": "e40051d134f7ee95c8c1f7a3471e84eafc9ab326", "tree": "88eb44e49a75721ae926665a2c42f08badac9d07", "parents": [ "42099d7a3941d4aaf853caac92b3ae76149fc6e7", "2cc6d2bf3d6195fabcf0febc192c01f99519a8f3" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 27 01:03:03 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 27 01:03:03 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/qlcnic/qlcnic_init.c\n\tnet/ipv4/ip_output.c\n" }, { "commit": "807540baae406c84dcb9c1c8ef07a56d2d2ae84a", "tree": "ccd5c2cb57710dd6b73cf8df11eedf67abc14ae4", "parents": [ "cb4dfe562cac6fcb544df752e40c1d78000d0712" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Sep 23 05:40:09 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Sep 26 18:34:29 2010 -0700" }, "message": "drivers/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": "7b872a55c40b7e6f5e257c252f96dde911bd7b2f", "tree": "8541d31e7ba17083e488104fd4f6fc72d6c71581", "parents": [ "308fb39a860c816be8741fe783ae7c64e9c1af5d" ], "author": { "name": "Yi Zou", "email": "yi.zou@intel.com", "time": "Wed Sep 22 17:57:58 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 22 21:20:04 2010 -0700" }, "message": "e1000/e1000e/igb/ixgb/ixgbe: set NETIF_F_HIGHDMA for VLAN feature flags\n\nIf the netdev-\u003efeatures is set with NETIF_F_HIGHDMA, we should set the\ncorresponding netdev-\u003evlan_features as well to allow VLAN netdev created\non top of the real netdev to be able to also benefit from HIGHDMA on 32bit\nsystem, reducing the performance hit that is caused by __skb_linearize(),\nparticularly for large send. This is fixed in this patch for all Intel e1000,\ne1000e, igb, ixgbe, and ixgbe drivers since this should be beneficial\nto all devices supported by these drivers.\n\nSigned-off-by: Yi Zou \u003cyi.zou@intel.com\u003e\nTested-by: Emil Tantilov \u003cemil.s.tantilov@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": "605c82bab5abe0816e5e32716875c245f89f39da", "tree": "d674d7ab73faf79957a9c87f850ab678537bde7d", "parents": [ "a1ce647378c0262fe72757f989e961b2de6460a5" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Wed Sep 22 17:17:01 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 22 20:41:21 2010 -0700" }, "message": "e1000e: 82579 do not gate auto config of PHY by hardware during nominal use\n\nFor non-managed versions of 82579, set the bit that prevents the hardware\nfrom automatically configuring the PHY after resets only when the driver\nperforms a reset, clear the bit after resets. This is so the hardware can\nconfigure the PHY automatically when the part is reset in a manner that is\nnot controlled by the driver (e.g. in a virtual environment via PCI FLR)\notherwise the PHY will be mis-configured causing issues such as failing to\nlink at 1000Mbps.\nFor managed versions of 82579, keep the previous behavior since the\nmanageability firmware will handle the PHY configuration.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@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": "a1ce647378c0262fe72757f989e961b2de6460a5", "tree": "afd3e62996a49b32509297ff0f38831e6336f1c7", "parents": [ "831bd2e6a6c09588fdde453ecb858f050ac1b942" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Wed Sep 22 17:16:40 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 22 20:41:20 2010 -0700" }, "message": "e1000e: 82579 jumbo frame workaround causing CRC errors\n\nThe subject workaround was causing CRC errors due to writing the wrong\nregister with updates of the RCTL register. It was also found that the\nworkaround function which modifies the RCTL register was being called in\nthe middle of a read-modify-write operation of the RCTL register, so the\nfunction call has been moved appropriately. Lastly, jumbo frames must not\nbe allowed when CRC stripping is disabled by a module parameter because the\nworkaround requires the CRC be stripped.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@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": "831bd2e6a6c09588fdde453ecb858f050ac1b942", "tree": "d574443e20c1e4e8ae9a7a13c525f151c3365ccb", "parents": [ "5f3eed6fe0e36e4b56c8dd9160241a868ee0de2a" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Wed Sep 22 17:16:18 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 22 20:41:20 2010 -0700" }, "message": "e1000e: 82579 unaccounted missed packets\n\nOn 82579, there is a hardware bug that can cause received packets to not\nget transferred from the PHY to the MAC due to K1 (a power saving feature\nof the PHY-MAC interconnect similar to ASPM L1). Since the MAC controls\nthe accounting of missed packets, these will go unnoticed. Workaround the\nissue by setting the K1 beacon duration according to the link speed.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@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": "5f3eed6fe0e36e4b56c8dd9160241a868ee0de2a", "tree": "aacb2e72721946e1c5f060f0f4989bf553d796df", "parents": [ "87fb7410cd8d4396dee0155526568645adba3b99" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Wed Sep 22 17:15:54 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 22 20:41:19 2010 -0700" }, "message": "e1000e: 82566DC fails to get link\n\nTwo recent patches to cleanup the reset[1] and initial PHY configuration[2]\ncode paths for ICH/PCH devices inadvertently left out a 10msec delay and\ndevice ID check respectively which are necessary for the 82566DC (device id\n0x104b) to be configured properly, otherwise it will not get link.\n\n[1] commit e98cac447cc1cc418dff1d610a5c79c4f2bdec7f\n[2] commit 3f0c16e84438d657d29446f85fe375794a93f159\n\nCC: stable@kernel.org\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@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": "87fb7410cd8d4396dee0155526568645adba3b99", "tree": "7ee2e3c0cd3429eb98573f02c141d4011c3e1f8d", "parents": [ "8395ae8303255b31a8625035fc98391c88b0c257" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Wed Sep 22 17:15:33 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 22 20:41:19 2010 -0700" }, "message": "e1000e: 82579 SMBus address and LEDs incorrect after device reset\n\nSince the hardware is prevented from performing automatic PHY configuration\n(the driver does it instead), the OEM_WRITE_ENABLE bit in the EXTCNF_CTRL\nregister will not get cleared preventing the SMBus address and the LED\nconfiguration to be written to the PHY registers. On 82579, do not check\nthe OEM_WRITE_ENABLE bit.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@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": "8395ae8303255b31a8625035fc98391c88b0c257", "tree": "176950114d1368f87949026d626690031e85628f", "parents": [ "94e2238969e89f5112297ad2a00103089dde7e8f" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Wed Sep 22 17:15:08 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 22 20:41:18 2010 -0700" }, "message": "e1000e: 82577/8/9 issues with device in Sx\n\nWhen going to Sx, disable gigabit in PHY (e1000_oem_bits_config_ich8lan)\nin addition to the MAC before configuring PHY wakeup otherwise the PHY\nconfiguration writes might be missed. Also write the LED configuration\nand SMBus address to the PHY registers (e1000_oem_bits_config_ich8lan and\ne1000_write_smbus_addr, respectively). The reset is no longer needed\nsince re-auto-negotiation is forced in e1000_oem_bits_config_ich8lan and\nleaving it in causes issues with auto-negotiating the link.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nTested-by: Jeff Pieper \u003cjeffrey.e.pieper@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": "068e8a30320e33b1f8d15df9eaef84f04258f96d", "tree": "19458b3eeec7d5377cecf0f9b395e2ab70d8bbd1", "parents": [ "bc0ed0be10a4925efa7b81a84af53f12fbdbcb4e" ], "author": { "name": "Jean Delvare", "email": "jdelvare@suse.de", "time": "Sun Sep 12 22:45:39 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Sep 14 14:29:37 2010 -0700" }, "message": "e1000e: Simplify MSI interrupt testing\n\nThe code is quite convoluted, simplify it. This also avoids calling\ne1000_request_irq() without testing the value it returned, which was\nbad.\n\nSigned-off-by: Jean Delvare \u003cjdelvare@suse.de\u003e\nCc: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nCc: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nAcked-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bc8acf2c8c3e43fcc192762a9f964b3e9a17748b", "tree": "e3a91392771a22390e59c24fcb7bad3045ce17d1", "parents": [ "7162f6691e9d39d8d866574687cddb3f1ec65d72" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Sep 02 13:07:41 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 02 19:06:22 2010 -0700" }, "message": "drivers/net: avoid some skb-\u003eip_summed initializations\n\nfresh skbs have ip_summed set to CHECKSUM_NONE (0)\n\nWe can avoid setting again skb-\u003eip_summed to CHECKSUM_NONE in drivers.\n\nIntroduce skb_checksum_none_assert() helper so that we keep this\nassertion documented in driver sources.\n\nChange most occurrences of :\n\nskb-\u003eip_summed \u003d CHECKSUM_NONE;\n\nby :\n\nskb_checksum_none_assert(skb);\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c061b18df0f1fe3f50fe451dbbdc9ede3c19701a", "tree": "91508aff083ab7a93d1e7f3b6eb933059d1a2776", "parents": [ "31018e068edb9eed740bec5cf14802c3c676c9ee" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Mon Aug 23 18:20:03 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 25 15:35:43 2010 -0700" }, "message": "drivers/net: Remove address use from assignments of function pointers\n\n\"foo \u003d \u0026function\" is more commonly written \"foo \u003d function\"\n\nDone with coccinelle script:\n\n// \u003csmpl\u003e\n@r@\nidentifier f;\n@@\n\nf(...) { ... }\n\n@@\nidentifier r.f;\n@@\n\n- \u0026f\n+ f\n// \u003c/smpl\u003e\n\ndrivers/net/tehuti.c used a function and struct with the\nsame name, the function was renamed.\n\nCompile tested x86 only.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d1b113bb028999e82a8528e1484be8c23fb5a7d9", "tree": "18be926b8f7721e98d6a4517ced58b54937645fb", "parents": [ "9c5ea3675dbe4853eea747542da257c3e6f18de2", "cca77b7c81876d819a5806f408b3c29b5b61a815" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 23 18:30:30 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 23 18:30:30 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (27 commits)\n netfilter: fix CONFIG_COMPAT support\n isdn/avm: fix build when PCMCIA is not enabled\n header: fix broken headers for user space\n e1000e: don\u0027t check for alternate MAC addr on parts that don\u0027t support it\n e1000e: disable ASPM L1 on 82573\n ll_temac: Fix poll implementation\n netxen: fix a race in netxen_nic_get_stats()\n qlnic: fix a race in qlcnic_get_stats()\n irda: fix a race in irlan_eth_xmit()\n net: sh_eth: remove unused variable\n netxen: update version 4.0.74\n netxen: fix inconsistent lock state\n vlan: Match underlying dev carrier on vlan add\n ibmveth: Fix opps during MTU change on an active device\n ehea: Fix synchronization between HW and SW send queue\n bnx2x: Update bnx2x version to 1.52.53-4\n bnx2x: Fix PHY locking problem\n rds: fix a leak of kernel memory\n netlink: fix compat recvmsg\n netfilter: fix userspace header warning\n ...\n" }, { "commit": "d3c6e7ad09cebbad1a3dea077668062136626fd2", "tree": "698022508a8d8c76a5d2cf55e50232079d6b1f42", "parents": [ "c3227e546c574172e77616270a16a04eae561b8f", "48d3ff82698cb0094684aed70446e0a5cbb1a4d0" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 21 23:32:24 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 21 23:32:24 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "1aef70ef125165e0114a8e475636eff242a52030", "tree": "8b53324f66ef455cfcd3e93cb83bd99c84567d14", "parents": [ "19833b5dffe2f2e92a1b377f9aae9d5f32239512" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Thu Aug 19 15:48:52 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 19 15:48:52 2010 -0700" }, "message": "e1000e: don\u0027t check for alternate MAC addr on parts that don\u0027t support it\n\nFrom: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\n\nThe alternate MAC address feature is only supported by 80003ES2LAN and\n82571 LOMs as well as a couple 82571 mezzanine cards. Checking for an\nalternate MAC address on other parts can fail leading to the driver not\nable to load. This patch limits the check for an alternate MAC address\nto be done only for parts that support the feature.\n\nThis issue has been around since support for the feature was introduced\nto the e1000e driver in 2.6.34.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nReported-by: Fabio Varesano \u003cfax8@users.sourceforge.net\u003e\nCc: stable@kernel.org\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "19833b5dffe2f2e92a1b377f9aae9d5f32239512", "tree": "4aa82c89c6e6035acd3f08f4a161fcd83cd7c596", "parents": [ "8539992f6091eb8206c781421312157d0c282e6e" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Thu Aug 19 15:48:30 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 19 15:48:30 2010 -0700" }, "message": "e1000e: disable ASPM L1 on 82573\n\nOn the e1000-devel mailing list, Nils Faerber reported latency issues with\nthe 82573 LOM on a ThinkPad X60. It was found to be caused by ASPM L1;\ndisabling it resolves the latency. The issue is present in kernels back\nto 2.6.34 and possibly 2.6.33.\n\n\nReported-by: Nils Faerber \u003cnils.faerber@kernelconcepts.de\u003e\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f6cec0ae58c17522a7bc4e2f39dae19f199ab534", "tree": "496cf6f53b0c75d9ae57bd0e411c5d2f6cea5cbb", "parents": [ "0fcf12d510b6d1b1b090a090c62009310eca4be4", "c4e9b56e24422e71424b24eee27c2b134a191d7b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 09 21:05:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 09 21:05:52 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (59 commits)\n igbvf.txt: Add igbvf Documentation\n igb.txt: Add igb documentation\n e100/e1000*/igb*/ixgb*: Add missing read memory barrier\n ixgbe: fix build error with FCOE_CONFIG without DCB_CONFIG\n netxen: protect tx timeout recovery by rtnl lock\n isdn: gigaset: use after free\n isdn: gigaset: add missing unlock\n solos-pci: Fix race condition in tasklet RX handling\n pkt_sched: Fix sch_sfq vs tcf_bind_filter oops\n net: disable preemption before call smp_processor_id()\n tcp: no md5sig option size check bug\n iwlwifi: fix locking assertions\n iwlwifi: fix TX tracer\n isdn: fix information leak\n net: Fix napi_gro_frags vs netpoll path\n usbnet: remove noisy and hardly useful printk\n rtl8180: avoid potential NULL deref in rtl8180_beacon_work\n ath9k: Remove myself from the MAINTAINERS list\n libertas: scan before assocation if no BSSID was given\n libertas: fix association with some APs by using extended rates\n ...\n" }, { "commit": "2d0bb1c1f4524befe9f0fcf0d0cd3081a451223f", "tree": "16abb34e4f852ac6c4101ef9e46940c3bcd5937f", "parents": [ "4bc091d85f979a1a18ef2d710b819b3c5b397707" ], "author": { "name": "Jeff Kirsher", "email": "jeffrey.t.kirsher@intel.com", "time": "Sun Aug 08 16:02:31 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Aug 08 20:02:45 2010 -0700" }, "message": "e100/e1000*/igb*/ixgb*: Add missing read memory barrier\n\nBased on patches from Sonny Rao and Milton Miller...\n\nCombined the patches to fix up clean_tx_irq and clean_rx_irq.\n\nThe PowerPC architecture does not require loads to independent bytes\nto be ordered without adding an explicit barrier.\n\nIn ixgbe_clean_rx_irq we load the status bit then load the packet data.\nWith packet split disabled if these loads go out of order we get a\nstale packet, but we will notice the bad sequence numbers and drop it.\n\nThe problem occurs with packet split enabled where the TCP/IP header\nand data are in different descriptors. If the reads go out of order\nwe may have data that doesn\u0027t match the TCP/IP header. Since we use\nhardware checksumming this bad data is never verified and it makes it\nall the way to the application.\n\nThis bug was found during stress testing and adding this barrier has\nbeen shown to fix it. The bug can manifest as a data integrity issue\n(bad payload data) or as a BUG in skb_pull().\n\nThis was a nasty bug to hunt down, if people agree with the fix I think\nit\u0027s a candidate for stable.\n\nPreviously Submitted to e1000-devel only for ixgbe\n\nhttp://marc.info/?l\u003de1000-devel\u0026m\u003d126593062701537\u0026w\u003d3\n\nWe\u0027ve now seen this problem hit with other device drivers (e1000e mostly)\nSo I\u0027m resubmitting with fixes for other Intel Device Drivers with\nsimilar issues.\n\nCC: Milton Miller \u003cmiltonm@bga.com\u003e\nCC: Anton Blanchard \u003canton@samba.org\u003e\nCC: Sonny Rao \u003csonnyrao@us.ibm.com\u003e\nCC: stable \u003cstable@kernel.org\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1cfd2bda8c486ae0e7a8005354758ebb68172bca", "tree": "76ce15f377d8d6eb3ae4aa8b8b0b415457e38d36", "parents": [ "b57bdda58cda0aaf6def042d101dd85977a286ed", "763e9db9994e27a7d2cb3701c8a097a867d0e0b4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 11:44:36 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 11:44:36 2010 -0700" }, "message": "Merge branch \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6\n\n* \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (30 commits)\n PCI: update for owner removal from struct device_attribute\n PCI: Fix warnings when CONFIG_DMI unset\n PCI: Do not run NVidia quirks related to MSI with MSI disabled\n x86/PCI: use for_each_pci_dev()\n PCI: use for_each_pci_dev()\n PCI: MSI: Restore read_msi_msg_desc(); add get_cached_msi_msg_desc()\n PCI: export SMBIOS provided firmware instance and label to sysfs\n PCI: Allow read/write access to sysfs I/O port resources\n x86/PCI: use host bridge _CRS info on ASRock ALiveSATA2-GLAN\n PCI: remove unused HAVE_ARCH_PCI_SET_DMA_MAX_SEGMENT_{SIZE|BOUNDARY}\n PCI: disable mmio during bar sizing\n PCI: MSI: Remove unsafe and unnecessary hardware access\n PCI: Default PCIe ASPM control to on and require !EMBEDDED to disable\n PCI: kernel oops on access to pci proc file while hot-removal\n PCI: pci-sysfs: remove casts from void*\n ACPI: Disable ASPM if the platform won\u0027t provide _OSC control for PCIe\n PCI hotplug: make sure child bridges are enabled at hotplug time\n PCI hotplug: shpchp: Removed check for hotplug of display devices\n PCI hotplug: pciehp: Fixed return value sign for pciehp_unconfigure_device\n PCI: Don\u0027t enable aspm before drivers have had a chance to veto it\n ...\n" } ], "next": "6ba74014c1ab0e37af7de6f64b4eccbbae3cb9e7" }