Skip to content

Commit

Permalink
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/gi…
Browse files Browse the repository at this point in the history
…t/jkirsher/net

Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates

This series contains updates to igb and i40e.

Todd provides a fix for 82580 devices in igb, where the ethtool
loopback test was missing 82580 copper devices.

Jesse provides five fixes/cleanups to i40e based on feedback from
Joe Perches and the community.

v2: fixed up patch 5 in the series based on feedback from Joe Perches
    and David Miller
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Sep 27, 2013
2 parents f875691 + d7595a2 commit 89f077a
Show file tree
Hide file tree
Showing 4 changed files with 89 additions and 85 deletions.
7 changes: 3 additions & 4 deletions drivers/net/ethernet/intel/i40e/i40e_adminq.c
Original file line number Diff line number Diff line change
Expand Up @@ -701,8 +701,7 @@ i40e_status i40e_asq_send_command(struct i40e_hw *hw,

details = I40E_ADMINQ_DETAILS(hw->aq.asq, hw->aq.asq.next_to_use);
if (cmd_details) {
memcpy(details, cmd_details,
sizeof(struct i40e_asq_cmd_details));
*details = *cmd_details;

/* If the cmd_details are defined copy the cookie. The
* cpu_to_le32 is not needed here because the data is ignored
Expand Down Expand Up @@ -760,7 +759,7 @@ i40e_status i40e_asq_send_command(struct i40e_hw *hw,
desc_on_ring = I40E_ADMINQ_DESC(hw->aq.asq, hw->aq.asq.next_to_use);

/* if the desc is available copy the temp desc to the right place */
memcpy(desc_on_ring, desc, sizeof(struct i40e_aq_desc));
*desc_on_ring = *desc;

/* if buff is not NULL assume indirect command */
if (buff != NULL) {
Expand Down Expand Up @@ -807,7 +806,7 @@ i40e_status i40e_asq_send_command(struct i40e_hw *hw,

/* if ready, copy the desc back to temp */
if (i40e_asq_done(hw)) {
memcpy(desc, desc_on_ring, sizeof(struct i40e_aq_desc));
*desc = *desc_on_ring;
if (buff != NULL)
memcpy(buff, dma_buff->va, buff_size);
retval = le16_to_cpu(desc->retval);
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/intel/i40e/i40e_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ i40e_status i40e_aq_get_link_info(struct i40e_hw *hw,

/* save link status information */
if (link)
memcpy(link, hw_link_info, sizeof(struct i40e_link_status));
*link = *hw_link_info;

/* flag cleared so helper functions don't call AQ again */
hw->phy.get_link_info = false;
Expand Down
Loading

0 comments on commit 89f077a

Please sign in to comment.