3 files changed, 0 insertions, 64 deletions
diff --git a/net/tcptrace/files/patch-tcpdump.c.diff b/net/tcptrace/files/patch-tcpdump.c.diff
deleted file mode 100644
index 6741840aaa4f..000000000000
--- a/net/tcptrace/files/patch-tcpdump.c.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- tcpdump.c.orig	Thu May  5 18:41:30 2005
-+++ tcpdump.c	Thu May  5 18:41:53 2005
-@@ -112,10 +112,13 @@
- 	/* for some reason, the windows version of tcpdump is using */
- 	/* this.  It looks just like ethernet to me */
-       case PCAP_DLT_EN10MB:
--	offset = find_ip_eth(buf); /* Here we check if we are dealing with Straight Ethernet encapsulation or PPPoE */
-+	offset = find_ip_eth(buf); /* Here we check if we are dealing with Straight Ethernet encapsulation, PPPoE or .1q VLAN encapsulation */
- 	memcpy(&eth_header, buf, EH_SIZE); /* save ether header */
- 	switch (offset)
- 	{
-+		case EH_SIZE + ETHER_VLAN_ENCAP_LEN:
-+			memcpy(&eth_header.ether_type, buf+EH_SIZE+2, 2);
-+			/* FALLTHROUGH */
- 		case EH_SIZE: /* straight Ethernet encapsulation */
- 			memcpy((char *)ip_buf,buf+offset,iplen-offset);
- 			callback_plast = ip_buf+iplen-offset-1;
diff --git a/net/tcptrace/files/patch-tcpdump.h.diff b/net/tcptrace/files/patch-tcpdump.h.diff
deleted file mode 100644
index f64859705096..000000000000
--- a/net/tcptrace/files/patch-tcpdump.h.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- tcpdump.h.orig	Thu May  5 18:41:37 2005
-+++ tcpdump.h	Thu May  5 18:41:53 2005
-@@ -179,7 +179,7 @@
- }
- 
- /* This function determine the offset for the IP packet in an Ethernet frame */
--/* We handle two cases : straight Ethernet encapsulation or PPPoE encapsulation */
-+/* We handle three cases : straight Ethernet, PPPoE, or .1q VLAN encapsulation */
- /* Written by Yann Samama (ysamama@nortelnetworks.com) on july 18th, 2003 */
- static int find_ip_eth(char* buf)
- {
-@@ -192,16 +192,19 @@
- 	switch (eth_proto_type)
- 	{
- 		case ETHERTYPE_IPV6: /* it's pure IPv6 over ethernet */
--			offset = 14;
--			break;
-+			/* FALLTHROUGH */
- 		case ETHERTYPE_IP: /* it's pure IPv4 over ethernet */
--			offset = 14;
-+			offset = sizeof(struct ether_header);
- 			break;
- 		case ETHERTYPE_PPPOE_SESSION: /* it's a PPPoE session */
- 			memcpy(&ppp_proto_type, buf+20, 2);
- 			ppp_proto_type = ntohs(ppp_proto_type);
- 			if (ppp_proto_type == 0x0021) /* it's IP over PPPoE */
- 				offset = PPPOE_SIZE;
-+			break;
-+		case ETHERTYPE_VLAN:
-+			offset = sizeof(struct ether_header) +
-+			    ETHER_VLAN_ENCAP_LEN;
- 			break;
- 		default: /* well, this is not an IP packet */
- 			offset = -1;
diff --git a/net/tcptrace/files/patch-tcptrace.h.diff b/net/tcptrace/files/patch-tcptrace.h.diff
deleted file mode 100644
index 8c3a44487abb..000000000000
--- a/net/tcptrace/files/patch-tcptrace.h.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- tcptrace.h.orig	Thu May  5 18:41:47 2005
-+++ tcptrace.h	Thu May  5 18:41:53 2005
-@@ -1182,6 +1182,10 @@
- #define ETHERTYPE_VLAN		0x8100
- #endif	/* 802.1Q Virtual LAN */
- 
-+#ifndef ETHER_VLAN_ENCAP_LEN
-+#define ETHER_VLAN_ENCAP_LEN	4
-+#endif /* 802.1Q tag header length */
-+
- /* support for PPPoE encapsulation added by Yann Samama (ysamama@nortelnetworks.com)*/
- #ifndef ETHERTYPE_PPPOE_SESSION
- #define ETHERTYPE_PPPOE_SESSION	0x8864