diff options
Diffstat (limited to 'usr/src/uts/sparc')
| -rw-r--r-- | usr/src/uts/sparc/Makefile.sparc.shared | 2 | ||||
| -rw-r--r-- | usr/src/uts/sparc/arp/Makefile | 6 | ||||
| -rw-r--r-- | usr/src/uts/sparc/arp/arp.global-objs.debug64 | 9 | ||||
| -rw-r--r-- | usr/src/uts/sparc/ip/ip.global-objs.debug64 | 81 | ||||
| -rw-r--r-- | usr/src/uts/sparc/ip/ip.global-objs.obj64 | 76 | ||||
| -rw-r--r-- | usr/src/uts/sparc/ml/modstubs.s | 3 |
6 files changed, 45 insertions, 132 deletions
diff --git a/usr/src/uts/sparc/Makefile.sparc.shared b/usr/src/uts/sparc/Makefile.sparc.shared index 7aa463978d..873557cbd6 100644 --- a/usr/src/uts/sparc/Makefile.sparc.shared +++ b/usr/src/uts/sparc/Makefile.sparc.shared @@ -205,7 +205,7 @@ DRV_KMODS += aggr arp audio bl bofi clone cn conskbd consms cpuid DRV_KMODS += crypto cryptoadm devinfo dump DRV_KMODS += dtrace fasttrap fbt lockstat profile sdt systrace dcpc DRV_KMODS += fssnap icmp icmp6 ip ip6 ipnet ipsecah -DRV_KMODS += ipsecesp iptun iptunq iwscn keysock kmdb kstat ksyms llc1 +DRV_KMODS += ipsecesp iptun iwscn keysock kmdb kstat ksyms llc1 DRV_KMODS += lofi DRV_KMODS += log logindmux kssl mm nca physmem pm poll pool DRV_KMODS += pseudo ptc ptm pts ptsl ramdisk random rsm rts sad diff --git a/usr/src/uts/sparc/arp/Makefile b/usr/src/uts/sparc/arp/Makefile index 21c26c762e..6d1610da66 100644 --- a/usr/src/uts/sparc/arp/Makefile +++ b/usr/src/uts/sparc/arp/Makefile @@ -20,11 +20,9 @@ # # # uts/sparc/arp/Makefile -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" -# # This makefile drives the production of the arp driver kernel module. # # sparc architecture dependent @@ -72,7 +70,7 @@ CFLAGS += $(CCVERBOSE) # # depends on ip # -LDFLAGS += -dy -Ndrv/ip -Ndrv/hook -Nmisc/neti +LDFLAGS += -dy -Ndrv/ip # # For now, disable these lint checks; maintainers should endeavor diff --git a/usr/src/uts/sparc/arp/arp.global-objs.debug64 b/usr/src/uts/sparc/arp/arp.global-objs.debug64 index 7f826ea213..f936276753 100644 --- a/usr/src/uts/sparc/arp/arp.global-objs.debug64 +++ b/usr/src/uts/sparc/arp/arp.global-objs.debug64 @@ -23,15 +23,6 @@ # Use is subject to license terms. # -ar_cmd_tbl -ar_m_tbl -arp_mod_info -arp_no_defense -arpinfo -arprinit -arpwinit -arp_param_arr -arp_netinfo cb_inet_devops fsw inet_dev_info diff --git a/usr/src/uts/sparc/ip/ip.global-objs.debug64 b/usr/src/uts/sparc/ip/ip.global-objs.debug64 index 8df87d813d..07e9aaedde 100644 --- a/usr/src/uts/sparc/ip/ip.global-objs.debug64 +++ b/usr/src/uts/sparc/ip/ip.global-objs.debug64 @@ -23,19 +23,24 @@ # Use is subject to license terms. # +arp_m_tbl +arp_mod_info +arp_netinfo +arp_no_defense +arpinfo cb_inet_devops cl_inet_bind +cl_inet_checkspi cl_inet_connect2 +cl_inet_deletespi cl_inet_disconnect +cl_inet_getspi +cl_inet_idlesa cl_inet_ipident cl_inet_isclusterwide cl_inet_listen cl_inet_unbind cl_inet_unlisten -cl_inet_getspi -cl_inet_checkspi -cl_inet_deletespi -cl_inet_idlesa cl_sctp_assoc_change cl_sctp_check_addrs cl_sctp_connect @@ -43,6 +48,7 @@ cl_sctp_disconnect cl_sctp_listen cl_sctp_unlisten conn_drain_nthreads +dce_cache default_ip6_asp_table do_tcp_fusion do_tcpzcopy @@ -97,74 +103,45 @@ ill_no_arena ill_null inet_dev_info inet_devops -ip6_area_template -ip6_ared_template -ip6_cache_table_size ip6_ftable_hash_size -ip6_ire_max_bucket_cnt -ip6_ire_min_bucket_cnt -ip6_max_cache_table_size ip6opt_ls -ip_ard_template -ip_area_template -ip_ared_template -ip_areq_template -ip_arma_multi_template -ip_aroff_template -ip_aron_template -ip_aru_template -ip_cache_table_size ip_cgtp_filter_rev ip_conn_cache ip_debug ip_g_all_ones -ip_helper_stream_cache ip_helper_stream_info ip_helper_stream_rinit ip_helper_stream_winit ip_ioctl_ftbl -ip_ire_cleanup_cnt -ip_ire_cpu_ratio -ip_ire_max_bucket_cnt -ip_ire_mem_ratio -ip_ire_min_bucket_cnt -ip_loopback_mtu ip_loopback_mtu_v6plus ip_loopback_mtuplus ip_m_tbl -ip_max_cache_table_size ip_max_frag_dups ip_min_frag_prune_time -ip_minor_arena_sa ip_minor_arena_la +ip_minor_arena_sa ip_misc_ioctl_count ip_misc_ioctl_table ip_mod_info ip_modclose_ackwait_ms ip_ndx_ioctl_count ip_ndx_ioctl_table -ip_opt_arr -ip_opt_obj ip_poll_normal_ms ip_poll_normal_ticks ip_rput_pullups ip_six_byte_all_ones ip_squeue_create_callback ip_squeue_enter -ip_squeue_enter_unbound ip_squeue_fanout ip_squeue_flag ip_squeue_worker_wait ip_thread_data ip_thread_list ip_thread_rwlock -ip_use_helper_cache -ip_wput_frag_mdt_min ipcl_bind_fanout_size ipcl_conn_hash_maxsize ipcl_conn_hash_memfactor ipcl_conn_hash_size -ipcl_debug_level ipcl_iptun_fanout_size ipcl_raw_fanout_size ipcl_udp_fanout_size @@ -174,24 +151,16 @@ ipinfov4 ipinfov6 iplrinit iplwinit -ipmp_aract_template -ipmp_ardeact_template ipmp_kstats iprinitv4 iprinitv6 ipsec_action_cache ipsec_hdr_pullup_needed -ipsec_info_cache ipsec_pol_cache ipsec_policy_failure_msgs ipsec_sel_cache ipsec_spd_hashsize ipsec_weird_null_inbound_policy -ipsechw_debug -iptunq_info -iptunq_modinfo -iptunq_rinit -iptunq_winit ipv4_forward_suffix ipv4info ipv6_all_hosts_mcast @@ -199,29 +168,22 @@ ipv6_all_ones ipv6_all_rtrs_mcast ipv6_all_v2rtrs_mcast ipv6_all_zeros -ipv6_areq_template ipv6_forward_suffix ipv6_ll_template ipv6_loopback ipv6_solicited_node_mcast ipv6_unspecified_group ipv6info -ipwinitv4 -ipwinitv6 +ipwinit ire_cache ire_gw_secattr_cache -ire_idle_cutoff_interval ire_null ire_nv_arr ire_nv_tbl -ire_uinfo_null lcl_ndp_arr lcl_param_arr lcl_sctp_param_arr lcl_sctp_wroff_xtra_param -lcl_tcp_mdt_head_param -lcl_tcp_mdt_max_pbufs_param -lcl_tcp_mdt_tail_param lcl_tcp_param_arr lcl_tcp_wroff_xtra_param mask_rnhead @@ -230,6 +192,8 @@ modldrv modlinkage modlstrmod multicast_encap_iphdr +nce_cache +ncec_cache netdev_privs prov_update_handle radix_mask_cache @@ -238,6 +202,7 @@ rawip_conn_cache recvq_call recvq_loop_cnt req_arr +rinit_arp rn_mkfreelist rn_ones rn_zeros @@ -260,19 +225,17 @@ sctp_kmem_faddr_cache sctp_kmem_ftsn_set_cache sctp_kmem_set_cache sctp_mod_info +sctp_opt_arr +sctp_opt_arr_size sctp_recvq_tq_task_max sctp_recvq_tq_task_min sctp_recvq_tq_thr_max sctp_recvq_tq_thr_min sctp_sin6_null -sctp_taskq sctpdebug sctpinfo sctprinit sctpwinit -sendq_collision -sendq_empty -sendq_loop_cnt sin6_null sin_null skip_sctp_cksum @@ -300,12 +263,10 @@ tcp_g_statistics tcp_g_t_info_ack tcp_g_t_info_ack_v6 tcp_icmp_source_quench -tcp_iphc_cache tcp_max_optsize -tcp_mdt_chain -tcp_mdt_smss_threshold tcp_opt_arr tcp_opt_obj +tcp_outbound_squeue_switch tcp_random_anon_port tcp_random_end_ptr tcp_random_fptr @@ -321,13 +282,11 @@ tcp_sock_winit tcp_squeue_flag tcp_squeue_wput tcp_static_maxpsz -tcp_taskq tcp_timercache tcp_tx_pull_len tcp_valid_levels_arr tcp_winfo tcp_winit -tcp_outbound_squeue_switch tcpinfov4 tcpinfov6 tli_errs @@ -352,4 +311,6 @@ udp_valid_levels_arr udp_winit udpinfov4 udpinfov6 -zero_info +winit_arp +eri_cksum_workaround +nxge_cksum_workaround diff --git a/usr/src/uts/sparc/ip/ip.global-objs.obj64 b/usr/src/uts/sparc/ip/ip.global-objs.obj64 index 3df973b8f9..526e907ab5 100644 --- a/usr/src/uts/sparc/ip/ip.global-objs.obj64 +++ b/usr/src/uts/sparc/ip/ip.global-objs.obj64 @@ -23,19 +23,24 @@ # Use is subject to license terms. # +arp_m_tbl +arp_mod_info +arp_netinfo +arp_no_defense +arpinfo cb_inet_devops cl_inet_bind +cl_inet_checkspi cl_inet_connect2 +cl_inet_deletespi cl_inet_disconnect +cl_inet_getspi +cl_inet_idlesa cl_inet_ipident cl_inet_isclusterwide cl_inet_listen cl_inet_unbind cl_inet_unlisten -cl_inet_getspi -cl_inet_checkspi -cl_inet_deletespi -cl_inet_idlesa cl_sctp_assoc_change cl_sctp_check_addrs cl_sctp_connect @@ -43,6 +48,7 @@ cl_sctp_disconnect cl_sctp_listen cl_sctp_unlisten conn_drain_nthreads +dce_cache default_ip6_asp_table do_tcp_fusion do_tcpzcopy @@ -97,69 +103,41 @@ ill_no_arena ill_null inet_dev_info inet_devops -ip6_area_template -ip6_ared_template -ip6_cache_table_size ip6_ftable_hash_size -ip6_ire_max_bucket_cnt -ip6_ire_min_bucket_cnt -ip6_max_cache_table_size ip6opt_ls -ip_ard_template -ip_area_template -ip_ared_template -ip_areq_template -ip_arma_multi_template -ip_aroff_template -ip_aron_template -ip_aru_template -ip_cache_table_size ip_cgtp_filter_rev ip_conn_cache ip_debug ip_g_all_ones -ip_helper_stream_cache ip_helper_stream_info ip_helper_stream_rinit ip_helper_stream_winit ip_ioctl_ftbl -ip_ire_cleanup_cnt -ip_ire_cpu_ratio -ip_ire_max_bucket_cnt -ip_ire_mem_ratio -ip_ire_min_bucket_cnt -ip_loopback_mtu ip_loopback_mtu_v6plus ip_loopback_mtuplus ip_m_tbl -ip_max_cache_table_size ip_max_frag_dups ip_min_frag_prune_time -ip_minor_arena_sa ip_minor_arena_la +ip_minor_arena_sa ip_misc_ioctl_count ip_misc_ioctl_table ip_mod_info ip_modclose_ackwait_ms ip_ndx_ioctl_count ip_ndx_ioctl_table -ip_opt_arr -ip_opt_obj ip_poll_normal_ms ip_poll_normal_ticks ip_rput_pullups ip_six_byte_all_ones ip_squeue_create_callback ip_squeue_enter -ip_squeue_enter_unbound ip_squeue_fanout ip_squeue_flag ip_squeue_worker_wait ip_thread_data ip_thread_list ip_thread_rwlock -ip_use_helper_cache -ip_wput_frag_mdt_min ipcl_bind_fanout_size ipcl_conn_hash_maxsize ipcl_conn_hash_memfactor @@ -173,23 +151,16 @@ ipinfov4 ipinfov6 iplrinit iplwinit -ipmp_aract_template -ipmp_ardeact_template ipmp_kstats iprinitv4 iprinitv6 ipsec_action_cache ipsec_hdr_pullup_needed -ipsec_info_cache ipsec_pol_cache ipsec_policy_failure_msgs ipsec_sel_cache ipsec_spd_hashsize ipsec_weird_null_inbound_policy -iptunq_info -iptunq_modinfo -iptunq_rinit -iptunq_winit ipv4_forward_suffix ipv4info ipv6_all_hosts_mcast @@ -197,29 +168,22 @@ ipv6_all_ones ipv6_all_rtrs_mcast ipv6_all_v2rtrs_mcast ipv6_all_zeros -ipv6_areq_template ipv6_forward_suffix ipv6_ll_template ipv6_loopback ipv6_solicited_node_mcast ipv6_unspecified_group ipv6info -ipwinitv4 -ipwinitv6 +ipwinit ire_cache ire_gw_secattr_cache -ire_idle_cutoff_interval ire_null ire_nv_arr ire_nv_tbl -ire_uinfo_null lcl_ndp_arr lcl_param_arr lcl_sctp_param_arr lcl_sctp_wroff_xtra_param -lcl_tcp_mdt_head_param -lcl_tcp_mdt_max_pbufs_param -lcl_tcp_mdt_tail_param lcl_tcp_param_arr lcl_tcp_wroff_xtra_param mask_rnhead @@ -228,12 +192,15 @@ modldrv modlinkage modlstrmod multicast_encap_iphdr +nce_cache +ncec_cache netdev_privs prov_update_handle radix_mask_cache radix_node_cache rawip_conn_cache req_arr +rinit_arp rn_mkfreelist rn_ones rn_zeros @@ -256,12 +223,13 @@ sctp_kmem_faddr_cache sctp_kmem_ftsn_set_cache sctp_kmem_set_cache sctp_mod_info +sctp_opt_arr +sctp_opt_arr_size sctp_recvq_tq_task_max sctp_recvq_tq_task_min sctp_recvq_tq_thr_max sctp_recvq_tq_thr_min sctp_sin6_null -sctp_taskq sctpdebug sctpinfo sctprinit @@ -292,12 +260,10 @@ tcp_g_statistics tcp_g_t_info_ack tcp_g_t_info_ack_v6 tcp_icmp_source_quench -tcp_iphc_cache tcp_max_optsize -tcp_mdt_chain -tcp_mdt_smss_threshold tcp_opt_arr tcp_opt_obj +tcp_outbound_squeue_switch tcp_random_anon_port tcp_random_end_ptr tcp_random_fptr @@ -313,13 +279,11 @@ tcp_sock_winit tcp_squeue_flag tcp_squeue_wput tcp_static_maxpsz -tcp_taskq tcp_timercache tcp_tx_pull_len tcp_valid_levels_arr tcp_winfo tcp_winit -tcp_outbound_squeue_switch tcpinfov4 tcpinfov6 tli_errs @@ -344,4 +308,6 @@ udp_valid_levels_arr udp_winit udpinfov4 udpinfov6 -zero_info +winit_arp +eri_cksum_workaround +nxge_cksum_workaround diff --git a/usr/src/uts/sparc/ml/modstubs.s b/usr/src/uts/sparc/ml/modstubs.s index 18eba0bdfa..24058b72e4 100644 --- a/usr/src/uts/sparc/ml/modstubs.s +++ b/usr/src/uts/sparc/ml/modstubs.s @@ -397,7 +397,6 @@ stubs_base: MODULE(ipsecah,drv); WSTUB(ipsecah, ipsec_construct_inverse_acquire, nomod_zero); WSTUB(ipsecah, sadb_acquire, nomod_zero); - WSTUB(ipsecah, sadb_ill_download, nomod_zero); WSTUB(ipsecah, ipsecah_algs_changed, nomod_zero); WSTUB(ipsecah, sadb_alg_update, nomod_zero); WSTUB(ipsecah, sadb_unlinkassoc, nomod_zero); @@ -1218,8 +1217,6 @@ stubs_base: STUB(iptun, iptun_create, nomod_einval); STUB(iptun, iptun_delete, nomod_einval); STUB(iptun, iptun_set_policy, nomod_einval); - STUB(iptun, iptun_set_g_q, nomod_einval); - STUB(iptun, iptun_clear_g_q, nomod_void); END_MODULE(iptun); #endif |