]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
r8152: Fix an error on RTL8153-BD MAC Address Passthrough support
authorDavid Chen <david.chen7@dell.com>
Fri, 22 Mar 2019 06:13:58 +0000 (14:13 +0800)
committerKhalid Elmously <khalid.elmously@canonical.com>
Sun, 24 Mar 2019 06:23:00 +0000 (02:23 -0400)
BugLink: https://launchpad.net/bugs/1821276
RTL8153-BD is used in Dell DA300 type-C dongle.
Added RTL8153-BD support to activate MAC address pass through on DA300.
Apply correction on previously submitted patch in net.git tree.

Signed-off-by: David Chen <david.chen7@dell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit c286909fe5458f69e533c845b757fd2c35064d26)
Signed-off-by: Wen-chien Jesse Sung <jesse.sung@canonical.com>
Acked-by: Khalid Elmously <khalid.elmously@canonical.com>
Acked-by: You-Sheng Yang <vicamo.yang@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/net/usb/r8152.c

index cc78e82bc94d1c57aed606a8f8e0ea6b1e1027ea..8db9392d76b938e16bbb748bea238551371a1b64 100644 (file)
@@ -1179,7 +1179,7 @@ static int vendor_mac_passthru_addr_read(struct r8152 *tp, struct sockaddr *sa)
        } else {
                /* test for RTL8153-BND and RTL8153-BD */
                ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_MISC_1);
-               if ((ocp_data & BND_MASK) == 0 && (ocp_data & BD_MASK)) {
+               if ((ocp_data & BND_MASK) == 0 && (ocp_data & BD_MASK) == 0) {
                        netif_dbg(tp, probe, tp->netdev,
                                  "Invalid variant for MAC pass through\n");
                        return -ENODEV;