net/virtio: fix incorrect cast of void *

[dpdk.git] / lib / librte_eal / linuxapp / kni / ethtool / ixgbe / ixgbe_x540.c

diff --git a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_x540.c b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_x540.c
old mode 100755 (executable)
new mode 100644 (file)
index 3583b20..2affe24
--- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_x540.c
+++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_x540.c
@@ -17,7 +17,7 @@
   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
+  the file called "LICENSE.GPL".
 
   Contact Information:
   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
@@ -186,7 +186,14 @@ s32 ixgbe_setup_mac_link_X540(struct ixgbe_hw *hw,
  **/
 s32 ixgbe_reset_hw_X540(struct ixgbe_hw *hw)
 {
-       s32 status;
+       s32 status = 0;
+
+       /*
+        * Userland DPDK takes the ownershiop of device
+        * Kernel driver here used as the simple path for ethtool only
+        * Won't real reset device anyway
+        */
+#if 0
        u32 ctrl, i;
 
        /* Call adapter stop to disable tx/rx and clear interrupts */
@@ -230,6 +237,8 @@ mac_reset_top:
        /* Set the Rx packet buffer size. */
        IXGBE_WRITE_REG(hw, IXGBE_RXPBSIZE(0), 384 << IXGBE_RXPBSIZE_SHIFT);
 
+#endif
+
        /* Store the permanent mac address */
        hw->mac.ops.get_mac_addr(hw, hw->mac.perm_addr);
 
@@ -260,7 +269,7 @@ mac_reset_top:
        hw->mac.ops.get_wwn_prefix(hw, &hw->mac.wwnn_prefix,
                                   &hw->mac.wwpn_prefix);
 
-reset_hw_out:
+//reset_hw_out:
        return status;
 }
 
@@ -926,4 +935,3 @@ s32 ixgbe_blink_led_stop_X540(struct ixgbe_hw *hw, u32 index)
 
        return 0;
 }
-