Print this page
10687 Service routine cast changes need smatch fixes

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/io/softmac/softmac_dev.c
          +++ new/usr/src/uts/common/io/softmac/softmac_dev.c
↓ open down ↓ 15 lines elided ↑ open up ↑
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  /*
  22   22   * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  23   23   * Use is subject to license terms.
  24   24   */
  25   25  
       26 +/*
       27 + * Copyright 2019, Joyent, Inc.
       28 + */
  26   29  
  27   30  #include <sys/types.h>
  28   31  #include <inet/common.h>
  29   32  #include <sys/stropts.h>
  30   33  #include <sys/modctl.h>
  31   34  #include <sys/dld.h>
  32   35  #include <sys/softmac_impl.h>
  33   36  
  34   37  dev_info_t              *softmac_dip = NULL;
  35   38  static kmem_cache_t     *softmac_upper_cachep;
↓ open down ↓ 619 lines elided ↑ open up ↑
 655  658  
 656  659          ASSERT(wq->q_next == NULL);
 657  660  
 658  661          mutex_enter(&sup->su_mutex);
 659  662          if (sup->su_mode != SOFTMAC_FASTPATH) {
 660  663                  /*
 661  664                   * Bump su_tx_inprocess so that su_mode won't change.
 662  665                   */
 663  666                  sup->su_tx_inprocess++;
 664  667                  mutex_exit(&sup->su_mutex);
 665      -                dld_wsrv(wq);
      668 +                (void) dld_wsrv(wq);
 666  669                  mutex_enter(&sup->su_mutex);
 667  670                  if (--sup->su_tx_inprocess == 0)
 668  671                          cv_signal(&sup->su_cv);
 669  672          } else if (sup->su_tx_busy && SOFTMAC_CANPUTNEXT(sup->su_slp->sl_wq)) {
 670  673                  /*
 671  674                   * The flow-conctol of the dedicated-lower-stream is
 672  675                   * relieved. If DLD_CAPAB_DIRECT is enabled, call tx_notify
 673  676                   * callback to relieve the flow-control of the specific client,
 674  677                   * otherwise relieve the flow-control of all the upper-stream
 675  678                   * using the traditional STREAM mechanism.
↓ open down ↓ 17 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX