Scapy upgrade to 2.4.0.rc5

- many of the patches fd.io applies in test/patches/2.3.3 are now upstreamed in 2.4
- 2.4 adds support for IGMPv3 which is my main motivation for the upgrade

Change-Id: If2c0a524e3cba320b4a5d8cd07817c6ea2bf0c5a
Signed-off-by: Neale Ranns <nranns@cisco.com>
diff --git a/test/test_gtpu.py b/test/test_gtpu.py
index 9411fff..b0c0a74 100644
--- a/test/test_gtpu.py
+++ b/test/test_gtpu.py
@@ -27,7 +27,7 @@
         return (Ether(src=self.pg0.remote_mac, dst=self.pg0.local_mac) /
                 IP(src=self.pg0.remote_ip4, dst=self.pg0.local_ip4) /
                 UDP(sport=self.dport, dport=self.dport, chksum=0) /
-                GTP_U_Header(TEID=vni, gtp_type=self.gtp_type, length=150) /
+                GTP_U_Header(teid=vni, gtp_type=self.gtp_type, length=150) /
                 pkt)
 
     def encap_mcast(self, pkt, src_ip, src_mac, vni):
@@ -38,7 +38,7 @@
         return (Ether(src=src_mac, dst=self.mcast_mac) /
                 IP(src=src_ip, dst=self.mcast_ip4) /
                 UDP(sport=self.dport, dport=self.dport, chksum=0) /
-                GTP_U_Header(TEID=vni, gtp_type=self.gtp_type, length=150) /
+                GTP_U_Header(teid=vni, gtp_type=self.gtp_type, length=150) /
                 pkt)
 
     def decapsulate(self, pkt):
@@ -68,8 +68,8 @@
         # Verify UDP destination port is GTPU 2152, source UDP port could be
         #  arbitrary.
         self.assertEqual(pkt[UDP].dport, type(self).dport)
-        # Verify TEID
-        self.assertEqual(pkt[GTP_U_Header].TEID, vni)
+        # Verify teid
+        self.assertEqual(pkt[GTP_U_Header].teid, vni)
 
     def test_encap(self):
         """ Encapsulation test