diff options
Diffstat (limited to 'drivers/net/wireless/orinoco/wext.c')
-rw-r--r-- | drivers/net/wireless/orinoco/wext.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/orinoco/wext.c b/drivers/net/wireless/orinoco/wext.c index e793679e2e19..bbb9beb206b1 100644 --- a/drivers/net/wireless/orinoco/wext.c +++ b/drivers/net/wireless/orinoco/wext.c | |||
@@ -87,7 +87,7 @@ nomem: | |||
87 | static struct iw_statistics *orinoco_get_wireless_stats(struct net_device *dev) | 87 | static struct iw_statistics *orinoco_get_wireless_stats(struct net_device *dev) |
88 | { | 88 | { |
89 | struct orinoco_private *priv = ndev_priv(dev); | 89 | struct orinoco_private *priv = ndev_priv(dev); |
90 | hermes_t *hw = &priv->hw; | 90 | struct hermes *hw = &priv->hw; |
91 | struct iw_statistics *wstats = &priv->wstats; | 91 | struct iw_statistics *wstats = &priv->wstats; |
92 | int err; | 92 | int err; |
93 | unsigned long flags; | 93 | unsigned long flags; |
@@ -448,7 +448,7 @@ static int orinoco_ioctl_setfreq(struct net_device *dev, | |||
448 | } | 448 | } |
449 | 449 | ||
450 | if ((chan < 1) || (chan > NUM_CHANNELS) || | 450 | if ((chan < 1) || (chan > NUM_CHANNELS) || |
451 | !(priv->channel_mask & (1 << (chan-1)))) | 451 | !(priv->channel_mask & (1 << (chan - 1)))) |
452 | return -EINVAL; | 452 | return -EINVAL; |
453 | 453 | ||
454 | if (orinoco_lock(priv, &flags) != 0) | 454 | if (orinoco_lock(priv, &flags) != 0) |
@@ -457,7 +457,7 @@ static int orinoco_ioctl_setfreq(struct net_device *dev, | |||
457 | priv->channel = chan; | 457 | priv->channel = chan; |
458 | if (priv->iw_mode == NL80211_IFTYPE_MONITOR) { | 458 | if (priv->iw_mode == NL80211_IFTYPE_MONITOR) { |
459 | /* Fast channel change - no commit if successful */ | 459 | /* Fast channel change - no commit if successful */ |
460 | hermes_t *hw = &priv->hw; | 460 | struct hermes *hw = &priv->hw; |
461 | err = hw->ops->cmd_wait(hw, HERMES_CMD_TEST | | 461 | err = hw->ops->cmd_wait(hw, HERMES_CMD_TEST | |
462 | HERMES_TEST_SET_CHANNEL, | 462 | HERMES_TEST_SET_CHANNEL, |
463 | chan, NULL); | 463 | chan, NULL); |
@@ -492,7 +492,7 @@ static int orinoco_ioctl_getsens(struct net_device *dev, | |||
492 | char *extra) | 492 | char *extra) |
493 | { | 493 | { |
494 | struct orinoco_private *priv = ndev_priv(dev); | 494 | struct orinoco_private *priv = ndev_priv(dev); |
495 | hermes_t *hw = &priv->hw; | 495 | struct hermes *hw = &priv->hw; |
496 | u16 val; | 496 | u16 val; |
497 | int err; | 497 | int err; |
498 | unsigned long flags; | 498 | unsigned long flags; |
@@ -668,7 +668,7 @@ static int orinoco_ioctl_getpower(struct net_device *dev, | |||
668 | char *extra) | 668 | char *extra) |
669 | { | 669 | { |
670 | struct orinoco_private *priv = ndev_priv(dev); | 670 | struct orinoco_private *priv = ndev_priv(dev); |
671 | hermes_t *hw = &priv->hw; | 671 | struct hermes *hw = &priv->hw; |
672 | int err = 0; | 672 | int err = 0; |
673 | u16 enable, period, timeout, mcast; | 673 | u16 enable, period, timeout, mcast; |
674 | unsigned long flags; | 674 | unsigned long flags; |
@@ -873,7 +873,7 @@ static int orinoco_ioctl_set_auth(struct net_device *dev, | |||
873 | union iwreq_data *wrqu, char *extra) | 873 | union iwreq_data *wrqu, char *extra) |
874 | { | 874 | { |
875 | struct orinoco_private *priv = ndev_priv(dev); | 875 | struct orinoco_private *priv = ndev_priv(dev); |
876 | hermes_t *hw = &priv->hw; | 876 | struct hermes *hw = &priv->hw; |
877 | struct iw_param *param = &wrqu->param; | 877 | struct iw_param *param = &wrqu->param; |
878 | unsigned long flags; | 878 | unsigned long flags; |
879 | int ret = -EINPROGRESS; | 879 | int ret = -EINPROGRESS; |
@@ -1269,7 +1269,7 @@ static int orinoco_ioctl_getrid(struct net_device *dev, | |||
1269 | char *extra) | 1269 | char *extra) |
1270 | { | 1270 | { |
1271 | struct orinoco_private *priv = ndev_priv(dev); | 1271 | struct orinoco_private *priv = ndev_priv(dev); |
1272 | hermes_t *hw = &priv->hw; | 1272 | struct hermes *hw = &priv->hw; |
1273 | int rid = data->flags; | 1273 | int rid = data->flags; |
1274 | u16 length; | 1274 | u16 length; |
1275 | int err; | 1275 | int err; |