From b94e582d4ef509238543cc238d67c262897f2e15 Mon Sep 17 00:00:00 2001 From: David Daney Date: Tue, 21 Aug 2012 11:45:09 -0700 Subject: [PATCH] --- yaml --- r: 332219 b: refs/heads/master c: 052958e347a0219313730ee7c437edfab0611ec1 h: refs/heads/master i: 332217: 780c2184dbbd835b594aa9d486ae2a33038da166 332215: a6a99acaab16e41a936d04e97854b1f394a70437 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/octeon/octeon_mgmt.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3e7dc1d32c18..27132cb3c1ba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f21105df0f999f468f1f03e1ff53fe055e149341 +refs/heads/master: 052958e347a0219313730ee7c437edfab0611ec1 diff --git a/trunk/drivers/net/ethernet/octeon/octeon_mgmt.c b/trunk/drivers/net/ethernet/octeon/octeon_mgmt.c index cf06cf23935e..3bae01f4669b 100644 --- a/trunk/drivers/net/ethernet/octeon/octeon_mgmt.c +++ b/trunk/drivers/net/ethernet/octeon/octeon_mgmt.c @@ -1446,6 +1446,8 @@ static int __devinit octeon_mgmt_probe(struct platform_device *pdev) if (netdev == NULL) return -ENOMEM; + SET_NETDEV_DEV(netdev, &pdev->dev); + dev_set_drvdata(&pdev->dev, netdev); p = netdev_priv(netdev); netif_napi_add(netdev, &p->napi, octeon_mgmt_napi_poll,