netisr: Function renaming; no functional changes
authorSepherosa Ziehau <sephe@dragonflybsd.org>
Sun, 28 Apr 2013 06:53:57 +0000 (14:53 +0800)
committerSepherosa Ziehau <sephe@dragonflybsd.org>
Sun, 28 Apr 2013 06:53:57 +0000 (14:53 +0800)
sys/net/ipfw/ip_fw2.c
sys/net/netisr.c
sys/net/netisr.h
sys/netinet/if_ether.c

index eff36e4..63ca9e5 100644 (file)
@@ -2480,7 +2480,7 @@ ipfw_dummynet_io(struct mbuf *m, int pipe_nr, int dir, struct ip_fw_args *fwa)
        pkt->pipe_nr = pipe_nr;
 
        pkt->cpuid = mycpuid;
-       pkt->msgport = cur_netport();
+       pkt->msgport = netisr_curport();
 
        id = &fwa->f_id;
        fid = &pkt->id;
index 0d9a9bf..cdf2701 100644 (file)
@@ -539,7 +539,7 @@ netisr_portfn(int cpu)
  * Return the current cpu's network protocol thread.
  */
 lwkt_port_t
-cur_netport(void)
+netisr_curport(void)
 {
        return(netisr_portfn(mycpu->gd_cpuid));
 }
index 530d9b8..c203a48 100644 (file)
@@ -166,7 +166,7 @@ extern lwkt_port netisr_apanic_rport;
 extern lwkt_port netisr_sync_port;
 
 lwkt_port_t    netisr_portfn(int cpu);
-lwkt_port_t    cur_netport(void);
+lwkt_port_t    netisr_curport(void);
 
 void           netisr_register(int, netisr_fn_t, netisr_cpufn_t);
 void           netisr_register_hashcheck(int, netisr_hashck_t);
@@ -187,8 +187,6 @@ void                netmsg_service_sync(void);
 void           netmsg_sync_handler(netmsg_t);
 void           schednetisr(int);
 
-#define curnetport     cur_netport()
-
 #endif /* _KERNEL */
 
 #endif /* _NET_NETISR_H_ */
index a5ffb43..50ad3cf 100644 (file)
@@ -554,7 +554,7 @@ arpresolve(struct ifnet *ifp, struct rtentry *rt0, struct mbuf *m,
        if (la->la_hold != NULL)
                m_freem(la->la_hold);
        la->la_hold = m;
-       la->la_msgport = cur_netport();
+       la->la_msgport = netisr_curport();
        if (rt->rt_expire || ((rt->rt_flags & RTF_STATIC) && !sdl->sdl_alen)) {
                rt->rt_flags &= ~RTF_REJECT;
                if (la->la_asked == 0 || rt->rt_expire != time_second) {