Date: Thu, 4 Sep 2008 00:25:12 GMT From: Julian Elischer <julian@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 149170 for review Message-ID: <200809040025.m840PCG9021525@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=149170 Change 149170 by julian@julian_trafmon1 on 2008/09/04 00:24:18 some very small un-needed items Affected files ... .. //depot/projects/vimage-commit2/src/sys/ddb/db_textdump.c#7 edit .. //depot/projects/vimage-commit2/src/sys/dev/firewire/firewire.c#7 edit .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#9 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw.h#12 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw_nat.c#6 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/ddb/db_textdump.c#7 (text+ko) ==== @@ -184,7 +184,6 @@ mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver, uint64_t dumplen, uint32_t blksz) { - INIT_VPROCG(TD_TO_VPROCG(&thread0)); bzero(kdh, sizeof(*kdh)); strncpy(kdh->magic, TEXTDUMPMAGIC, sizeof(kdh->magic)); ==== //depot/projects/vimage-commit2/src/sys/dev/firewire/firewire.c#7 (text+ko) ==== @@ -678,7 +678,6 @@ static void fw_reset_crom(struct firewire_comm *fc) { - INIT_VPROCG(TD_TO_VPROCG(curthread)); /* XXX */ struct crom_src_buf *buf; struct crom_src *src; struct crom_chunk *root; @@ -704,7 +703,7 @@ crom_add_simple_text(src, root, &buf->vendor, "FreeBSD Project"); crom_add_entry(root, CSRKEY_HW, __FreeBSD_version); #endif - crom_add_simple_text(src, root, &buf->hw, V_hostname); + crom_add_simple_text(src, root, &buf->hw, G_hostname); } /* ==== //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#9 (text+ko) ==== @@ -1207,8 +1207,9 @@ * receive window. */ static __inline int -select_rcv_wscale(int space) +select_rcv_wscale(int space, struct socket *so) { + INIT_VNET_INET(so->so_vnet); int wscale = 0; if (space > MAX_RCV_WND) @@ -1315,7 +1316,7 @@ calc_opt0h(struct socket *so, int mtu_idx) { struct tcpcb *tp = so_sototcpcb(so); - int wscale = select_rcv_wscale(tp->rcv_wnd); + int wscale = select_rcv_wscale(tp->rcv_wnd, so); return V_NAGLE((tp->t_flags & TF_NODELAY) == 0) | V_KEEP_ALIVE((so_options_get(so) & SO_KEEPALIVE) != 0) | F_TCAM_BYPASS | ==== //depot/projects/vimage/src/sys/netinet/ip_fw.h#12 (text+ko) ==== @@ -727,6 +727,7 @@ u_int64_t _norule_counter; struct callout _ipfw_timeout; + eventhandler_tag _ifaddr_event_tag; }; #endif ==== //depot/projects/vimage/src/sys/netinet/ip_fw_nat.c#6 (text+ko) ==== @@ -73,10 +73,9 @@ #ifndef VIMAGE extern struct ip_fw_chain V_layer3_chain; +static eventhandler_tag ifaddr_event_tag; #endif -static eventhandler_tag ifaddr_event_tag; - extern ipfw_nat_t *ipfw_nat_ptr; extern ipfw_nat_cfg_t *ipfw_nat_cfg_ptr; extern ipfw_nat_cfg_t *ipfw_nat_del_ptr;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200809040025.m840PCG9021525>