mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-23 11:18:54 +00:00
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)
This commit is contained in:
parent
6e14763e7d
commit
4672d81921
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=126486
@ -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 *);
|
||||
|
@ -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 @@ ip_output(struct mbuf *m, struct mbuf *opt, struct route *ro,
|
||||
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) {
|
||||
|
Loading…
Reference in New Issue
Block a user