)]}' { "log": [ { "commit": "f8965467f366fd18f01feafb5db10512d7b4422c", "tree": "3706a9cd779859271ca61b85c63a1bc3f82d626e", "parents": [ "a26272e5200765691e67d6780e52b32498fdb659", "2ec8c6bb5d8f3a62a79f463525054bae1e3d4487" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 20 21:04:44 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 20 21:04:44 2010 -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: (1674 commits)\n qlcnic: adding co maintainer\n ixgbe: add support for active DA cables\n ixgbe: dcb, do not tag tc_prio_control frames\n ixgbe: fix ixgbe_tx_is_paused logic\n ixgbe: always enable vlan strip/insert when DCB is enabled\n ixgbe: remove some redundant code in setting FCoE FIP filter\n ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp\n ixgbe: fix header len when unsplit packet overflows to data buffer\n ipv6: Never schedule DAD timer on dead address\n ipv6: Use POSTDAD state\n ipv6: Use state_lock to protect ifa state\n ipv6: Replace inet6_ifaddr-\u003edead with state\n cxgb4: notify upper drivers if the device is already up when they load\n cxgb4: keep interrupts available when the ports are brought down\n cxgb4: fix initial addition of MAC address\n cnic: Return SPQ credit to bnx2x after ring setup and shutdown.\n cnic: Convert cnic_local_flags to atomic ops.\n can: Fix SJA1000 command register writes on SMP systems\n bridge: fix build for CONFIG_SYSFS disabled\n ARCNET: Limit com20020 PCI ID matches for SOHARD cards\n ...\n\nFix up various conflicts with pcmcia tree drivers/net/\n{pcmcia/3c589_cs.c, wireless/orinoco/orinoco_cs.c and\nwireless/orinoco/spectrum_cs.c} and feature removal\n(Documentation/feature-removal-schedule.txt).\n\nAlso fix a non-content conflict due to pm_qos_requirement getting\nrenamed in the PM tree (now pm_qos_request) in net/mac80211/scan.c\n" }, { "commit": "a4b770972b8f819e408d7cc3ae9637e15bff62f6", "tree": "62e3c413b084c106d750cf6cc0701709cde30100", "parents": [ "21ce849ba5cc178740c6532ba3dded852296ad91" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Fri May 14 00:19:28 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 14 00:19:28 2010 -0700" }, "message": "drivers/net: Remove unnecessary returns from void function()s\n\nThis patch removes from drivers/net/ all the unnecessary\nreturn; statements that precede the last closing brace of\nvoid functions.\n\nIt does not remove the returns that are immediately\npreceded by a label as gcc doesn\u0027t like that.\n\nIt also does not remove null void functions with return.\n\nDone via:\n$ grep -rP --include\u003d*.[ch] -l \"return;\\n}\" net/ | \\\n xargs perl -i -e \u0027local $/ ; while (\u003c\u003e) { s/\\n[ \\t\\n]+return;\\n}/\\n}/g; print; }\u0027\n\nwith some cleanups by hand.\n\nCompile tested x86 allmodconfig only.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "10df0b9116e2039d5585a196753e5f36d7afcba2", "tree": "f07bb3acaa6988816ef17c05e1ac680fb41bf63a", "parents": [ "e98cac447cc1cc418dff1d610a5c79c4f2bdec7f" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Mon May 10 15:02:52 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 12 23:31:15 2010 -0700" }, "message": "e1000e: add PCI device id to enable support for 82567V-4\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "e98cac447cc1cc418dff1d610a5c79c4f2bdec7f", "tree": "fbb290c330f7ffdbb574132460f18f9261cacba9", "parents": [ "a305595b127fdbe7ab5ba458f7ee470a82a3b82c" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Mon May 10 15:02:32 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 12 23:31:14 2010 -0700" }, "message": "e1000e: Fix/cleanup PHY reset code for ICHx/PCHx\n\ni) Fixes a bug where e1000_sw_lcd_config_ich8lan() was calling\ne1000_lan_init_done_ich8lan() to poll the STATUS.LAN_INIT_DONE bit to\nmake sure the MAC had completed the PHY configuration. However,\ne1000_lan_init_done_ich8lan() had already been called in one of the two\nplaces where PHY reset occurs for ICHx/PCHx parts, which caused the second\ncall to busy-wait for 150 msec because the LAN_INIT_DONE bit had already\nbeen checked and cleared.\n\nii) Cleanup the two separate PHY reset code paths, i.e. the full-chip reset\nin e1000_reset_hw_ich8lan() and the PHY-only reset in\ne1000_phy_hw_reset_ich8lan(). There was duplicate code in both paths to be\nperformed post-reset that are now combined into one new function -\ne1000_post_phy_reset_ich8lan(). This cleanup also included moving the\nclearing of the PHY Reset Asserted bit in the STATUS register (now done for\nall ICH/PCH parts) and the check for the indication from h/w that basic\nconfiguration has completed back to where it previously was in\ne1000_get_cfg_done_ich8lan().\n\niii) Corrected a few comments\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "a305595b127fdbe7ab5ba458f7ee470a82a3b82c", "tree": "3f771c91aaa998e296391a694fb29a5a2841651c", "parents": [ "a65a4a0d51eaf9e5715dc24f8820c8689c3719a5" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Mon May 10 15:02:12 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 12 23:31:13 2010 -0700" }, "message": "e1000e: move settting of flow control refresh timer to link setup code\n\nThe flow control refresh timer value needs to be saved off so that it can\nbe programmed into the approrpiate register when applicable but without a\nreset, e.g. when changing flow control parameters via ethtool.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "a65a4a0d51eaf9e5715dc24f8820c8689c3719a5", "tree": "3379bfd8b9d719a791052d410dcb256e4d9c69db", "parents": [ "eab50ffb222808b5053a82325be3e5d26faa08df" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Mon May 10 15:01:51 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 12 23:31:13 2010 -0700" }, "message": "e1000e: fix checks for manageability enabled and management pass-through\n\nThe mac-\u003earc_subsystem was being incorrectly used to flag whether or not\nmanageability was enabled when it should only be used to state whether the\nARC (Host interface) subsystem is available on a particular MAC _and_ only\nvalid when any manageability is enabled. The ARC subsystem is currently\nonly available on 80003es2lan and 82573 parts supported by the driver.\n\nA new flag, has_fwsm, is introduced to be used when checking if\nmanageability is enabled but only on parts that acutally have an FWSM\nregister. While the above parts have an FWSM register, there are other\nparts that have FWSM but do not have support for the ARC subsystem,\nnamely 82571/2 and ICHx/PCH.\n\nAnd then there are parts that have manageability, but do not have either\nFWSM register or support for the ARC subsystem - these are 82574 and 82583.\n\nFor 80003es2lan, 82571/2/3 and ICH/PCH parts, this patch makes no\nfunctional changes, it only corrects the usage of the manageability flags.\nFor 82574 and 82583, it fixes the incorrect accesses of the non-existent\nFWSM register and ARC subsystem as well as corrects the check for\nmanagement pass-through.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "eab50ffb222808b5053a82325be3e5d26faa08df", "tree": "6b9b398d4631c96783af1805b01491726ae00df4", "parents": [ "8b802a7e94c2ed9c6032a88b3ab9860c55cd6378" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Mon May 10 15:01:30 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 12 23:31:12 2010 -0700" }, "message": "e1000e: Incorrect function pointer set for force_speed_duplex on 82577\n\nThe force_speed_duplex function pointer was incorrectly set. Instead of\ncalling the 82577-specific version it was calling the m88 version which,\namong other incorrect things, reset the PHY causing autonegotiation to be\nre-enabled in the PHY resulting in the link defaulting to half-duplex.\nThe 82577-specific force_speed_duplex function also had an issue where\nit disabled Auto-MDI-X which caused the link to not come up.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "8b802a7e94c2ed9c6032a88b3ab9860c55cd6378", "tree": "53fd2605318e5a08a05e0ad7dafa1f0ce38f3664", "parents": [ "757c530407a92fd460d557af59ba86920cf025cb" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Mon May 10 15:01:10 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 12 23:31:12 2010 -0700" }, "message": "e1000e: Cleanup e1000_sw_lcd_config_ich8lan()\n\nAfter every reset all ICH/PCH parts call this function which acquires the\nswflag, performs a workaround on applicable parts and releases the swflag.\nThere is no reason for parts for which this workaround is not applicable\nto acquire and release the swflag so the function should just return\nwithout doing anything for these parts. This also provides for the\nindentation of most of the function contents to be shifted left cleaning up\nthe code.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "757c530407a92fd460d557af59ba86920cf025cb", "tree": "b6b11d1f0dac4539fd050383d619eac29df9f58d", "parents": [ "9c5e209d4ba00eb09922f0f56136474372395c2b" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Mon May 10 15:00:50 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 12 23:31:11 2010 -0700" }, "message": "e1000e: Remove EN_MAC_ADDR_FILTER check from enable_mng_pass_thru check\n\nPatch addresses issues when manageability passthrough is enabled, but the\nMAC_ADDR_FILTER bit is not set in the MANC register.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "9c5e209d4ba00eb09922f0f56136474372395c2b", "tree": "dcd177cb165b46a5db273c29ab98ea65f65c9396", "parents": [ "52a9b2319628e2cbbff7abc4f1092f4597c75a4f" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Mon May 10 15:00:31 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 12 23:31:11 2010 -0700" }, "message": "e1000e: cleanup multiple common exit points\n\n...in e1000_update_nvm_checksum_ich8lan().\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "52a9b2319628e2cbbff7abc4f1092f4597c75a4f", "tree": "5525dad84de0e06c46ca310ac62be3f1e4981b1e", "parents": [ "cd791618c28f524598bcfa941d948b1126a2394a" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Mon May 10 15:00:10 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 12 23:31:10 2010 -0700" }, "message": "e1000e: s/w initiated LSC MSI-X interrupts not generated; no transmit\n\nIn MSI-X mode when an IMPI SoL session was active (i.e. the PHY reset was\nblocked), the LSC interrupt generated by s/w to start the watchdog which\nstarted the transmitter was not getting fired by the hardware because bit\n24 (the \u0027other\u0027 cause bit) also needed to be set. Without an active SoL\nsession, the PHY was reset which caused the h/w to fire the LSC interrupt.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "cd791618c28f524598bcfa941d948b1126a2394a", "tree": "ab4de6ffe1f8c278499eb1d69a958eb7b7559942", "parents": [ "11b08be830078c1cc4af484d0f85c3a010319c97" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Mon May 10 14:59:51 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 12 23:31:10 2010 -0700" }, "message": "e1000e: initialize manageability (IPMI) pass-through in 82574/82583\n\n82574/82583 uses different registers/bits to setup manageability filters\nthan all other parts supported by e1000e; set them accordingly for IPMI\npass-through. Rename the function to better reflect what it does.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "11b08be830078c1cc4af484d0f85c3a010319c97", "tree": "bf0cd95d65cdeb4c9fbc61d6a7cce0032fcad691", "parents": [ "4fe4491fc5578019174d0f02d1ae740fce78deac" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Mon May 10 14:59:31 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 12 23:31:09 2010 -0700" }, "message": "e1000e: bad state after running ethtool diagnostics with AMT enabled\n\nWhen running ethtool online diagnostics with no open interface, there is a\nshort period of time where the driver relinquishes control of the adapter\nduring which time AMT (manageability firmware) can put the adapter into an\nunknown state resulting in such things as link test failure, hardware hang,\nreporting an incorrect link speed, etc. Resetting the adapter during an\nopen() resolves this by putting the adapter into a quiescent state.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "4fe4491fc5578019174d0f02d1ae740fce78deac", "tree": "e04505b8207f2aa65335cd69894a4860f503a03b", "parents": [ "bf47f4b0babe287f250dd720b41ecad9b8f7ac9b" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Mon May 10 14:59:10 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 12 23:31:09 2010 -0700" }, "message": "e1000e: use static params to save stack space (part 2)\n\nA couple stack cleanups missed in an earlier patch from Jesse.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nCc: Jesse Brandeburg \u003cjesse.brandeburg@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": "ed77134bfccf5e75b6cbadab268e559dbe6a4ebb", "tree": "dae087a617ab3d9af8673d1905dbca3bcd57e89e", "parents": [ "0fef8b1e83c4ab08cf1304dbebcfd749caf4f187" ], "author": { "name": "Mark Gross", "email": "mgross@linux.intel.com", "time": "Thu May 06 01:59:26 2010 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Mon May 10 23:08:19 2010 +0200" }, "message": "PM QOS update\n\nThis patch changes the string based list management to a handle base\nimplementation to help with the hot path use of pm-qos, it also renames\nmuch of the API to use \"request\" as opposed to \"requirement\" that was\nused in the initial implementation. I did this because request more\naccurately represents what it actually does.\n\nAlso, I added a string based ABI for users wanting to use a string\ninterface. So if the user writes 0xDDDDDDDD formatted hex it will be\naccepted by the interface. (someone asked me for it and I don\u0027t think\nit hurts anything.)\n\nThis patch updates some documentation input I got from Randy.\n\nSigned-off-by: markgross \u003cmgross@linux.intel.com\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "627c8a041f7aaaea93c766f69bd61d952a277586", "tree": "4c8ae71ff723654c72bfd1617891b5d2493dc200", "parents": [ "6dfaa76994e5d49a82afb415bbe1362e901b2b95" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Wed May 05 22:00:27 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 06 01:31:28 2010 -0700" }, "message": "e1000e: Reset 82577/82578 PHY before first PHY register read\n\nReset the PHY before first accessing it. Doing so, ensure that the PHY is\nin a known good state before we read/write PHY registers. This fixes a\ndriver probe failure.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "6dfaa76994e5d49a82afb415bbe1362e901b2b95", "tree": "ab1629de17f4d8763343b6d53ee58a674bb7d2e4", "parents": [ "ffb273623bc506d854902a415ef241b79232f93a" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Wed May 05 22:00:06 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 06 01:31:28 2010 -0700" }, "message": "e1000e: reset MAC-PHY interconnect on 82577/82578 during Sx-\u003eS0\n\nDuring Sx-\u003eS0 transitions, the interconnect between the MAC and PHY on\n82577/82578 can remain in SMBus mode instead of transitioning to the\nPCIe-like mode required during normal operation. Toggling the LANPHYPC\nValue bit essentially resets the interconnect forcing it to the correct\nmode.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "eab2abf5826b78b126826cc70e564c44816396da", "tree": "f771389b55090767e8aecdc36f3e80019b3b60bf", "parents": [ "edf15c17420fed108046da50b3d3ae53dfa0e0ae" ], "author": { "name": "Jesse Brandeburg", "email": "jesse.brandeburg@intel.com", "time": "Tue May 04 22:26:03 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 05 21:15:32 2010 -0700" }, "message": "e1000/e1000e: implement a simple interrupt moderation\n\nBack before e1000-7.3.20, the e1000 driver had a simple algorithm that\nmanaged interrupt moderation. The driver was updated in 7.3.20 to\nhave the new \"adaptive\" interrupt moderation but we have customer\nrequests to redeploy the old way as an option. This patch adds the\nold functionality back. The new functionality can be enabled via\nmodule parameter or at runtime via ethtool.\nModule parameter: (InterruptThrottleRate\u003d4) to use this new\nmoderation method.\nEthtool method: ethtool -C ethX rx-usecs 4\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@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": "edf15c17420fed108046da50b3d3ae53dfa0e0ae", "tree": "0fbbcf2ac4affae1dd6d423dcfbcb3ffe2d68552", "parents": [ "f85e4dfac666e41b91e2b77fa563398e9379d5eb" ], "author": { "name": "Alexander Duyck", "email": "alexander.h.duyck@intel.com", "time": "Tue May 04 22:25:42 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 05 21:15:31 2010 -0700" }, "message": "e1000e: increase rx fifo size to 36K on 82574 and 82583\n\nThis change increases the RX fifo size to 36K for standard frames and\ndecreases the TX fifo size to 4K. The reason for this change is that on\nslower systems the RX is much more likely to backfill and need space than\nthe TX is. As long as the TX fifo is twice the size of the MTU we should\nhave more than enough TX fifo.\n\nSigned-off-by: Alexander Duyck \u003calexander.h.duyck@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": "f85e4dfac666e41b91e2b77fa563398e9379d5eb", "tree": "3263c1b452a335dcb048023dde401908fe4eb750", "parents": [ "c72ea83d39efa71bf0e3fc1125e780071a79f1bc" ], "author": { "name": "Tom Herbert", "email": "therbert@google.com", "time": "Wed May 05 14:03:32 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 05 21:11:26 2010 -0700" }, "message": "e1000e: Save irq into netdev structure\n\nSet net-\u003edevirq to pdev-\u003eirq. This should be consistent with other\ndrivers.\n\nSigned-off-by: Tom Herbert \u003ctherbert@google.com\u003e\nAcked-by: Bruce Allan \u003cbruce.w.allan@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": "c72ea83d39efa71bf0e3fc1125e780071a79f1bc", "tree": "6af583a793c7bfb915c80df92d10000e924f29fa", "parents": [ "50849d792b97c546c45a6652a16ba9be7d635c69" ], "author": { "name": "Tom Herbert", "email": "therbert@google.com", "time": "Wed May 05 14:03:11 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 05 21:11:26 2010 -0700" }, "message": "e1000e: Remove unnessary log message\n\nRemove e_info message printed whenever TSO is enabled or disabled.\nThis is not very useful and just clutters dmesg.\n\nSigned-off-by: Tom Herbert \u003ctherbert@google.com\u003e\nAcked-by: Bruce Allan \u003cbruce.w.allan@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": "50849d792b97c546c45a6652a16ba9be7d635c69", "tree": "16f7ec1cb98909e8f9ac7e9c85065cc1c69e236d", "parents": [ "9ed318d546a29d7a591dbe648fd1a2efe3be1180" ], "author": { "name": "Tom Herbert", "email": "therbert@google.com", "time": "Wed May 05 14:02:49 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 05 21:11:25 2010 -0700" }, "message": "e1000e: reduce writes of RX producer ptr\n\nReduce number of writes to RX producer pointer. When alloc\u0027ing RX\nbuffers, only write the RX producer pointer once every\nE1000_RX_BUFFER_WRITE (16) buffers created.\n\nSigned-off-by: Tom Herbert \u003ctherbert@google.com\u003e\nAcked-by: Bruce Allan \u003cbruce.w.allan@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": "9ed318d546a29d7a591dbe648fd1a2efe3be1180", "tree": "adcccd4b9c015d0d81fbce1928c135b269ac1d26", "parents": [ "4447957a825031b3faf3b5bc2013afe35eff492b" ], "author": { "name": "Tom Herbert", "email": "therbert@google.com", "time": "Wed May 05 14:02:27 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 05 21:11:25 2010 -0700" }, "message": "e1000e: save skb counts in TX to avoid cache misses\n\nIn e1000_tx_map, precompute number of segements and bytecounts which\nare derived from fields in skb; these are stored in buffer_info. When\ncleaning tx in e1000_clean_tx_irq use the values in the associated\nbuffer_info for statistics counting, this eliminates cache misses\non skb fields.\n\nSigned-off-by: Tom Herbert \u003ctherbert@google.com\u003e\nAcked-by: Bruce Allan \u003cbruce.w.allan@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": "7ef527377b88ff05fb122a47619ea506c631c914", "tree": "2c2e774527d5f591b975834f43e8c6fd12fb38f2", "parents": [ "47d29646a2c1c147d8a7598aeac2c87dd71ed638", "1183f3838c588545592c042c0ce15015661ce7f2" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 02 21:43:40 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 02 22:02:06 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "0c75ba22541ccea88e89782373991109a7ec2a54", "tree": "8be2c2e802cac669b378f89acfd7617cd45a5ba1", "parents": [ "03f80cc3f24e1dcdbdba081ed5daf5575aac6180" ], "author": { "name": "Anton Blanchard", "email": "anton@samba.org", "time": "Wed Apr 28 21:46:06 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 30 12:51:36 2010 -0700" }, "message": "e1000e: Fix oops caused by ASPM patch.\n\nCommit 6f461f6c7c961f0b1b73c0f27becf472a0ac606b\n(\"e1000e: enable/disable ASPM L0s and L1 and ERT according to hardware errata\")\noopses on one of my ppc64 boxes with a NULL pointer (0x4a):\n\nUnable to handle kernel paging request for data at address 0x0000004a\nFaulting instruction address: 0xc0000000004d2f1c\ncpu 0xe: Vector: 300 (Data Access) at [c000000bec1833a0]\n pc: c0000000004d2f1c: .e1000e_disable_aspm+0xe0/0x150\n lr: c0000000004d2f0c: .e1000e_disable_aspm+0xd0/0x150\n dar: 4a\n\n[c000000bec1836d0] c00000000069b9d8 .e1000_probe+0x84/0xe8c\n[c000000bec1837b0] c000000000386d90 .local_pci_probe+0x4c/0x68\n[c000000bec183840] c0000000003872ac .pci_device_probe+0xfc/0x148\n[c000000bec183900] c000000000409e8c .driver_probe_device+0xe4/0x1d0\n[c000000bec1839a0] c00000000040a024 .__driver_attach+0xac/0xf4\n[c000000bec183a40] c000000000409124 .bus_for_each_dev+0x9c/0x10c\n[c000000bec183b00] c000000000409c1c .driver_attach+0x40/0x60\n[c000000bec183b90] c0000000004085dc .bus_add_driver+0x150/0x328\n[c000000bec183c40] c00000000040a58c .driver_register+0x100/0x1c4\n[c000000bec183cf0] c00000000038764c .__pci_register_driver+0x78/0x128\n\nSeems like pdev-\u003ebus-\u003eself \u003d\u003d NULL. I haven\u0027t touched pci in a long time\nso I\u0027m trying to remember what this means (no pcie bridge perhaps?)\n\nThe patch below fixes the oops for me.\n\nSigned-off-by: Anton Blanchard \u003canton@samba.org\u003e\nReviewed-by: Bruce Allan \u003cbruce.w.allan@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "84f4ee902ad3ee964b7b3a13d5b7cf9c086e9916", "tree": "31b1b420e3ca1da32824840fc6d31d71c2efabdf", "parents": [ "675ad47375c76a7c3be4ace9554d92cd55518ced" ], "author": { "name": "Taku Izumi", "email": "izumi.taku@jp.fujitsu.com", "time": "Tue Apr 27 14:39:08 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 27 17:46:56 2010 -0700" }, "message": "e1000e: add registers etc. printout code just before resetting adapters\n\nThis patch adds registers (,tx/rx rings\u0027 status and so on) printout\ncode just before resetting adapters. This will be helpful for detecting\nthe root cause of adapters reset.\n\nSigned-off-by: Taku Izumi \u003cizumi.taku@jp.fujitsu.com\u003e\nSigned-off-by: Koki Sanagi \u003csanagi.koki@jp.fujitsu.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": "0be3f55f8aa5f9d1882255128bd79d4885b0cbe4", "tree": "a8e5239ba790ec5f2b1b42d638edd20ba4acbd5e", "parents": [ "b16f53bef9be0a756a0672e27d0a526686040e02" ], "author": { "name": "Nick Nunley", "email": "nicholasx.d.nunley@intel.com", "time": "Tue Apr 27 13:09:05 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 27 16:29:50 2010 -0700" }, "message": "e1000e: use DMA API instead of PCI DMA functions\n\nSigned-off-by: Nicholas Nunley \u003cnicholasx.d.nunley@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": "e1703b36c358dde24ececba4fd609ecd91433ba3", "tree": "d59c333d0ad5bf72f165264eba6048c87fdc4e0f", "parents": [ "7ec75c582e639d956ce3afd499f67febe6f902a4", "e95ef5d3f6bc60433883e1ef65dac747acd0bf1a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 27 12:49:13 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 27 12:49:13 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/e100.c\n\tdrivers/net/e1000e/netdev.c\n" }, { "commit": "6f461f6c7c961f0b1b73c0f27becf472a0ac606b", "tree": "ebf91b3e79734386ab63e79fef9d2429b6c81a09", "parents": [ "61fac744dddb22d99c7b12250bc9bada7866df08" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Tue Apr 27 03:33:04 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 27 10:18:26 2010 -0700" }, "message": "e1000e: enable/disable ASPM L0s and L1 and ERT according to hardware errata\n\nPrompted by a previous patch submitted by Matthew Garret \u003cmjg@redhat.com\u003e,\nfurther digging into errata documentation reveals the current enabling or\ndisabling of ASPM L0s and L1 states for certain parts supported by this\ndriver are incorrect. 82571 and 82572 should always disable L1. For\nstandard frames, 82573/82574/82583 can enable L1 but L0s must be disabled,\nand for jumbo frames 82573/82574 must disable L1. This allows for some\nparts to enable L1 in certain configurations leading to better power\nsavings.\n\nAlso according to the same errata, Early Receive (ERT) should be disabled\non 82573 when using jumbo frames.\n\nCc: Matthew Garret \u003cmjg@redhat.com\u003e\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "e743d31312d00932391b123dfac3324d2b9e8c81", "tree": "e5ac3aacbfdde1fe8eb44c4e010085915da5ea05", "parents": [ "b4bf665c5761837f693e87ab27870a5868185ccc" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Apr 14 15:59:40 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 14 16:11:33 2010 -0700" }, "message": "drivers: net: use skb_headlen()\n\nreplaces (skb-\u003elen - skb-\u003edata_len) occurrences by skb_headlen(skb)\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "dad1e54b121d93ed47690d77736af63d3f11d657", "tree": "36fdd29537e43bbb4f36252e010a591ae6fe20bc", "parents": [ "1253332f75f3774cc84d0b7693152656848901f9", "0110d6f22f392f976e84ab49da1b42f85b64a3c5" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 14 05:01:33 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 14 05:01:33 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/pcmcia/smc91c92_cs.c\n\tdrivers/net/virtio_net.c\n" }, { "commit": "dac876193cd79ced36d0462749ea47c05844fb49", "tree": "8b16c5fe80b76ba2fcce7ada953d14269a609980", "parents": [ "d5aa22520dbb49e726420ca56b3dcfe56724d33e" ], "author": { "name": "Terry Loftin", "email": "terry.loftin@hp.com", "time": "Fri Apr 09 10:29:49 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 13 03:03:13 2010 -0700" }, "message": "e1000e: stop cleaning when we reach tx_ring-\u003enext_to_use\n\nTx ring buffers after tx_ring-\u003enext_to_use are volatile and could\nchange, possibly causing a crash. Stop cleaning when we hit\ntx_ring-\u003enext_to_use.\n\nSigned-off-by: Terry Loftin \u003cterry.loftin@hp.com\u003e\nAcked-by: Bruce Allan \u003cbruce.w.allan@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": "6f59d6604d9361ef53a7721fb8aa1687ad6f8448", "tree": "c22cef8d1dece5b39ef074af0998943596895865", "parents": [ "cd58950a5345f006a318f178705b9250aa54425c" ], "author": { "name": "Jesse Brandeburg", "email": "jesse.brandeburg@intel.com", "time": "Fri Apr 09 10:51:09 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 13 02:58:25 2010 -0700" }, "message": "e1000e: use static params to save stack space\n\nused a modified checkstack to get the 56 number\n(normally checkstack wouldn\u0027t show this low a value)\n\ncheckstack before:\n0x0000012f e1000e_check_options [e1000e]: 272\n\nafter:\n0x0000012f e1000e_check_options [e1000e]: 56\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@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": "871039f02f8ec4ab2e5e9010718caa8e085786f1", "tree": "f0d2b3127fc48c862967d68c46c2d46668137515", "parents": [ "e4077e018b5ead3de9951fc01d8bf12eeeeeefed", "4a1032faac94ebbf647460ae3e06fc21146eb280" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 11 14:53:53 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 11 14:53:53 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/stmmac/stmmac_main.c\n\tdrivers/net/wireless/wl12xx/wl1271_cmd.c\n\tdrivers/net/wireless/wl12xx/wl1271_main.c\n\tdrivers/net/wireless/wl12xx/wl1271_spi.c\n\tnet/core/ethtool.c\n\tnet/mac80211/scan.c\n" }, { "commit": "4a35ecf8bf1c4b039503fa554100fe85c761de76", "tree": "9b75f5d5636004d9a9aa496924377379be09aa1f", "parents": [ "b4d562e3c3553ac58c7120555c4e4aefbb090a2a", "fb9e2d887243499b8d28efcf80821c4f6a092395" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 06 23:53:30 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 06 23:53:30 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/bonding/bond_main.c\n\tdrivers/net/via-velocity.c\n\tdrivers/net/wireless/iwlwifi/iwl-agn.c\n" }, { "commit": "22bedad3ce112d5ca1eaf043d4990fa2ed698c87", "tree": "b6fba5688d48b1396f01d13ee53610dea7749c15", "parents": [ "a748ee2426817a95b1f03012d8f339c45c722ae1" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Thu Apr 01 21:22:57 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Apr 03 14:22:15 2010 -0700" }, "message": "net: convert multicast list to list_head\n\nConverts the list and the core manipulating with it to be the same as uc_list.\n\n+uses two functions for adding/removing mc address (normal and \"global\"\n variant) instead of a function parameter.\n+removes dev_mcast.c completely.\n+exposes netdev_hw_addr_list_* macros along with __hw_addr_* functions for\n manipulation with lists on a sandbox (used in bonding and 80211 drivers)\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2c73e1fe94b1962ae5df7618519c18526e9d9072", "tree": "4997c483a1a3c50a3afc92c093324e74a8859a2d", "parents": [ "c041076a9f79a7cf28e808f73cc76f24cbf97093" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Fri Mar 26 20:16:59 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 30 23:02:27 2010 -0700" }, "message": "e1000e: typo corrections\n\nHere are the other miscellaneous corrections\ndone by an earlier larger suggested patch now\nmade unnecessary by a less invasive change.\n\nCorrect a few missing newlines from logging\nmessages and a typo fix. Fix speed/duplex\nlogging message.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5a0e3ad6af8660be21ca98a971cd00f331318c05", "tree": "5bfb7be11a03176a87296a43ac6647975c00a1d1", "parents": [ "ed391f4ebf8f701d3566423ce8f17e614cde9806" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Mar 24 17:04:11 2010 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Mar 30 22:02:32 2010 +0900" }, "message": "include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h\n\npercpu.h is included by sched.h and module.h and thus ends up being\nincluded when building most .c files. percpu.h includes slab.h which\nin turn includes gfp.h making everything defined by the two files\nuniversally available and complicating inclusion dependencies.\n\npercpu.h -\u003e slab.h dependency is about to be removed. Prepare for\nthis change by updating users of gfp and slab facilities include those\nheaders directly instead of assuming availability. As this conversion\nneeds to touch large number of source files, the following script is\nused as the basis of conversion.\n\n http://userweb.kernel.org/~tj/misc/slabh-sweep.py\n\nThe script does the followings.\n\n* Scan files for gfp and slab usages and update includes such that\n only the necessary includes are there. ie. if only gfp is used,\n gfp.h, if slab is used, slab.h.\n\n* When the script inserts a new include, it looks at the include\n blocks and try to put the new include such that its order conforms\n to its surrounding. It\u0027s put in the include block which contains\n core kernel includes, in the same order that the rest are ordered -\n alphabetical, Christmas tree, rev-Xmas-tree or at the end if there\n doesn\u0027t seem to be any matching order.\n\n* If the script can\u0027t find a place to put a new include (mostly\n because the file doesn\u0027t have fitting include block), it prints out\n an error message indicating which .h file needs to be added to the\n file.\n\nThe conversion was done in the following steps.\n\n1. The initial automatic conversion of all .c files updated slightly\n over 4000 files, deleting around 700 includes and adding ~480 gfp.h\n and ~3000 slab.h inclusions. The script emitted errors for ~400\n files.\n\n2. Each error was manually checked. Some didn\u0027t need the inclusion,\n some needed manual addition while adding it to implementation .h or\n embedding .c file was more appropriate for others. This step added\n inclusions to around 150 files.\n\n3. The script was run again and the output was compared to the edits\n from #2 to make sure no file was left behind.\n\n4. Several build tests were done and a couple of problems were fixed.\n e.g. lib/decompress_*.c used malloc/free() wrappers around slab\n APIs requiring slab.h to be added manually.\n\n5. The script was run on all .h files but without automatically\n editing them as sprinkling gfp.h and slab.h inclusions around .h\n files could easily lead to inclusion dependency hell. Most gfp.h\n inclusion directives were ignored as stuff from gfp.h was usually\n wildly available and often used in preprocessor macros. Each\n slab.h inclusion directive was examined and added manually as\n necessary.\n\n6. percpu.h was updated not to include slab.h.\n\n7. Build test were done on the following configurations and failures\n were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my\n distributed build env didn\u0027t work with gcov compiles) and a few\n more options had to be turned off depending on archs to make things\n build (like ipr on powerpc/64 which failed due to missing writeq).\n\n * x86 and x86_64 UP and SMP allmodconfig and a custom test config.\n * powerpc and powerpc64 SMP allmodconfig\n * sparc and sparc64 SMP allmodconfig\n * ia64 SMP allmodconfig\n * s390 SMP allmodconfig\n * alpha SMP allmodconfig\n * um on x86_64 SMP allmodconfig\n\n8. percpu.h modifications were reverted so that it could be applied as\n a separate patch and serve as bisection point.\n\nGiven the fact that I had only a couple of failures from tests on step\n6, I\u0027m fairly confident about the coverage of this conversion patch.\nIf there is a breakage, it\u0027s likely to be something in one of the arch\nheaders which should be easily discoverable easily on most builds of\nthe specific arch.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nGuess-its-ok-by: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Lee Schermerhorn \u003cLee.Schermerhorn@hp.com\u003e\n" }, { "commit": "8544b9f7371ec6a7a5c0f8701ddde9e98f52a37e", "tree": "36c2e615c3cb879602600f3a3e0f6beb37fdb15a", "parents": [ "66aa4a55fe0548c8b13a195c61774db65c5896cd" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Wed Mar 24 12:55:30 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Mar 26 21:05:23 2010 -0700" }, "message": "e1000e: Use pr_\u003clevel\u003e and netdev_\u003clevel\u003e\n\nAs an alternative to a quite large patch previously submitted by Joe\nPerches to make use of kernel logging API, this patch is much less\nintrusive.\n\nConvert e_\u003clevel\u003e to netdev_\u003clevel\u003e\nUse #define pr_fmt\nConvert a few printks to pr_\u003clevel\u003e\n\nCc: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "f49c57e141c7f53353e4265a31dc2324e6215037", "tree": "fb8d0310424a9b54aaa190dc8bc4b0387905d2ae", "parents": [ "a08af745e4c711d22aeadc2adade36958fe03ce8" ], "author": { "name": "Emil Tantilov", "email": "emil.s.tantilov@intel.com", "time": "Wed Mar 24 12:55:02 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Mar 26 21:04:54 2010 -0700" }, "message": "e1000e: do not modify tx_queue_len on link speed change\n\nPreviously the driver tweaked txqueuelen to avoid false Tx hang reports seen at half duplex.\nThis had the effect of overriding user set values on link change/reset. Testing shows that\nadjusting only the timeout factor is sufficient to prevent Tx hang reports at half duplex.\n\nThis patch removes all instances of tx_queue_len in the driver.\n\nOriginally reported and patched by Franco Fichtner\nCC: Franco Fichtner \u003cfranco@lastsummer.de\u003e\nSigned-off-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": "a034016287236f435dbb8f1f57aee906f22b4598", "tree": "f6af0988a34effb8ec94b1a51e44c19d0f26ee23", "parents": [ "e50208a080a8abdfa6c85865362a1cf329e9fe31" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed Mar 17 23:12:24 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 17 23:12:24 2010 -0700" }, "message": "Net / e1000e: Fix build issue introduced by runtime PM patch\n\nThe recent PCI runtime PM patch broke build for CONFIG_PM_RUNTIME\nand CONFIG_PM_SLEEP undefined. Fix that by moving the PM callbacks\nunder suitable #ifdefs.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e50208a080a8abdfa6c85865362a1cf329e9fe31", "tree": "0e02999c4e2eed2f8e37fcd12792a4ade88e2c9c", "parents": [ "fa05e1ad1b61b37fb64a66794c11ab478e975c56" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 16 23:36:24 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 16 23:36:24 2010 -0700" }, "message": "e1000e: Fix build with CONFIG_PM disabled.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "23606cf5d1192c2b17912cb2ef6e62f9b11de133", "tree": "185de39a532ee3ce06f3f083bfcebad48beddbe0", "parents": [ "e175944115db6762d3e98520c709e5a87f933c61" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sun Mar 14 14:35:17 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 16 21:23:35 2010 -0700" }, "message": "e1000e / PCI / PM: Add basic runtime PM support (rev. 4)\n\nUse the PCI runtime power management framework to add basic PCI\nruntime PM support to the e1000e driver. Namely, make the driver\nsuspend the device when the link is off and set it up for generating\na wakeup event after the link has been detected again. [This\nfeature is disabled until the user space enables it with the help of\nthe /sys/devices/.../power/contol device attribute.]\n\nBased on a patch from Matthew Garrett.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d89b218b801fd93ea95880f1c7fde348cbcc51c5", "tree": "cd3c34e1811f9b2bc10ecfb957bf26cbd04c677e", "parents": [ "80a186074e72e2cd61f6716d90cf32ce54981a56", "bec68ff1637ca00bb1585a03a7be8a13380084de" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 13 14:50:18 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 13 14:50:18 2010 -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: (108 commits)\n bridge: ensure to unlock in error path in br_multicast_query().\n drivers/net/tulip/eeprom.c: fix bogus \"(null)\" in tulip init messages\n sky2: Avoid rtnl_unlock without rtnl_lock\n ipv6: Send netlink notification when DAD fails\n drivers/net/tg3.c: change the field used with the TG3_FLAG_10_100_ONLY constant\n ipconfig: Handle devices which take some time to come up.\n mac80211: Fix memory leak in ieee80211_if_write()\n mac80211: Fix (dynamic) power save entry\n ipw2200: use kmalloc for large local variables\n ath5k: read eeprom IQ calibration values correctly for G mode\n ath5k: fix I/Q calibration (for real)\n ath5k: fix TSF reset\n ath5k: use fixed antenna for tx descriptors\n libipw: split ieee-\u003enetworks into small pieces\n mac80211: Fix sta_mtx unlocking on insert STA failure path\n rt2x00: remove KSEG1ADDR define from rt2x00soc.h\n net: add ColdFire support to the smc91x driver\n asix: fix setting mac address for AX88772\n ipv6 ip6_tunnel: eliminate unused recursion field from ip6_tnl{}.\n net: Fix dev_mc_add()\n ...\n" }, { "commit": "318ae2edc3b29216abd8a2510f3f80b764f06858", "tree": "ce595adde342f57f379d277b25e4dd206988a052", "parents": [ "25cf84cf377c0aae5dbcf937ea89bc7893db5176", "3e58974027b04e84f68b964ef368a6cd758e2f84" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Mar 08 16:55:37 2010 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Mar 08 16:55:37 2010 +0100" }, "message": "Merge branch \u0027for-next\u0027 into for-linus\n\nConflicts:\n\tDocumentation/filesystems/proc.txt\n\tarch/arm/mach-u300/include/mach/debug-macro.S\n\tdrivers/net/qlge/qlge_ethtool.c\n\tdrivers/net/qlge/qlge_main.c\n\tdrivers/net/typhoon.c\n" }, { "commit": "a80483d3722b603dae8a52495f8d88a7d4b1bf1c", "tree": "06496263f5f2f7bb75a154f892c0b4f0277f15e9", "parents": [ "5fe88eae26dbd24eed73eb0b681e13981fd486b3" ], "author": { "name": "Jesse Brandeburg", "email": "jesse.brandeburg@intel.com", "time": "Fri Mar 05 02:21:44 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Mar 05 14:00:18 2010 -0800" }, "message": "e1000e: fix packet corruption and tx hang during NFSv2\n\nwhen receiving a particular type of NFS v2 UDP traffic, the hardware could\nDMA some bad data and then hang, possibly corrupting memory.\n\nDisable the NFS parsing in this hardware, verified to fix the bug.\n\nOriginally reported and reproduced by RedHat\u0027s Neil Horman\nCC: nhorman@tuxdriver.com\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nAcked-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3ad2f3fbb961429d2aa627465ae4829758bc7e07", "tree": "f365c513e8f5b477a61336a600ff54f32b7ad6e1", "parents": [ "1537a3638cbf741d3826c1002026cce487a6bee0" ], "author": { "name": "Daniel Mack", "email": "daniel@caiaq.de", "time": "Wed Feb 03 08:01:28 2010 +0800" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue Feb 09 11:13:56 2010 +0100" }, "message": "tree-wide: Assorted spelling fixes\n\nIn particular, several occurances of funny versions of \u0027success\u0027,\n\u0027unknown\u0027, \u0027therefore\u0027, \u0027acknowledge\u0027, \u0027argument\u0027, \u0027achieve\u0027, \u0027address\u0027,\n\u0027beginning\u0027, \u0027desirable\u0027, \u0027separate\u0027 and \u0027necessary\u0027 are fixed.\n\nSigned-off-by: Daniel Mack \u003cdaniel@caiaq.de\u003e\nCc: Joe Perches \u003cjoe@perches.com\u003e\nCc: Junio C Hamano \u003cgitster@pobox.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "7aeef972cce30b0ab04047e07918b04d867e7a29", "tree": "504bf9d83a372d4bf79c7421bf2ff53ae7636cde", "parents": [ "2cc04d27c497af9e8d11181fa8ddef9c99592c78" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Fri Feb 05 02:52:39 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 05 08:58:40 2010 -0800" }, "message": "net: e1000e: convert to use mc helpers\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b405e8df26dfe4c56ab3f88f5cc1dfab0d220289", "tree": "b6a1edf4f519536ad22c69a7d342038315859264", "parents": [ "570930fe1ee497de6aafd895dbe80116cb10525f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 04 22:31:41 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 04 22:31:41 2010 -0800" }, "message": "e1000e: Fix namespace conflicts wrt. e1000_has_link\n\nReported by Stephen Rothwell.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "05ba712d7eb156009753e18e5116cabd869cc6e2", "tree": "1ad850d6889f6b3671a5636653940f20a7d22bdf", "parents": [ "257ddbdad13cd3c4f7d03b85af632c508aa8abc9", "b473946a0853860e13b51c28add5524741117786" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 28 06:12:38 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 28 06:12:38 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "8e1e8a4779cb23c1d9f51e9223795e07ec54d77a", "tree": "e381b1cacfdc3351574d650dc0dbf77ada2e91a4", "parents": [ "8581145f39c39b00cd1b6a2dcb4ce5bf7d8d6070" ], "author": { "name": "Sridhar Samudrala", "email": "sri@us.ibm.com", "time": "Sat Jan 23 02:02:21 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 23 02:02:21 2010 -0800" }, "message": "net: Fix IPv6 GSO type checks in Intel ethernet drivers\n\nFound this problem when testing IPv6 from a KVM guest to a remote\nhost via e1000e device on the host.\nThe following patch fixes the check for IPv6 GSO packet in Intel\nethernet drivers to use skb_is_gso_v6(). SKB_GSO_DODGY is also set\nwhen packets are forwarded from a guest.\n\nSigned-off-by: Sridhar Samudrala \u003csri@us.ibm.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": "9926146b15fd96d78a4f7c32e7a26d50639369f4", "tree": "264806b984ed232d80e6998ce895c6497be952b3", "parents": [ "33d7959a7a9ef36573bfd0cc85ebef29ed4b846d" ], "author": { "name": "Jesse Brandeburg", "email": "jesse.brandeburg@intel.com", "time": "Fri Jan 22 22:56:16 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 23 01:08:53 2010 -0800" }, "message": "e1000/e1000e: don\u0027t use small hardware rx buffers\n\nWhen testing the \"e1000: enhance frame fragment detection\" (and e1000e)\npatches we found some bugs with reducing the MTU size. The 1024 byte\ndescriptor used with the 1000 mtu test also (re) introduced the\n(originally) reported bug, and causes us to need the e1000_clean_tx_irq\n\"enhance frame fragment detection\" fix.\n\nSo what has occured here is that 2.6.32 is only vulnerable for mtu \u003c\n1500 due to the jumbo specific routines in both e1000 and e1000e.\nSo, 2.6.32 needs the 2kB buffer len fix for those smaller MTUs, but\nis not vulnerable to the original issue reported. It has been pointed\nout that this vulnerability needs to be patched in older kernels that\ndon\u0027t have the e1000 jumbo routine. Without the jumbo routines, we\nneed the \"enhance frame fragment detection\" fix the e1000, old\ne1000e is only vulnerable for \u003c 1500 mtu, and needs a similar\nfix. We split the patches up to provide easy backport paths.\n\nThere is only a slight bit of extra code when this fix and the\noriginal \"enhance frame fragment detection\" fixes are applied, so\nplease apply both, even though it is a bit of overkill.\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@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": "51c24aaacaea90c8e87f1dec75a2ac7622b593f8", "tree": "9f54936c87764bef75e97395cb56b7d1e0df24c6", "parents": [ "4276e47e2d1c85a2477caf0d22b91c4f2377fba8", "6be325719b3e54624397e413efd4b33a997e55a3" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 23 00:31:06 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 23 00:31:06 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "b94b50289622e816adc9f94111cfc2679c80177c", "tree": "9545a229c7ef2dbdcdc8300fd4d84ff3cafc7808", "parents": [ "40a14deaf411592b57cb0720f0e8004293ab9865" ], "author": { "name": "Jesse Brandeburg", "email": "jesse.brandeburg@intel.com", "time": "Tue Jan 19 14:15:59 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 20 16:21:23 2010 -0800" }, "message": "e1000e: enhance frame fragment detection\n\nOriginally patched by Neil Horman \u003cnhorman@tuxdriver.com\u003e\n\ne1000e could with a jumbo frame enabled interface, and packet split disabled,\nreceive a packet that would overflow a single rx buffer. While in practice\nvery hard to craft a packet that could abuse this, it is possible.\n\nthis is related to CVE-2009-4538\n\nSigned-off-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nCC: Neil Horman \u003cnhorman@tuxdriver.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": "c1fa347f20f17f14a4a1575727fa24340e8a9117", "tree": "520a4cc063e0f64030ddae6744970c7fcb0785db", "parents": [ "b4ced2b768ab6c580148d1163c82a655fe147edc" ], "author": { "name": "Roel Kluin", "email": "roel.kluin@gmail.com", "time": "Tue Jan 19 14:21:45 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 20 16:21:22 2010 -0800" }, "message": "e1000/e1000e/igb/igbvf/ixgb/ixgbe: Fix tests of unsigned in *_tx_map()\n\nThe variable count and i are unsigned so the (\u003c|\u003e\u003d)0 tests do not work.\n\nSigned-off-by: Roel Kluin \u003croel.kluin@gmail.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": "ab8932f3e8e07df92d6ce3fa41f5af0dda865429", "tree": "adfd802b04591e62b4743790ea8308f24f46d3e4", "parents": [ "f4d2dd4cd4d001f5dc20fc76c780c0c20c000c23" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Wed Jan 13 02:05:38 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 13 20:31:57 2010 -0800" }, "message": "e1000e: genericize the update multicast address list\n\nMake updating the multicast address list generic for all families and\nenforce the requirement to update the entire multicast table array all at\nonce instead of piecemeal which causes problems on some parts.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "f4d2dd4cd4d001f5dc20fc76c780c0c20c000c23", "tree": "c056667e1787a0f9c63d42f7a61924cf98a52eb5", "parents": [ "608f8a0d014db6cd18d4f535934d4b5d556e3013" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Wed Jan 13 02:05:18 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 13 20:31:57 2010 -0800" }, "message": "e1000e: provide MAC-family-specific function to set LAN ID\n\nProvide MAC-specific function pointer to determine the LAN ID (PCI func).\nThe LAN ID is used internally by the driver to determine which h/w lock\nto use to protect accessing the PHY on ESB2 as well as help to determine\nthe alternate MAC address on some parts.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "608f8a0d014db6cd18d4f535934d4b5d556e3013", "tree": "1f3ace492bc08165c81ef7bc06ec7f5222ab1d2d", "parents": [ "0159f24ee764927bf44c1a25473bd4517febd21c" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Wed Jan 13 02:04:58 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 13 20:31:56 2010 -0800" }, "message": "e1000e: use alternate MAC address on ESB2 if available\n\nSimilar to 82571/2/3 parts that already do this, if ESB2/80003es2lan parts\nhave an alternate MAC address provided in the EEPROM use it instead of the\ndefault MAC address. This patch makes the the actual code that does this\ngeneric so that it can be better used by both MAC families.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "baf86c9d36826fab0160251bbc87dfab3af48a21", "tree": "dc12219fe6c866cf5fc689eb303cecb4353fcdfb", "parents": [ "fddaa1aff881c98f524221236af98ce70dcd04cf" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Wed Jan 13 01:53:08 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 13 17:12:46 2010 -0800" }, "message": "e1000e: workaround link issues on busy hub in half duplex on 82577/82578\n\nThis patch removes a delay in hardware after every received packet allowing\nmore time for transmitted packets to go out in between received packets in\nhalf duplex.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "fddaa1aff881c98f524221236af98ce70dcd04cf", "tree": "49f21c354f986851ab3650d4a9d274b1ed34cc8e", "parents": [ "8c47eaa76600cebc4869a42abb4568925ade6c47" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Wed Jan 13 01:52:49 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 13 17:12:46 2010 -0800" }, "message": "e1000e: MDIO slow mode should always be done for 82577\n\nA previous 82577 workaround that set the MDIO access speed to slow mode for\nevery PHY register read/write when the cable is unplugged should instead\nset the access mode to always be slow before any PHY register access.\nSince the mode bit gets cleared when the PHY is reset, set the mode after\nevery PHY reset.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "d4a66e752d0b19934dd208884f8605fe385aaaa9", "tree": "72fb727be1d7636aae9cddfe9aa93ac9dec75daf", "parents": [ "bdbec4b86ee99b020e159f9bd604003a3ae3b0ab", "fa15e99b6bb44aa86b241a43ca8c509e91f80153" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 10 22:55:03 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 10 22:55:03 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/benet/be_cmds.h\n\tinclude/linux/sysctl.h\n" }, { "commit": "b7a9216c5a3205a6d721972bfd012c4eb5950e9c", "tree": "9a33ba2afe538d12c97bd87649a2026230dba756", "parents": [ "ca777f9c098f1ea1c9ec61318cc909d0c8f465e1" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Thu Jan 07 16:32:13 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 08 00:35:31 2010 -0800" }, "message": "e1000e: fix and commonize code for setting the receive address registers\n\nFix e1000e_rar_set() to flush consecutive register writes to avoid write\ncombining which some parts cannot handle. Update e1000e_init_rx_addrs()\nto call the fixed e1000e_rar_set() instead of duplicating code.\n\nAlso change e1000e_rar_set() to _not_ set the Address Valid bit if the MAC\naddress is all zeros.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "ca777f9c098f1ea1c9ec61318cc909d0c8f465e1", "tree": "e6308bf4d3833bc4cfbe707cd83d80e9bedcf688", "parents": [ "f464ba87fe7f346e270239354eb0d38f7a3b3e6b" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Thu Jan 07 16:31:54 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 08 00:35:31 2010 -0800" }, "message": "e1000e: e1000e_enable_tx_pkt_filtering() returns wrong value\n\ne1000e_enable_tx_pkt_filtering() will return a non-zero value if the\ndriver fails to enable the manageability interface on the host for\nany reason; instead it should retun zero to indicate filtering has been\ndisabled. Also provide a single exit point for the function.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "f464ba87fe7f346e270239354eb0d38f7a3b3e6b", "tree": "0772d25c99b76181496ebd496ade3b17d29d507b", "parents": [ "29477e249f5a28444c556bbb816f3af2b6f84412" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Thu Jan 07 16:31:35 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 08 00:35:30 2010 -0800" }, "message": "e1000e: perform 10/100 adaptive IFS only on parts that support it\n\nAdaptive IFS which involves writing to the Adaptive IFS Throttle register\nwas being done for all devices supported by the driver even though it is\nnot supported (i.e. the register doesn\u0027t even exist) on some devices. The\nfeature is supported on 8257x/82583 and ICH/PCH based devices, but not\non ESB2.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "29477e249f5a28444c556bbb816f3af2b6f84412", "tree": "3da39b180e35158166636fca66e6585a85ecb0f9", "parents": [ "28b8f04a5256ca5ec0781b06ee9353c37c650980" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Thu Jan 07 16:31:16 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 08 00:35:30 2010 -0800" }, "message": "e1000e: don\u0027t accumulate PHY statistics on PHY read failure\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "28b8f04a5256ca5ec0781b06ee9353c37c650980", "tree": "4e8479adbbcd20cda5c519327d6040e61d241190", "parents": [ "c651a8c160647b2eb6e61fb485f307e3781415e8" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Thu Jan 07 16:30:56 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 08 00:35:29 2010 -0800" }, "message": "e1000e: call pci_save_state() after pci_restore_state()\n\nDue to a change in pci_restore_state()[1] which clears the saved_state\nflag, the driver should call pci_save_state() to set the flag once again\nto avoid issues with EEH (same fix that recently was submitted for ixgbe).\n\n[1] commmit 4b77b0a2ba27d64f58f16d8d4d48d8319dda36ff\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "a3aa18842a5303fc28fcc4d57dbd16618bd830a0", "tree": "9214348bd1e57ad0a3701314be60adf19dfef702", "parents": [ "108316c1bd0a75ba855ce4a6540c530e1562bfb0" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Thu Jan 07 11:58:11 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 07 23:54:26 2010 -0800" }, "message": "drivers/net/: use DEFINE_PCI_DEVICE_TABLE()\n\nUse DEFINE_PCI_DEVICE_TABLE() so we get place PCI ids table into correct section\nin every case.\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "db94ce90d3d571c11637a912cc39cfb80df3879c", "tree": "516e25fcaf084ace70c3c36cd1e978dd27aba6a4", "parents": [ "afdafff130142ef4d6478dcff6d9e879394fd348" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Fri Dec 18 20:14:59 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 18 20:14:59 2009 -0800" }, "message": "e1000e: LED settings in EEPROM ignored on 82571 and 82572\n\nDo not override the customizable LED configuration set in the EEPROM.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "3421eecdee750bafc78b12ac25b3e980195265eb", "tree": "40df8a228f3971487a3f48bd1e880df1f88d5861", "parents": [ "0781895067444db98050a1537bafbc7a0235ec9f" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Tue Dec 08 07:28:20 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 08 20:10:12 2009 -0800" }, "message": "e1000e: only perform ESB2 MDIC workaround on certain configurations\n\nA workaround added for all ESB2 devices (adds a delay for all MDIC accesses\nwhich resolves an issue with the MDIC ready bit being set prematurely) is\napplicable only to devices in which the MAC-PHY interconnect is not\noperating in a certain mode with in-band MDIO. Check the control register\nfor the operating mode and enable the workaround accordingly.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "0781895067444db98050a1537bafbc7a0235ec9f", "tree": "e308e319eab01bd958f41d5ae997cb871d6fef14", "parents": [ "93a23f48df9c0111283302acd2a4ed2ef1d86453" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Tue Dec 08 07:28:01 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 08 20:10:11 2009 -0800" }, "message": "e1000e: replace incorrect use of GG82563_REG macro\n\nThe GG82563_REG() macro should not be used to determine the offset provided\nto the e1000e_[read|write]_kmrn_reg() functions since the first argument to\nthe macro is already implied and gets masked off anyway in the functions.\nThe resultant register reads/writes with this patch are functionally the\nsame as before.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "93a23f48df9c0111283302acd2a4ed2ef1d86453", "tree": "0003f6b86cc8e17dda316352a472978922ceb3b2", "parents": [ "3dc789320e1b310cb505dcd94512c279abcd5e1c" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Tue Dec 08 07:27:41 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 08 20:10:11 2009 -0800" }, "message": "e1000e: minor correction to name of bit in CTRL_EXT register\n\nBit 7 in the CTRL_REG register is actually the Software Definable Pin 3,\nnot the Software Definable Pin 7.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "8e95a2026f3b43f7c3d676adaccd2de9532e8dcc", "tree": "3733318168cd512480b6db58c5c16d1c8847f0b7", "parents": [ "3454f835837609d60b29a266e3bd9d701073b060" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Thu Dec 03 07:58:21 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 03 13:18:01 2009 -0800" }, "message": "drivers/net: Move \u0026\u0026 and || to end of previous line\n\nOnly files where David Miller is the primary git-signer.\nwireless, wimax, ixgbe, etc are not modified.\n\nCompile tested x86 allyesconfig only\nNot all files compiled (not x86 compatible)\n\nAdded a few \u003e 80 column lines, which I ignored.\nExisting checkpatch complaints ignored.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0be8401051c716be4533272e983b7eed3d83946d", "tree": "930068efd2f9ed4ccf1529382f8c59b850f3294e", "parents": [ "5eb6f3c70fcc0fb19b9087863e6e29f96a76f3bd" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Wed Dec 02 17:03:18 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 02 19:57:17 2009 -0800" }, "message": "e1000e: correct ICH/PCH PHY operations function pointers\n\nSome function pointers for a few PHY operations (for 82578 and 82567) and\nwere set incorrectly causing functions to be executed that were accessing\nincorrect PHY register offsets for that particular device. This patch also\nmoves a few PHY-specific functions from ich8lan.c to the more appropriate\nphy.c.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "5eb6f3c70fcc0fb19b9087863e6e29f96a76f3bd", "tree": "53b19370657a6af448f5b82d2bcef9f4fb79f2c1", "parents": [ "94e5b651595a8eb77665787f7559a6a7c916c195" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Wed Dec 02 17:02:43 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 02 19:57:17 2009 -0800" }, "message": "e1000e: refactor PHY ID detection workaround\n\nThe workaround that detects the correct PHY ID when an initial read of the\nPHY ID registers returns an invalid one should retry up to ten times with\na small delay between attempts using a single PHY address and then repeat\nusing the remaining possible PHY addresses. Do this instead of trying each\npossible PHY address repeating that up to 100 times.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "94e5b651595a8eb77665787f7559a6a7c916c195", "tree": "95ea19611b18619ad72d75d68174e97807bc4f6b", "parents": [ "c81c2d95449cd218c2022ce6014c52fef1eb1f66" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Wed Dec 02 17:02:14 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 02 19:57:16 2009 -0800" }, "message": "e1000e: check_polarity function pointers not set for 8257x\n\nThe function pointers for 8257x devices are not set. This is not really a\nproblem now because there is nothing in the driver that references the\npointers for this particular MAC-family (the appropriate functions are\ncalled directly), but the pointers should be set in case they are used in\nthe future.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "03b1320dfceeb093890cdd7433e910dca6225ddb", "tree": "1cdb866369e0f3f05c7933df72f63dfed552f5ba", "parents": [ "614c12a1581687501f1b0fc721feff69b47abd92" ], "author": { "name": "Alexander Duyck", "email": "alexander.h.duyck@intel.com", "time": "Wed Dec 02 16:45:31 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 02 19:57:10 2009 -0800" }, "message": "e1000e: remove use of skb_dma_map from e1000e driver\n\nIn testing we have found that skb_dma_map/unmap is incompatible with HW\nIOMMU due to the fact that multiple mappings will return different results.\nIn order to correct this we need to remove skb_dma_map/unmap calls from the\ne1000e driver.\n\nSigned-off-by: Alexander Duyck \u003calexander.h.duyck@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": "8528b016d64a7c1c97ba6540ab53a538348d5026", "tree": "34d777a9e8848b07ccd34fc4db0dc44bc831a018", "parents": [ "07f025e6bad7292af3904b8f49cd33e7b5fe3467" ], "author": { "name": "Roel Kluin", "email": "roel.kluin@gmail.com", "time": "Tue Dec 01 15:54:24 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 02 00:35:56 2009 -0800" }, "message": "e1000e: Use sizeof struct rather than pointer in e1000_get_eeprom()\n\nDon\u0027t use the sizeof the pointer to clear the result\n\nSigned-off-by: Roel Kluin \u003croel.kluin@gmail.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": "07f025e6bad7292af3904b8f49cd33e7b5fe3467", "tree": "60623a7d0aa0e4b8d34b5810e822499bbb73445d", "parents": [ "9b71b419a60d200f553658a97c9f49a46f58e8bb" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Tue Dec 01 15:53:48 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 02 00:35:55 2009 -0800" }, "message": "e1000e: PHY type cleanups in e1000e_check_downshift()\n\nRemove the case for 82577 because it does not support the ability to check\nfor downshift. Add case for e1000_phy_bm which can do this.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "9b71b419a60d200f553658a97c9f49a46f58e8bb", "tree": "b51e41f5fb76bc9e5a48d9169d2c21414a737372", "parents": [ "5ff5b664351a94754031c1e5783f0cea6b3000ed" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Tue Dec 01 15:53:07 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 02 00:35:54 2009 -0800" }, "message": "e1000e: add debug messages\n\nAdd some helpful debug messages.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "5ff5b664351a94754031c1e5783f0cea6b3000ed", "tree": "09ff7ddacd94175b78879548179f108c1593efc1", "parents": [ "9e135a2e6266eba276f33c404a2478499bc07ff5" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Tue Dec 01 15:51:11 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 02 00:35:54 2009 -0800" }, "message": "e1000e: comment corrections\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "9e135a2e6266eba276f33c404a2478499bc07ff5", "tree": "84bc6f80f559b2dd2caa78f16ec1fbfd7b9994e5", "parents": [ "1a40d5c170f472d541844cb5b4292efbe02ef89c" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Tue Dec 01 15:50:31 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 02 00:35:53 2009 -0800" }, "message": "e1000e: enable new 82567V-3 device\n\nThis new PCI device ID is for a new combination of MAC and PHY both of\nwhich already have supporting code in the driver, just not yet in this\ncombination. During validation of the device, an intermittent issue was\ndiscovered with waking it from a suspended state which can be resolved with\nthe pre-existing workaround to disable gigabit speed prior to suspending.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "1a40d5c170f472d541844cb5b4292efbe02ef89c", "tree": "33a85e29de0f6563f66387ac32bfeb1e8f4dcdd8", "parents": [ "17f208deb9bf88315aa72c08c866a235c399fb9a" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Tue Dec 01 15:49:51 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 02 00:35:53 2009 -0800" }, "message": "e1000e: ensure the link state is correct for serdes links\n\nThis patch ensures that the link state (as reported in\nmac-\u003eserdes_has_link) will transition to false when autoneg fails to\ncomplete but valid codewords were detected.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "17f208deb9bf88315aa72c08c866a235c399fb9a", "tree": "9cc8bc9ce40587590fcea9d80e134adaf54567b2", "parents": [ "eb656d4552a6c9de5fdcee4a376b171f57b8a4a2" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Tue Dec 01 15:47:22 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 02 00:35:52 2009 -0800" }, "message": "e1000e: provide family-specific PHY power up/down operations\n\nThe different families (80003es2lan, 8257x, ICHx/PCH) supported by the\ndriver each have their own conditions when the PHY can be powered down.\nThis patch rewrites the PHY power up/down code to fit with the family-\nspecific style used in the driver. All pre-existing calls to power up or\ndown the PHY remain untouched. A new call to power down the PHY when\nremoving the driver when the interface is down replaces the current call\nto reset the PHY in order to reduce power consumption.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "eb656d4552a6c9de5fdcee4a376b171f57b8a4a2", "tree": "e9b89b76b3bc1ca1347ce9051b007c16ee8ba81d", "parents": [ "caaddaf83501c79fe11b183c8972e60d8b7d5d56" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Tue Dec 01 15:47:02 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 02 00:35:52 2009 -0800" }, "message": "e1000e: guard against buffer overflow in cable length tables\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "caaddaf83501c79fe11b183c8972e60d8b7d5d56", "tree": "5ddaf752e1a4622e969dea9d3e8ec76ac655f767", "parents": [ "ff9c38bba37937adb909cceb2a6521f2e92e17c6" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Tue Dec 01 15:46:43 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 02 00:35:51 2009 -0800" }, "message": "e1000e: provide family-specific functions to manage VLAN filter arrays\n\nThe two MAC-families that have VLAN filter table register arrays manage\neach a bit differently from one another, so provide family-specific\nfunctions for managing the register arrays and function pointers to access\nthe appropriate function. Also make sure attempts to access these\nregister arrays are not done on parts not supporting that feature.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "9b963e5d0e01461099a40117b05480f24b63381f", "tree": "4756d554e37bf4ab7202f2c564cbe629af98b576", "parents": [ "3b8626ba01a8a745a3fdf22dd347edd708b0af13", "5fdd4baef6195a1f2960e901c8877e2105f832ca" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 29 00:57:15 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 29 00:57:15 2009 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/ieee802154/fakehard.c\n\tdrivers/net/e1000e/ich8lan.c\n\tdrivers/net/e1000e/phy.c\n\tdrivers/net/netxen/netxen_nic_init.c\n\tdrivers/net/wireless/ath/ath9k/main.c\n" }, { "commit": "41cec6f1160c110bd69597c2a5611b46e8287801", "tree": "c7d544f9648e9b758b110b4171e948d3f2c02b95", "parents": [ "a708dd88a014a8fd78713adbd19bc61046eaac7f" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Fri Nov 20 23:28:56 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 21 11:34:32 2009 -0800" }, "message": "e1000e: update Tx Unit hang detection message\n\nThe Tx unit hang detection code in e1000e detects other hangs caused by\nhardware components (e.g. Rx, DMA units), but it is not possible to detect\nexactly which component is hung so it has always assumed a Tx unit hang.\nWhen dumping a message to the system log because of a hang, this patch adds\nmore data to help narrow the cause of the issue and makes the message\nnon-Tx-specific. Because this new code reads PHY registers which can\nsleep, move it off to a workqueue. This and all previously existing work\ntasks in the driver are now cancelled when the driver is removed.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "a708dd88a014a8fd78713adbd19bc61046eaac7f", "tree": "3118d050dd2f7f6a9040fee38e1d4397295cd304", "parents": [ "9b724613c91ce60806ffc689f5032ff258644c6c" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Fri Nov 20 23:28:37 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 21 11:34:30 2009 -0800" }, "message": "e1000e: cosmetic - group local variables of the same type\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "9b724613c91ce60806ffc689f5032ff258644c6c", "tree": "a2e6f4f24eb180b5b0615c2ce0dd9d67446b894a", "parents": [ "de39b7523348640f4c0e662e430c67594d858a08" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Fri Nov 20 23:28:17 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 21 11:34:28 2009 -0800" }, "message": "e1000e: remove redundant might_sleep()\n\nNow that mutex_lock() calls might_sleep() the driver doesn\u0027t have to here.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "de39b7523348640f4c0e662e430c67594d858a08", "tree": "12256a9145acb20ddfb3cd25c545ee80726669b6", "parents": [ "53ec5498d107a61b84944351d32324ce52788b74" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Fri Nov 20 23:27:59 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 21 11:34:25 2009 -0800" }, "message": "e1000e: do not error out on identification LED init failure\n\nA failure to initialize the identification LED is not a fatal condition and\nshould allow the init path to continue.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "53ec5498d107a61b84944351d32324ce52788b74", "tree": "663fdeb193134471c22eaffca76796dcfb70b1d7", "parents": [ "99673d9b5d48c81f2e9fe094c0d9e42815c60b3f" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Fri Nov 20 23:27:40 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 21 11:34:24 2009 -0800" }, "message": "e1000e: set pm_qos DMA latency requirement per interface when needed\n\nIt was pointed out a pm_qos DMA latency requirement set when the driver is\nloaded when parts that support early receive of jumbo frames are probed\ncould have that requirement overidden if another part supported by the\ndriver (one that does not support early receive of jumbo frames) is probed\nlater. Change the DMA latency requirement to be per-interface if needed\ninstead of per driver.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "99673d9b5d48c81f2e9fe094c0d9e42815c60b3f", "tree": "e21e8f5149bb8a08497d97c3f0691dc81dbf2ac3", "parents": [ "3d5e33c9783d3e911e9aef0339663e887044f0df" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Fri Nov 20 23:27:21 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 21 11:34:21 2009 -0800" }, "message": "e1000e: cleanup functions that clear hardware statistics\n\nThe e1000_clear_hw_cntrs_*() functions read the registers to clear them.\nThere is no reason to save the register contents so the temp variable can\nbe removed.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "3d5e33c9783d3e911e9aef0339663e887044f0df", "tree": "804df413d2670523595cdc181fcfeda5290ad30e", "parents": [ "564ea9bba1a1380d5474504bcd943ee84075534f" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Fri Nov 20 23:27:03 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 21 11:34:19 2009 -0800" }, "message": "e1000e: cleanup - shift indentation left by exiting early in e1000_tso\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "564ea9bba1a1380d5474504bcd943ee84075534f", "tree": "8378c606230b63ad403927ba4018fb2eb588efb6", "parents": [ "84efb7b968ab91d0099620865b3f563eb0ddf5a6" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Fri Nov 20 23:26:44 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 21 11:34:18 2009 -0800" }, "message": "e1000e: set bools to true/false instead of 1/0\n\nSet booleans to \u0027true\u0027 or \u0027false\u0027 to make it clear it is a boolean. Also\nchange instances of TRUE/FALSE in comments to lowercase true/false.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "84efb7b968ab91d0099620865b3f563eb0ddf5a6", "tree": "03de89614de2b041320e54cc74727293d1ff0b47", "parents": [ "fe4016746d2c0b3b690f5d1921c826d14008b118" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Fri Nov 20 23:26:24 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 21 11:34:14 2009 -0800" }, "message": "e1000e: provide comment for 82571 workaround\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "fe4016746d2c0b3b690f5d1921c826d14008b118", "tree": "b4d89eb1a532f477e372356f8b792a25d1f4a22b", "parents": [ "c7e54b1bf90480ca4bdfd1491ac6c4b7bfe07c03" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Fri Nov 20 23:26:05 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 21 11:34:13 2009 -0800" }, "message": "e1000e: remove comments regarding a non-existent api module\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "c7e54b1bf90480ca4bdfd1491ac6c4b7bfe07c03", "tree": "bc2360af55c070fc73ec151dc616af53cfa2bd88", "parents": [ "94d8186a693284344ee5cb9734086c7a2370241a" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Fri Nov 20 23:25:45 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 21 11:34:09 2009 -0800" }, "message": "e1000e: update copyright information\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "94d8186a693284344ee5cb9734086c7a2370241a", "tree": "3d6b76940aa7756820207e0eb34cfb44e55926df", "parents": [ "3bb99fe226ead584a4db674dab546689f705201f" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Fri Nov 20 23:25:26 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 21 11:34:08 2009 -0800" }, "message": "e1000e: cleanup ops function pointers\n\nThe phy and nvm operations structures have function pointers that contain\n\"phy\" and \"nvm\" in the pointer names which are redundant since the\nstructures are already obviously in phy and nvm structures.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "3bb99fe226ead584a4db674dab546689f705201f", "tree": "3b49aaef9f4b798b7930a76f62e754eefe0ddb91", "parents": [ "d8014dbca7f5d2d6f0fdb47e5286bd2d887f7065" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Fri Nov 20 23:25:07 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 21 11:34:05 2009 -0800" }, "message": "e1000e: consolidate two dbug macros into one simpler one\n\nThis patch depends on a previous one that cleans up redundant #includes.\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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": "d8014dbca7f5d2d6f0fdb47e5286bd2d887f7065", "tree": "b85811468c0fe292a83a268ead1a10b24a00fc2c", "parents": [ "b16a002e3da0357771433aa58a2521da00aa792a" ], "author": { "name": "Bruce Allan", "email": "bruce.w.allan@intel.com", "time": "Fri Nov 20 23:24:48 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 21 11:34:03 2009 -0800" }, "message": "e1000e: cleanup redundant #include\u0027s\n\nSigned-off-by: Bruce Allan \u003cbruce.w.allan@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" } ], "next": "b16a002e3da0357771433aa58a2521da00aa792a" }