Module Name: src Committed By: martin Date: Thu Apr 5 14:31:19 UTC 2018
Modified Files: src/sys/net [netbsd-8]: if_etherip.c src/sys/netinet [netbsd-8]: ip_etherip.c src/sys/netinet6 [netbsd-8]: ip6_etherip.c Log Message: Pull up following revision(s) (requested by maxv in ticket #694): sys/netinet6/ip6_etherip.c: revision 1.22 sys/net/if_etherip.c: revision 1.41 sys/net/if_etherip.c: revision 1.42 sys/netinet/ip_etherip.c: revision 1.21 Don't call if_attach, do if_initialize+if_register, otherwise when an EtherIP packet is received the first KASSERT in if_input() fires. A few fixes: * Style. * Don't add M_PKTHDR manually, that's absolutely forbidden. Add a KASSERT to make sure it's already there. * Add a missing NULL check after m_pullup. To generate a diff of this commit: cvs rdiff -u -r1.38.10.2 -r1.38.10.3 src/sys/net/if_etherip.c cvs rdiff -u -r1.20 -r1.20.8.1 src/sys/netinet/ip_etherip.c cvs rdiff -u -r1.21 -r1.21.8.1 src/sys/netinet6/ip6_etherip.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.