aboutsummaryrefslogtreecommitdiff
path: root/sys/netinet
diff options
context:
space:
mode:
authorMax Laier <mlaier@FreeBSD.org>2004-03-02 14:37:23 +0000
committerMax Laier <mlaier@FreeBSD.org>2004-03-02 14:37:23 +0000
commit4672d81921785ea484c24e93f3551dffa875d371 (patch)
treedaafcb55037777f58b65ec4798b5bab10b010c09 /sys/netinet
parent6e14763e7dd700db1efc2848598c00b1d3b47f99 (diff)
downloadsrc-4672d81921785ea484c24e93f3551dffa875d371.tar.gz
src-4672d81921785ea484c24e93f3551dffa875d371.zip
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)
Notes
Notes: svn path=/head/; revision=126486
Diffstat (limited to 'sys/netinet')
-rw-r--r--sys/netinet/ip_output.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index abf570f51ab4..a83cfa94f7fb 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) {