Clean up white space.
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 13 Nov 2011 00:04:49 +0000 (00:04 +0000)
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 13 Nov 2011 00:04:49 +0000 (00:04 +0000)
Note that we don't need to set the FCS length, but might as well do so
anyway.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39816 f5534014-38df-0310-8fa8-9805f1628bb7

wiretap/pcap-common.c

index ac7c05defdfc8e7a8a807a561612a65fa2851ef5..19d6c3f555fa91f618c72fe5752c3df3c05e9349 100644 (file)
@@ -372,12 +372,10 @@ static const struct {
        { 235,          WTAP_ENCAP_DVBCI },
        /* MUX27010 */
        { 236,          WTAP_ENCAP_MUX27010 },
-
-
-  /* netANALYZER pseudo header */
-  { 240,    WTAP_ENCAP_NETANALYZER },
-  /* netANALYZER pseudo header in transparent mode */
-  { 241,    WTAP_ENCAP_NETANALYZER_TRANSPARENT },
+       /* netANALYZER pseudo-header followed by Ethernet with CRC */
+       { 240,          WTAP_ENCAP_NETANALYZER },
+       /* netANALYZER pseudo-header in transparent mode */
+       { 241,          WTAP_ENCAP_NETANALYZER_TRANSPARENT },
 
 
        /*
@@ -1674,8 +1672,13 @@ pcap_read_post_process(int file_type, int wtap_encap,
                break;
 
        case WTAP_ENCAP_NETANALYZER:
-    pseudo_header->eth.fcs_len = 4;
-    break;
+               /*
+                * Not strictly necessary, as the netANALYZER
+                * dissector calls the "Ethernet with FCS"
+                * dissector, but we might as well set it.
+                */
+               pseudo_header->eth.fcs_len = 4;
+               break;
 
        default:
                break;