Print this page
11972 resync smatch

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/io/mac/mac.c
          +++ new/usr/src/uts/common/io/mac/mac.c
↓ open down ↓ 4845 lines elided ↑ open up ↑
4846 4846   * The caller need to enter MAC's perimeter by calling mac_perim_enter().
4847 4847   */
4848 4848  static int
4849 4849  mac_group_mov_ring(mac_impl_t *mip, mac_group_t *d_group, mac_ring_t *ring)
4850 4850  {
4851 4851          mac_group_t *s_group = (mac_group_t *)ring->mr_gh;
4852 4852          int rv;
4853 4853  
4854 4854          ASSERT(MAC_PERIM_HELD((mac_handle_t)mip));
4855 4855          ASSERT(d_group != NULL);
4856      -        ASSERT(s_group->mrg_mh == d_group->mrg_mh);
     4856 +        ASSERT(s_group == NULL || s_group->mrg_mh == d_group->mrg_mh);
4857 4857  
4858 4858          if (s_group == d_group)
4859 4859                  return (0);
4860 4860  
4861 4861          /*
4862 4862           * Remove it from current group first.
4863 4863           */
4864 4864          if (s_group != NULL)
4865 4865                  i_mac_group_rem_ring(s_group, ring, B_FALSE);
4866 4866  
↓ open down ↓ 3388 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX