d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Back out the previous commit which added an M_LRO mbuf flag

Browse Source 
to defeat the mtu check in ether_input.  Mbuf flags are too scarce.
Discussed with: sam
This commit is contained in:
Andrew Gallatin 2007-06-11 18:26:25 +00:00
parent f2114f3bcd
commit 56b8f0b02d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=170565
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/dev/mxge/mxge_lro.c
View File

@ -99,7 +99,6 @@ mxge_lro_flush(mxge_softc_t *mgp, struct lro_entry *lro)
CSUM_IP_VALID | CSUM_DATA_VALID | CSUM_PSEUDO_HDR;
lro->m_head->m_pkthdr.csum_data = 0xffff;
lro->m_head->m_pkthdr.len = lro->len;
lro->m_head->m_flags |= M_LRO;
/* incorporate the latest ack into the tcp header */
tcp = (struct tcphdr *) (ip + 1);

3
sys/net/if_ethersubr.c
View File

@ -542,8 +542,7 @@ ether_input(struct ifnet *ifp, struct mbuf *m)
}
eh = mtod(m, struct ether_header *);
etype = ntohs(eh->ether_type);
if ((m->m_flags & M_LRO) == 0 &&
m->m_pkthdr.len >
if (m->m_pkthdr.len >
ETHER_MAX_FRAME(ifp, etype, m->m_flags & M_HASFCS)) {
if_printf(ifp, "discard oversize frame "
"(ether type %x flags %x len %u > max %lu)\n",

3
sys/sys/mbuf.h
View File

@ -192,7 +192,6 @@ struct mbuf {
#define M_LASTFRAG 0x2000 /* packet is last fragment */
#define M_VLANTAG 0x10000 /* ether_vtag is valid */
#define M_PROMISC 0x20000 /* packet was not for us */
#define M_LRO 0x40000 /* packet is LRO merged and may exceed mtu */
/*
* External buffer types: identify ext_buf type.
@ -215,7 +214,7 @@ struct mbuf {
#define M_COPYFLAGS (M_PKTHDR|M_EOR|M_RDONLY|M_PROTO1|M_PROTO1|M_PROTO2|\
M_PROTO3|M_PROTO4|M_PROTO5|M_SKIP_FIREWALL|\
M_BCAST|M_MCAST|M_FRAG|M_FIRSTFRAG|M_LASTFRAG|\
M_VLANTAG|M_PROMISC|M_LRO)
M_VLANTAG|M_PROMISC)
/*
* Flags to purge when crossing layers.