]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
net: macb: Fix merge error in capabilities in config struct
authorHarini Katakam <harini.katakam@xilinx.com>
Thu, 24 Jan 2019 07:37:10 +0000 (13:07 +0530)
committerMichal Simek <michal.simek@xilinx.com>
Tue, 29 Jan 2019 11:54:48 +0000 (12:54 +0100)
In the zynqmp_config structure caps, there be an | instead of a
terminating ",". Because of this caps after the comma including
WOL are not taking effect, thereby wakeup capability is not being
enabled. Fix the same.

Signed-off-by: Harini Katakam <harini.katakam@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
drivers/net/ethernet/cadence/macb_main.c

index bc4f35177a7e8249276795b5bc1b2e2ce6a03a03..6e547f5fee2d8a37b363d90ea5ab4f73e281513f 100644 (file)
@@ -4087,7 +4087,7 @@ static const struct macb_config np4_config = {
 static const struct macb_config zynqmp_config = {
        .caps = MACB_CAPS_GIGABIT_MODE_AVAILABLE |
                        MACB_CAPS_JUMBO |
-                       MACB_CAPS_GEM_HAS_PTP | MACB_CAPS_BD_RD_PREFETCH,
+                       MACB_CAPS_GEM_HAS_PTP | MACB_CAPS_BD_RD_PREFETCH |
                        MACB_CAPS_PCS |
                MACB_CAPS_PARTIAL_STORE_FORWARD | MACB_CAPS_WOL,
        .dma_burst_length = 16,