From a32329ae33708bef4a7f935763e39fac7a6930e3 Mon Sep 17 00:00:00 2001 From: mlaier Date: Tue, 2 Mar 2004 14:37:23 +0000 Subject: Two minor follow-ups on the MT_TAG removal: ifp is now passed explicitly to ether_demux; no need to look it up again. Make mtag a global var in ip_input. Noticed by: rwatson Approved by: bms(mentor) --- sys/netinet/ip_output.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'sys/netinet') diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index abf570f..a83cfa9 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -144,12 +144,11 @@ ip_output(struct mbuf *m, struct mbuf *opt, struct route *ro, int isbroadcast, sw_csum; struct in_addr pkt_dst; struct route iproute; - struct m_tag *dummytag; + struct m_tag *mtag, *dummytag; #ifdef IPSEC struct secpolicy *sp = NULL; #endif #ifdef FAST_IPSEC - struct m_tag *mtag; struct secpolicy *sp = NULL; struct tdb_ident *tdbi; int s; @@ -884,7 +883,7 @@ spd_done: break; } if (ia) { /* tell ip_input "dont filter" */ - struct m_tag *mtag = m_tag_get( + mtag = m_tag_get( PACKET_TAG_IPFORWARD, sizeof(struct sockaddr_in *), M_NOWAIT); if (mtag == NULL) { -- cgit v1.1