---

yaml --- r: 127765 b: refs/heads/master c: 148bc43 h: refs/heads/master i: 127763: 9bd9770 v: v3
git-mirror · Jan 6, 2009 · 27b5c67 · 27b5c67
1 parent 004942b
commit 27b5c67
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;
 }