Backport wext.c dev->netdev_ops->ndo_do_ioctl call

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>

diff --git a/compat/compat.diff b/compat/compat.diff
index d8aeb39323b196b62be66c38b3636d045c308b26..0ef0709ce92c1efa4c298a07efa06cda505bb329 100644 (file)
--- a/compat/compat.diff
+++ b/compat/compat.diff
@@ -1505,3 +1505,19 @@
 -      zd_chip_control_leds(&mac->chip, LED_OFF);
 +      zd_chip_control_leds(&mac->chip, ZD_LED_OFF);
  }
+--- a/net/wireless/wext.c      2009-07-07 15:03:28.803678550 -0700
++++ b/net/wireless/wext.c      2009-07-07 15:03:11.011682437 -0700
+@@ -1103,8 +1103,13 @@
+                       return private(dev, iwr, cmd, info, handler);
+       }
+       /* Old driver API : call driver ioctl handler */
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
+       if (dev->netdev_ops->ndo_do_ioctl)
+               return dev->netdev_ops->ndo_do_ioctl(dev, ifr, cmd);
++#else
++      if (dev->do_ioctl)
++              return dev->do_ioctl(dev, ifr, cmd);
++#endif
+       return -EOPNOTSUPP;
+ }
+