summaryrefslogtreecommitdiff
path: root/drivers/staging/comedi
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-07-07 21:22:58 -0700
committerDavid S. Miller <davem@davemloft.net>2014-07-07 21:22:58 -0700
commit1598c36afdd472560c1111cce473f8f88c747f14 (patch)
treeb9a34b9cb14fba97fab5b8df627f62daf4d96156 /drivers/staging/comedi
parentdbaaca81c34145a452ec7b9caecc0fca3f0710f4 (diff)
parent4e776381e0ea81500129ebaa213048e257d79e69 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says: ==================== Intel Wired LAN Driver Updates 2014-07-02 This series contains updates to i40e and i40evf. Anjali fixes a possible race where we were trying to free the dummy packet buffer in the function that created it, so cleanup the dummy packet buffer in i40e_clean_tx_ring() instead. Also fixes an issue where the filter program routine was not checking if there were descriptors available for programming a filter. Mitch fixes unnecessary delays when sending the admin queue commands by moving a declaration up one level so we do not dereference it out of scope. Fixes an issue with the VF where if the admin queue interrupts get lost for some reason, the VF communication will stall as the VFs have no way of reaching the PF. To alleviate this condition, go ahead and check the ARQ every time we run the service task. Updates i40evf to allow the watchdog to fire vector 0 via software, which makes the driver tolerant of dropped interrupts on that vector. Paul fixes a shifted '1' to be unsigned to avoid shifting a signed integer. Jesse disables TPH by default since it is currently not enabled in the current hardware. Also finishes the i40e implementation of get_settings for ethtool. Catherine adds a new variable (hw.phy.link_info.an_enabled) to track whether auto-negotiation is enabled, along with the functionality to update the variable. Adds the functionality to set the requested flow control mode. Adds i40e implementation of setpauseparam and set_settings to ethtool. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/staging/comedi')
0 files changed, 0 insertions, 0 deletions