Author: sephe
Date: Mon Nov 28 06:10:41 2016
New Revision: 309231
URL: https://svnweb.freebsd.org/changeset/base/309231

Log:
  hyperv/hn: Fix vmbus_chan_subidx usage.
  
  MFC after:    1 week
  Sponsored by: Microsoft
  Differential Revision:        https://reviews.freebsd.org/D8629

Modified:
  head/sys/dev/hyperv/netvsc/if_hn.c

Modified: head/sys/dev/hyperv/netvsc/if_hn.c
==============================================================================
--- head/sys/dev/hyperv/netvsc/if_hn.c  Mon Nov 28 05:54:20 2016        
(r309230)
+++ head/sys/dev/hyperv/netvsc/if_hn.c  Mon Nov 28 06:10:41 2016        
(r309231)
@@ -1524,7 +1524,7 @@ hn_txpkt_done(struct hn_nvs_sendctx *snd
        txr = txd->txr;
        KASSERT(txr->hn_chan == chan,
            ("channel mismatch, on chan%u, should be chan%u",
-            vmbus_chan_subidx(chan), vmbus_chan_subidx(txr->hn_chan)));
+            vmbus_chan_id(chan), vmbus_chan_id(txr->hn_chan)));
 
        txr->hn_has_txeof = 1;
        hn_txdesc_put(txr, txd);
@@ -4262,13 +4262,12 @@ hn_chan_detach(struct hn_softc *sc, stru
         */
        error = vmbus_chan_close_direct(chan);
        if (error == EISCONN) {
-               if_printf(sc->hn_ifp, "chan%u subidx%u "
-                   "bufring is connected after being closed\n",
-                   vmbus_chan_id(chan), vmbus_chan_subidx(chan));
+               if_printf(sc->hn_ifp, "chan%u bufring is connected "
+                   "after being closed\n", vmbus_chan_id(chan));
                rxr->hn_rx_flags |= HN_RX_FLAG_BR_REF;
        } else if (error) {
-               if_printf(sc->hn_ifp, "chan%u subidx%u close failed: %d\n",
-                   vmbus_chan_id(chan), vmbus_chan_subidx(chan), error);
+               if_printf(sc->hn_ifp, "chan%u close failed: %d\n",
+                   vmbus_chan_id(chan), error);
        }
 }
 
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to