Remove the code that manually pads frames to at least 60 bytes;

the ASIX chip supports auto-padding.

2 files changed, 3 insertions, 13 deletions

diff --git a/sys/pci/if_ax.c b/sys/pci/if_ax.c
index 05a556b..34f1e88 100644
--- a/sys/pci/if_ax.c
+++ b/sys/pci/if_ax.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_ax.c,v 1.7 1999/01/16 01:23:56 wpaul Exp $
+ *	$Id: if_ax.c,v 1.8 1999/01/16 20:33:34 wpaul Exp $
  */
 
 /*
@@ -87,7 +87,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_ax.c,v 1.7 1999/01/16 01:23:56 wpaul Exp $";
+	"$Id: if_ax.c,v 1.8 1999/01/16 20:33:34 wpaul Exp $";
 #endif
 
 /*
@@ -1746,15 +1746,6 @@ static int ax_encap(sc, c, m_head)
 		frag = 1;
 	}
 
-
-	if (total_len < AX_MIN_FRAMELEN) {
-		f = &c->ax_ptr->ax_frag[frag];
-		f->ax_ctl = AX_MIN_FRAMELEN - total_len;
-		f->ax_data = vtophys(&sc->ax_cdata.ax_pad);
-		f->ax_status = AX_TXSTAT_OWN;
-		frag++;
-	}
-
 	c->ax_mbuf = m_head;
 	c->ax_lastdesc = frag - 1;
 	AX_TXCTL(c) |= AX_TXCTL_LASTFRAG|AX_TXCTL_FINT;
diff --git a/sys/pci/if_axreg.h b/sys/pci/if_axreg.h
index bb4a874..700c42c 100644
--- a/sys/pci/if_axreg.h
+++ b/sys/pci/if_axreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_axreg.h,v 1.3 1999/01/07 02:59:08 wpaul Exp $
+ *	$Id: if_axreg.h,v 1.4 1999/01/16 20:33:34 wpaul Exp $
  */
 
 /*
@@ -304,7 +304,6 @@ struct ax_chain_onefrag {
 };
 
 struct ax_chain_data {
-	u_int8_t		ax_pad[AX_MIN_FRAMELEN];
 	struct ax_chain_onefrag	ax_rx_chain[AX_RX_LIST_CNT];
 	struct ax_chain		ax_tx_chain[AX_TX_LIST_CNT];