Merge pull request #324 from lykkja/geonet_and_calmfast

Geonet and calmfast

diff --combined Makefile.in
index 1903ba76006c8093dccdb6d25d5596b2dc798d32,f805bf684604978c0945eeecdc92d49ec31926a7..85824b901edaaeda8e377ee705cb2610714f20a8
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -76,12 -76,12 +76,12 @@@ CSRC =     addrtoname.c af.c checksum.c cpa
        print-802_11.c print-802_15_4.c print-ap1394.c print-ah.c \
        print-arcnet.c print-aodv.c print-arp.c print-ascii.c print-atalk.c \
        print-atm.c print-beep.c print-bfd.c print-bgp.c \
-       print-bootp.c print-bt.c print-carp.c print-cdp.c print-cfm.c \
+       print-bootp.c print-bt.c print-calm-fast.c print-carp.c print-cdp.c print-cfm.c \
        print-chdlc.c print-cip.c print-cnfp.c print-dccp.c print-decnet.c \
        print-domain.c print-dtp.c print-dvmrp.c print-enc.c print-egp.c \
        print-eap.c print-eigrp.c\
        print-esp.c print-ether.c print-fddi.c print-forces.c print-fr.c \
-       print-gre.c print-hsrp.c print-icmp.c print-igmp.c \
+       print-geonet.c print-gre.c print-hsrp.c print-icmp.c print-igmp.c \
        print-igrp.c print-ip.c print-ipcomp.c print-ipfc.c print-ipnet.c \
        print-ipx.c print-isoclns.c print-juniper.c print-krb.c \
        print-l2tp.c print-lane.c print-ldp.c print-lldp.c print-llc.c \
@@@ -167,7 -167,7 +167,7 @@@ HDR = 
        nlpid.h \
        ntp.h \
        oakley.h \
 -      openflow-1.0.h \
 +      openflow.h \
        ospf.h \
        ospf6.h \
        oui.h \