]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
net/macb: fix the peripheral version test
authorNicolas Ferre <nicolas.ferre@atmel.com>
Tue, 31 Mar 2015 13:02:05 +0000 (15:02 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 6 May 2015 20:03:50 +0000 (22:03 +0200)
commit6181a6b2238de82fed39b0568645ea6a1ff2c6fd
tree8c6d708886482bf5d5eabcfa386a4eeafee1c6eb
parent64b22d90114136c3f66fef541c844bc2deb539c5
net/macb: fix the peripheral version test

commit 361918970b7426bba97a64678ef2b2679c37199b upstream.

We currently need two checks of the peripheral version in MACB_MID register.
One of them got out of sync after modification by 8a013a9c71b2 (net: macb:
Include multi queue support for xilinx ZynqMP ethernet version).
Fix this in macb_configure_caps() so that xilinx ZynqMP will be considered
as a GEM flavor.

Fixes: 8a013a9c71b2 ("net: macb: Include multi queue support for xilinx ZynqMP
ethernet version")

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Punnaiah Choudary Kalluri <punnaia@xilinx.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/ethernet/cadence/macb.c