Wed Feb 12 06:41:44 2020 UTC ()

Remove wrong KASSERTs because mutex_owned for a spin lock doesn't check
that a lock is held in the current context.


(yamaguchi)

diff -r1.41 -r1.42 src/sys/dev/pci/if_ixl.c

--- src/sys/dev/pci/if_ixl.c 2020/02/12 06:37:21	1.41
+++ src/sys/dev/pci/if_ixl.c 2020/02/12 06:41:44	1.42

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_ixl.c,v 1.41 2020/02/12 06:37:21 yamaguchi Exp $	*/
+/*	$NetBSD: if_ixl.c,v 1.42 2020/02/12 06:41:44 yamaguchi Exp $	*/
 /*
  * Copyright (c) 2013-2015, Intel Corporation
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
+ *
  *  2. Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
 @@ -3389,29 +3389,26 @@ ixl_rxfill(struct ixl_softc *sc, struct
 	return error;
+}
 static inline int
 ixl_handle_queue_common(struct ixl_softc *sc, struct ixl_queue_pair *qp,
     u_int txlimit, struct evcnt *txevcnt,
     u_int rxlimit, struct evcnt *rxevcnt)
+{
 	struct ixl_tx_ring *txr = qp->qp_txr;
 	struct ixl_rx_ring *rxr = qp->qp_rxr;
 	int txmore, rxmore;
 	int rv;
 	KASSERT(!mutex_owned(&txr->txr_lock));
 	KASSERT(!mutex_owned(&rxr->rxr_lock));
 	mutex_enter(&txr->txr_lock);
 	txevcnt->ev_count++;
 	txmore = ixl_txeof(sc, txr, txlimit);
 	mutex_exit(&txr->txr_lock);
 	mutex_enter(&rxr->rxr_lock);
 	rxevcnt->ev_count++;
 	rxmore = ixl_rxeof(sc, rxr, rxlimit);
 	mutex_exit(&rxr->rxr_lock);
 	rv = txmore | (rxmore << 1);
 	return rv;