Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci/ixgbe Avoid shadowing global `min'.



details:   https://anonhg.NetBSD.org/src/rev/12bcb0dca515
branches:  trunk
changeset: 343472:12bcb0dca515
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sat Feb 06 02:39:18 2016 +0000

description:
Avoid shadowing global `min'.

diffstat:

 sys/dev/pci/ixgbe/ixgbe_api.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (25 lines):

diff -r 07df2f7473ca -r 12bcb0dca515 sys/dev/pci/ixgbe/ixgbe_api.c
--- a/sys/dev/pci/ixgbe/ixgbe_api.c     Sat Feb 06 01:59:55 2016 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_api.c     Sat Feb 06 02:39:18 2016 +0000
@@ -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 @@
  * @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);
 }
 



Home | Main Index | Thread Index | Old Index