[clearview-dev] /export/ws/clearview/clearview-ipobs: fix hg merge errors

[sebastien....@sun.com]

Author:    Sebastien Roy <Sebastien.Roy at Sun.COM>
Changeset: 7659:7f580da7f6bb
Comments:
fix hg merge errors

Files:
usr/src/uts/common/inet/ip.h usr/src/uts/common/inet/ip/ip_netinfo.c