From 27b5c670c164cc3c123208cbc2a29727f14bfd88 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Tue, 6 Jan 2009 10:42:24 -0800
Subject: [PATCH] --- yaml --- r: 127765 b: refs/heads/master c:
 148bc4303f9ba972cbfe5d30dfec93ec0d8ff1e1 h: refs/heads/master i:   127763:
 9bd9770022b16977f369e4a714ac9920dba0b2e8 v: v3

---
 [refs]                    | 2 +-
 trunk/net/wireless/wext.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6dbb7e249b14..7b508a5b7ee5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53a3294e26c49622daa14c1d8540500f568ded99
+refs/heads/master: 148bc4303f9ba972cbfe5d30dfec93ec0d8ff1e1
diff --git a/trunk/net/wireless/wext.c b/trunk/net/wireless/wext.c
index e49a2d1ef1e4..cb6a5bb85d80 100644
--- a/trunk/net/wireless/wext.c
+++ b/trunk/net/wireless/wext.c
@@ -1055,8 +1055,8 @@ static int wireless_process_ioctl(struct net *net, struct ifreq *ifr,
 			return private(dev, iwr, cmd, info, handler);
 	}
 	/* Old driver API : call driver ioctl handler */
-	if (dev->do_ioctl)
-		return dev->do_ioctl(dev, ifr, cmd);
+	if (dev->netdev_ops->ndo_do_ioctl)
+		return dev->netdev_ops->ndo_do_ioctl(dev, ifr, cmd);
 	return -EOPNOTSUPP;
 }