From 4672d81921785ea484c24e93f3551dffa875d371 Mon Sep 17 00:00:00 2001 From: Max Laier Date: Tue, 2 Mar 2004 14:37:23 +0000 Subject: [PATCH] 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/net/if_ethersubr.c | 3 --- sys/netinet/ip_output.c | 5 ++--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 8df0cc48223..aced9619d3d 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -607,9 +607,6 @@ ether_demux(struct ifnet *ifp, struct mbuf *m) #endif struct ip_fw *rule = ip_dn_claim_rule(m); - if (rule != NULL) - ifp = m->m_pkthdr.rcvif; - KASSERT(ifp != NULL, ("ether_demux: NULL interface pointer")); eh = mtod(m, struct ether_header *); diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index abf570f51ab..a83cfa94f7f 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) {