Refine some comments related to DSA on Linux.

diff --git a/pcap-linux.c b/pcap-linux.c
index 54c8553d2c153b449c494f65f65fab8dcccc5325..ab136bc43e2c0a4b5d4c93d253a3929573d73cc6 100644 (file)
--- a/pcap-linux.c
+++ b/pcap-linux.c
@@ -2083,8 +2083,8 @@ static int map_arphrd_to_dlt(pcap_t *handle, int arptype,
                        if (ret == 1) {
                                /*
                                 * This is a DSA master/management network
                        if (ret == 1) {
                                /*
                                 * This is a DSA master/management network

-                                * device linktype is already set by
-                                * iface_dsa_get_proto_info() set an
+                                * device, linktype is already set by
+                                * iface_dsa_get_proto_info(), set an

                                 * appropriate offset here.
                                 */
                                handle->offset = 2;
                                 * appropriate offset here.
                                 */
                                handle->offset = 2;


@@ -5441,15 +5441,15 @@ static struct dsa_proto {
        { "ar9331", DLT_EN10MB },
 
        /*
        { "ar9331", DLT_EN10MB },
 
        /*

-        * Type 2, without an Ethertype at the beginning,
+        * Type 2, without an EtherType at the beginning,

         * assigned a LINKTYPE_/DLT_ value.
         */
        { "brcm", DLT_DSA_TAG_BRCM },
 
        /*
         * assigned a LINKTYPE_/DLT_ value.
         */
        { "brcm", DLT_DSA_TAG_BRCM },
 
        /*

-        * Type 2, with Ethertype 0x8874, assigned to Broadcom.
+        * Type 2, with EtherType 0x8874, assigned to Broadcom.

         *
         *

-        * This doies not require a LINKTYPE_/DLT_ value, it
+        * This does not require a LINKTYPE_/DLT_ value, it

         * just requires that Ethertype 0x8874 be dissected
         * properly.
         */
         * just requires that Ethertype 0x8874 be dissected
         * properly.
         */


@@ -5461,14 +5461,14 @@ static struct dsa_proto {
        { "brcm-prepend", DLT_DSA_TAG_BRCM_PREPEND },
 
        /*
        { "brcm-prepend", DLT_DSA_TAG_BRCM_PREPEND },
 
        /*

-        * Type 2, without an Etherype at he beginning,
+        * Type 2, without an EtherType at the beginning,

         * assigned a LINKTYPE_/DLT_ value.
         */
        { "dsa", DLT_DSA_TAG_DSA },
 
        /*
         * Type 2, with an Ethertype field, but without
         * assigned a LINKTYPE_/DLT_ value.
         */
        { "dsa", DLT_DSA_TAG_DSA },
 
        /*
         * Type 2, with an Ethertype field, but without

-        * an assigned Ethertype value that can be relied
+        * an assigned EtherType value that can be relied

         * on; assigned a LINKTYPE_/DLT_ value.
         */
        { "edsa", DLT_DSA_TAG_EDSA },
         * on; assigned a LINKTYPE_/DLT_ value.
         */
        { "edsa", DLT_DSA_TAG_EDSA },


@@ -5541,7 +5541,7 @@ static struct dsa_proto {
        { "lan937x", DLT_EN10MB },
 
        /*
        { "lan937x", DLT_EN10MB },
 
        /*

-        * Type 2, with Ethertype 0x8100; the VID can be interpreted
+        * Type 2, with EtherType 0x8100; the VID can be interpreted

         * as per
         *
         *    https://elixir.bootlin.com/linux/v6.13.2/source/net/dsa/tag_lan9303.c#L24
         * as per
         *
         *    https://elixir.bootlin.com/linux/v6.13.2/source/net/dsa/tag_lan9303.c#L24


@@ -5552,7 +5552,7 @@ static struct dsa_proto {
        { "lan9303", DLT_EN10MB },
 
        /*
        { "lan9303", DLT_EN10MB },
 
        /*

-        * Type 2, without an Etherype at he beginning,
+        * Type 2, without an EtherType at the beginning,

         * should be assigned a LINKTYPE_/DLT_ value.
         *
         * See
         * should be assigned a LINKTYPE_/DLT_ value.
         *
         * See


@@ -5562,7 +5562,7 @@ static struct dsa_proto {
        { "mtk", DLT_EN10MB },
 
        /*
        { "mtk", DLT_EN10MB },
 
        /*

-        * None is special and indicates that the interface does not have
+        * The string "none" indicates that the interface does not have

         * any tagging protocol configured, and is therefore a standard
         * Ethernet interface.
         */
         * any tagging protocol configured, and is therefore a standard
         * Ethernet interface.
         */


@@ -5587,7 +5587,7 @@ static struct dsa_proto {
        { "seville", DLT_EN10MB },
 
        /*
        { "seville", DLT_EN10MB },
 
        /*

-        * Type 2, with Ethertype 0x8100; the VID can be interpreted
+        * Type 2, with EtherType 0x8100; the VID can be interpreted

         * as per
         *
         *    https://elixir.bootlin.com/linux/v6.13.2/source/net/dsa/tag_8021q.c#L15
         * as per
         *
         *    https://elixir.bootlin.com/linux/v6.13.2/source/net/dsa/tag_8021q.c#L15


@@ -5598,7 +5598,7 @@ static struct dsa_proto {
        { "ocelot-8021q", DLT_EN10MB },
 
        /*
        { "ocelot-8021q", DLT_EN10MB },
 
        /*

-        * Type 2, without an Etherype at he beginning,
+        * Type 2, without an EtherType at the beginning,

         * should be assigned a LINKTYPE_/DLT_ value.
         *
         * See
         * should be assigned a LINKTYPE_/DLT_ value.
         *
         * See


@@ -5608,14 +5608,14 @@ static struct dsa_proto {
        { "qca", DLT_EN10MB },
 
        /*
        { "qca", DLT_EN10MB },
 
        /*

-        * Type 2, with Ethertype 0x8899, assigned to Realtek;
+        * Type 2, with EtherType 0x8899, assigned to Realtek;

         * they use it for several on-the-Ethernet protocols
         * as well, but there are fields that allow the two
         * tag formats, and all the protocols in question,
         * to be distinguiished from one another.
         *
         * they use it for several on-the-Ethernet protocols
         * as well, but there are fields that allow the two
         * tag formats, and all the protocols in question,
         * to be distinguiished from one another.
         *

-        * This doies not require a LINKTYPE_/DLT_ value, it
-        * just requires that Ethertype 0x8899 be dissected
+        * This does not require a LINKTYPE_/DLT_ value, it
+        * just requires that EtherType 0x8899 be dissected

         * properly.
         *
         * See
         * properly.
         *
         * See


@@ -5630,7 +5630,7 @@ static struct dsa_proto {
        { "rtl4a", DLT_EN10MB },
 
        /*
        { "rtl4a", DLT_EN10MB },
 
        /*

-        * Type 2, with Ethertype 0x8899, assigned to Realtek;
+        * Type 2, with EtherType 0x8899, assigned to Realtek;

         * see above.
         */
        { "rtl8_4", DLT_EN10MB },
         * see above.
         */
        { "rtl8_4", DLT_EN10MB },


@@ -5641,7 +5641,7 @@ static struct dsa_proto {
        { "rtl8_4t", DLT_EN10MB },
 
        /*
        { "rtl8_4t", DLT_EN10MB },
 
        /*

-        * Type 2, with Ethertype 0xe001; that's probably
+        * Type 2, with EtherType 0xe001; that's probably

         * self-assigned, so this really should have its
         * own LINKTYPE_/DLT_ value.
         *
         * self-assigned, so this really should have its
         * own LINKTYPE_/DLT_ value.
         *


@@ -5652,7 +5652,7 @@ static struct dsa_proto {
        { "a5psw", DLT_EN10MB },
 
        /*
        { "a5psw", DLT_EN10MB },
 
        /*

-        * Type 2, with Ethertype 0x8100 or the self-assigned
+        * Type 2, with EtherType 0x8100 or the self-assigned

         * 0xdadb, so this really should have its own
         * LINKTYPE_/DLT_ value; that would also allow the
         * VID of the tag to be dissected as per
         * 0xdadb, so this really should have its own
         * LINKTYPE_/DLT_ value; that would also allow the
         * VID of the tag to be dissected as per


@@ -5664,7 +5664,7 @@ static struct dsa_proto {
        /*
         * Type "none of the above", with both a header and trailer,
         * with different transmit and receive tags.  Has
        /*
         * Type "none of the above", with both a header and trailer,
         * with different transmit and receive tags.  Has

-        * Ethertype 0xdadc, which is probably self-assigned.
+        * EtherType 0xdadc, which is probably self-assigned.

         * This should really have its own LINKTYPE_/DLT_ value.
         */
        { "sja1110", DLT_EN10MB },
         * This should really have its own LINKTYPE_/DLT_ value.
         */
        { "sja1110", DLT_EN10MB },


@@ -5679,7 +5679,7 @@ static struct dsa_proto {
        { "trailer", DLT_EN10MB },
 
        /*
        { "trailer", DLT_EN10MB },
 
        /*

-        * Type 2, with Ethertype 0x8100; the VID can be interpreted
+        * Type 2, with EtherType 0x8100; the VID can be interpreted

         * as per
         *
         *    https://elixir.bootlin.com/linux/v6.13.2/source/net/dsa/tag_8021q.c#L15
         * as per
         *
         *    https://elixir.bootlin.com/linux/v6.13.2/source/net/dsa/tag_8021q.c#L15