Module Name: src
Committed By: riastradh
Date: Sat Feb 6 02:39:18 UTC 2016
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe_api.c
Log Message:
Avoid shadowing global `min'.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/ixgbe/ixgbe_api.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ixgbe/ixgbe_api.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_api.c:1.9 src/sys/dev/pci/ixgbe/ixgbe_api.c:1.10
--- src/sys/dev/pci/ixgbe/ixgbe_api.c:1.9 Thu Aug 13 10:03:38 2015
+++ src/sys/dev/pci/ixgbe/ixgbe_api.c Sat Feb 6 02:39:18 2016
@@ -31,7 +31,7 @@
******************************************************************************/
/*$FreeBSD: head/sys/dev/ixgbe/ixgbe_api.c 251964 2013-06-18 21:28:19Z jfv $*/
-/*$NetBSD: ixgbe_api.c,v 1.9 2015/08/13 10:03:38 msaitoh Exp $*/
+/*$NetBSD: ixgbe_api.c,v 1.10 2016/02/06 02:39:18 riastradh Exp $*/
#include "ixgbe_api.h"
#include "ixgbe_common.h"
@@ -1010,10 +1010,10 @@ s32 ixgbe_fc_enable(struct ixgbe_hw *hw)
* @build: driver build number to be sent to firmware
* @ver: driver version number to be sent to firmware
**/
-s32 ixgbe_set_fw_drv_ver(struct ixgbe_hw *hw, u8 maj, u8 min, u8 build,
+s32 ixgbe_set_fw_drv_ver(struct ixgbe_hw *hw, u8 maj, u8 minr, u8 build,
u8 ver)
{
- return ixgbe_call_func(hw, hw->mac.ops.set_fw_drv_ver, (hw, maj, min,
+ return ixgbe_call_func(hw, hw->mac.ops.set_fw_drv_ver, (hw, maj, minr,
build, ver), IXGBE_NOT_IMPLEMENTED);
}
