Source-Changes-HG archive

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

[src/netbsd-8]: src/sys/dev/pci/ixgbe Pull up following revision(s) (requeste...



details:   https://anonhg.NetBSD.org/src/rev/8a10b3cf7ec1
branches:  netbsd-8
changeset: 434314:8a10b3cf7ec1
user:      snj <snj%NetBSD.org@localhost>
date:      Sat Sep 23 17:47:34 2017 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #288):
        sys/dev/pci/ixgbe/ixv.c: 1.59 and 1.62 via patch
- Use cprng_strong64() instead of cprng_fast64() to prevent panic.
- Set get_link_status to true before calling ixv_config_link() in
  ixv_init_locked() to get the first link status correctly.

diffstat:

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

diffs (31 lines):

diff -r c0c39fed3228 -r 8a10b3cf7ec1 sys/dev/pci/ixgbe/ixv.c
--- a/sys/dev/pci/ixgbe/ixv.c   Sat Sep 23 17:44:58 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixv.c   Sat Sep 23 17:47:34 2017 +0000
@@ -31,7 +31,7 @@
 
 ******************************************************************************/
 /*$FreeBSD: head/sys/dev/ixgbe/if_ixv.c 302384 2016-07-07 03:39:18Z sbruno $*/
-/*$NetBSD: ixv.c,v 1.56 2017/05/26 09:17:32 msaitoh Exp $*/
+/*$NetBSD: ixv.c,v 1.56.2.1 2017/09/23 17:47:34 snj Exp $*/
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -430,7 +430,7 @@
        /* If no mac address was assigned, make a random one */
        if (!ixv_check_ether_addr(hw->mac.addr)) {
                u8 addr[ETHER_ADDR_LEN];
-               uint64_t rndval = cprng_fast64();
+               uint64_t rndval = cprng_strong64();
 
                memcpy(addr, &rndval, sizeof(addr));
                addr[0] &= 0xFE;
@@ -820,8 +820,8 @@
        ixv_init_stats(adapter);
 
        /* Config/Enable Link */
+       hw->mac.get_link_status = TRUE;
        ixv_config_link(adapter);
-       hw->mac.get_link_status = TRUE;
 
        /* Start watchdog */
        callout_reset(&adapter->timer, hz, ixv_local_timer, adapter);



Home | Main Index | Thread Index | Old Index