summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorRabin Vincent <rabin@rab.in>2009-05-02 13:49:36 -0700
committerDavid S. Miller <davem@davemloft.net>2009-05-02 13:49:36 -0700
commit902e5ea15f8471a3213a37b11b98196f3406aeaf (patch)
treecd8538075d504800868fb32c7f5f77fbef1f655c /net
parentd0ab8ff81bf1b01bae7d6b92ca067badbbb02cc9 (diff)
downloadop-kernel-dev-902e5ea15f8471a3213a37b11b98196f3406aeaf.zip
op-kernel-dev-902e5ea15f8471a3213a37b11b98196f3406aeaf.tar.gz
Subject: [PATCH] br2684: restore net_dev initialization
Commit 0ba25ff4c669e5395110ba6ab4958a97a9f96922 ("br2684: convert to net_device_ops") inadvertently deleted the initialization of the net_dev pointer in the br2684_dev structure, leading to crashes. This patch adds it back. Reported-by: Mikko Vinni <mmvinni@yahoo.com> Tested-by: Mikko Vinni <mmvinni@yahoo.com> Signed-off-by: Rabin Vincent <rabin@rab.in> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/atm/br2684.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/atm/br2684.c b/net/atm/br2684.c
index 334fcd4..3100a89 100644
--- a/net/atm/br2684.c
+++ b/net/atm/br2684.c
@@ -549,6 +549,7 @@ static void br2684_setup(struct net_device *netdev)
struct br2684_dev *brdev = BRPRIV(netdev);
ether_setup(netdev);
+ brdev->net_dev = netdev;
netdev->netdev_ops = &br2684_netdev_ops;
OpenPOWER on IntegriCloud