diff options
| author | Marian Rotariu <marian.rotariu@freescale.com> | 2014-02-27 10:59:55 (GMT) |
|---|---|---|
| committer | Madalin-Cristian Bucur <madalin.bucur@freescale.com> | 2014-02-27 15:17:27 (GMT) |
| commit | d2011ee2376e7a81fe8d5b1896faae56100cb719 (patch) | |
| tree | 66c3f4319ae2f582caf8f8e3cda28ddf189e043d /drivers/net/ethernet/freescale/dpa | |
| parent | d14b8907626c482b8e77b7008f5838b15b02c776 (diff) | |
| download | linux-fsl-qoriq-d2011ee2376e7a81fe8d5b1896faae56100cb719.tar.xz | |
dpaa_eth: fix MAC device capabilities for macless
Right now, the macless probe function will set mac_dev on NULL even if
mac_dev variable was previously initialiazed with a MAC device reference.
The MAC device reference is needed for the new macless capability of having
some control on a proxy initialized MAC device.
This patch removes the undesired mac_dev variable overwrite.
Signed-off-by: Marian Rotariu <marian.rotariu@freescale.com>
Change-Id: Idd1830a464f172ead8a824d7d39bddf9fd66a0b0
Reviewed-on: http://git.am.freescale.net:8181/9227
Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
Reviewed-by: Cristian-Constantin Sovaiala <Cristian.Sovaiala@freescale.com>
Reviewed-by: Madalin-Cristian Bucur <madalin.bucur@freescale.com>
(cherry picked from commit 80854e726ec82d0d5c903de4b284ed387908000d)
Reviewed-on: http://git.am.freescale.net:8181/9259
Tested-by: Madalin-Cristian Bucur <madalin.bucur@freescale.com>
Diffstat (limited to 'drivers/net/ethernet/freescale/dpa')
| -rw-r--r-- | drivers/net/ethernet/freescale/dpa/dpaa_eth_macless.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/freescale/dpa/dpaa_eth_macless.c b/drivers/net/ethernet/freescale/dpa/dpaa_eth_macless.c index 738cb14..705a26f 100644 --- a/drivers/net/ethernet/freescale/dpa/dpaa_eth_macless.c +++ b/drivers/net/ethernet/freescale/dpa/dpaa_eth_macless.c @@ -360,6 +360,7 @@ static int dpaa_eth_macless_probe(struct platform_device *_of_dev) priv->msg_enable = netif_msg_init(debug, -1); priv->peer = NULL; + priv->mac_dev = NULL; if (proxy_dev) { /* This is a temporary solution for the need of * having main driver upstreamability: adjust_link @@ -394,8 +395,6 @@ static int dpaa_eth_macless_probe(struct platform_device *_of_dev) if (err < 0) goto bp_create_failed; - priv->mac_dev = NULL; - priv->channel = dpa_get_channel(); if (priv->channel < 0) { |