Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

[firefly-linux-kernel-4.4.55.git] / net / core / ethtool.c

diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 1a7db92037faef12e2671ad8eeecca241cd4c1eb..a0f4964033d289b8d1b4959d4d1196ccc094bdff 100644 (file)
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -522,7 +522,7 @@ static int ethtool_get_rx_ntuple(struct net_device *dev, void __user *useraddr)
                        p += ETH_GSTRING_LEN;
                        num_strings++;
                        goto unknown_filter;
-               };
+               }
 
                /* now the rest of the filters */
                switch (fsc->fs.flow_type) {
@@ -646,7 +646,7 @@ static int ethtool_get_rx_ntuple(struct net_device *dev, void __user *useraddr)
                        p += ETH_GSTRING_LEN;
                        num_strings++;
                        break;
-               };
+               }
                sprintf(p, "\tVLAN: %d, mask: 0x%x\n",
                        fsc->fs.vlan_tag, fsc->fs.vlan_tag_mask);
                p += ETH_GSTRING_LEN;