Merge branch 'codecs' from Josh's Mac onto linux machine.

Conflicts:
	src/codecs/ip/cd_frag.cc
	src/codecs/root/cd_eth.cc
	src/codecs/template.cc
	src/protocols/protocol_ids.h

diff --cc src/codecs/root/cd_eth.cc
index 15ef23afd1350220650ce0849cfc7a135416b2cb,c5aa917cf9986f25dca70cc6232d5b5922539f3d..bb2a9252d3e3fec3db0fc1621e2dd67fb6255ad2
--- 1/src/codecs/root/cd_eth.cc
--- 2/src/codecs/root/cd_eth.cc
+++ b/src/codecs/root/cd_eth.cc
@@@ -138,15 -138,15 +138,14 @@@ bool EthCodec::decode(const uint8_t *ra
              );
  
      next_prot_id = ntohs(eh->ether_type);
 -
      if (next_prot_id > eth::MIN_ETHERTYPE )
-     {
          p->proto_bits |= PROTO_BIT__ETH;
-         lyr_len = eth::ETH_HEADER_LEN;
-         return true;
-     }
+     else
+         next_prot_id = ETHERNET_LLC;
  
  
-     return false;
+     lyr_len = eth::ETH_HEADER_LEN;
+     return true;
  }