rcvif not needed.

4 files changed, 4 insertions, 50 deletions

diff --git a/sys/netinet/ip_ah_new.c b/sys/netinet/ip_ah_new.c
index 08c51acc335..4721cb5fc4b 100644
--- a/sys/netinet/ip_ah_new.c
+++ b/sys/netinet/ip_ah_new.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_ah_new.c,v 1.14 1997/11/24 19:14:12 provos Exp $	*/
+/*	$OpenBSD: ip_ah_new.c,v 1.15 1998/01/21 18:43:32 provos Exp $	*/
 
 /*
  * The author of this code is John Ioannidis, ji@tla.org,
@@ -271,7 +271,6 @@ ah_new_input(struct mbuf *m, struct tdb *tdb)
     struct ah_new_xdata *xd;
     struct ip *ip, ipo;
     struct ah_new *aho, *ah;
-    struct ifnet *rcvif;
     int ohlen, len, count, off, errc;
     u_int32_t btsx;
     struct mbuf *m0;
@@ -289,16 +288,6 @@ ah_new_input(struct mbuf *m, struct tdb *tdb)
 
     ohlen = sizeof(struct ip) + AH_NEW_FLENGTH;
 
-    rcvif = m->m_pkthdr.rcvif;
-    if (rcvif == NULL)
-    {
-#ifdef ENCDEBUG
-	if (encdebug)
-	  printf("ah_new_input(): receive interface is NULL!!!\n");
-#endif /* ENCDEBUG */
-	rcvif = &enc_softc;
-    }
-	
     if (m->m_len < ohlen)
     {
 	if ((m = m_pullup(m, ohlen)) == NULL)
@@ -501,7 +490,6 @@ ah_new_input(struct mbuf *m, struct tdb *tdb)
     m->m_len -= AH_NEW_FLENGTH;
     m->m_data += AH_NEW_FLENGTH;
     m->m_pkthdr.len -= AH_NEW_FLENGTH;
-    m->m_pkthdr.rcvif = rcvif;	/* this should not be necessary */
 
     ip = mtod(m, struct ip *);
     *ip = ipo;
diff --git a/sys/netinet/ip_ah_old.c b/sys/netinet/ip_ah_old.c
index 3df42e315ea..2998d4ba569 100644
--- a/sys/netinet/ip_ah_old.c
+++ b/sys/netinet/ip_ah_old.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_ah_old.c,v 1.10 1997/11/15 00:07:07 deraadt Exp $	*/
+/*	$OpenBSD: ip_ah_old.c,v 1.11 1998/01/21 18:43:33 provos Exp $	*/
 
 /*
  * The author of this code is John Ioannidis, ji@tla.org,
@@ -228,7 +228,6 @@ ah_old_input(struct mbuf *m, struct tdb *tdb)
     struct ah_old_xdata *xd;
     struct ip *ip, ipo;
     struct ah_old *ah, *aho;
-    struct ifnet *rcvif;
     int ohlen, len, count, off, alen;
     struct mbuf *m0;
     union {
@@ -246,16 +245,6 @@ ah_old_input(struct mbuf *m, struct tdb *tdb)
 
     ohlen = sizeof(struct ip) + AH_OLD_FLENGTH + alen;
 
-    rcvif = m->m_pkthdr.rcvif;
-    if (rcvif == NULL)
-    {
-#ifdef ENCDEBUG
-	if (encdebug)
-	  printf("ah_old_input(): receive interface is NULL!\n");
-#endif /* ENCDEBUG */
-	rcvif = &enc_softc;
-    }
-	
     if (m->m_len < ohlen)
     {
 	if ((m = m_pullup(m, ohlen)) == NULL)
@@ -401,7 +390,6 @@ ah_old_input(struct mbuf *m, struct tdb *tdb)
     m->m_len -= (AH_OLD_FLENGTH + alen);
     m->m_data += (AH_OLD_FLENGTH + alen);
     m->m_pkthdr.len -= (AH_OLD_FLENGTH + alen);
-    m->m_pkthdr.rcvif = rcvif;	/* this should not be necessary */
 
     ip = mtod(m, struct ip *);
     *ip = ipo;
diff --git a/sys/netinet/ip_esp_new.c b/sys/netinet/ip_esp_new.c
index 1263df399c7..a7a95de07e9 100644
--- a/sys/netinet/ip_esp_new.c
+++ b/sys/netinet/ip_esp_new.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_esp_new.c,v 1.14 1997/11/24 19:14:14 provos Exp $	*/
+/*	$OpenBSD: ip_esp_new.c,v 1.15 1998/01/21 18:43:33 provos Exp $	*/
 
 /*
  * The author of this code is John Ioannidis, ji@tla.org,
@@ -468,7 +468,6 @@ esp_new_input(struct mbuf *m, struct tdb *tdb)
     struct mbuf *mi, *mo;
     u_char *idat, *odat;
     struct esp_new *esp;
-    struct ifnet *rcvif;
     struct ip *ip, ipo;
     u_int32_t btsx;
     union {
@@ -487,16 +486,6 @@ esp_new_input(struct mbuf *m, struct tdb *tdb)
     else
       alen = 0;
 
-    rcvif = m->m_pkthdr.rcvif;
-    if (rcvif == NULL)
-    {
-#ifdef ENCDEBUG
-	if (encdebug)
-	  printf("esp_new_input(): receive interface is NULL!!!\n");
-#endif /* ENCDEBUG */
-	rcvif = &enc_softc;
-    }
-
     if (m->m_len < sizeof(struct ip))
     {
 	if ((m = m_pullup(m, sizeof(struct ip))) == NULL)
diff --git a/sys/netinet/ip_esp_old.c b/sys/netinet/ip_esp_old.c
index 5df83f3eba6..80e3bb6b8b5 100644
--- a/sys/netinet/ip_esp_old.c
+++ b/sys/netinet/ip_esp_old.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_esp_old.c,v 1.11 1997/11/15 00:07:09 deraadt Exp $	*/
+/*	$OpenBSD: ip_esp_old.c,v 1.12 1998/01/21 18:43:34 provos Exp $	*/
 
 /*
  * The author of this code is John Ioannidis, ji@tla.org,
@@ -298,7 +298,6 @@ esp_old_input(struct mbuf *m, struct tdb *tdb)
     u_char iv[ESP_3DES_IVS], niv[ESP_3DES_IVS], blk[ESP_3DES_BLKS], opts[40];
     u_char *idat, *odat;
     struct esp_old *esp;
-    struct ifnet *rcvif;
     int ohlen, plen, ilen, olen, i, blks;
     struct mbuf *mi, *mo;
 
@@ -306,16 +305,6 @@ esp_old_input(struct mbuf *m, struct tdb *tdb)
 
     blks = xd->edx_xform->blocksize;
 
-    rcvif = m->m_pkthdr.rcvif;
-    if (rcvif == NULL)
-    {
-#ifdef ENCDEBUG
-	if (encdebug)
-	  printf("esp_old_input(): receive interface is NULL!!!\n");
-#endif /* ENCDEBUG */
-	rcvif = &enc_softc;
-    }
-
     if (m->m_len < sizeof(struct ip))
     {
 	if ((m = m_pullup(m, sizeof(struct ip))) == NULL)