diff options
author | David Kilroy <kilroyd@googlemail.com> | 2010-05-01 09:05:38 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-05-03 14:53:06 -0400 |
commit | b42f2074dedef559ecf72dce61a6501f9f9b273a (patch) | |
tree | d75bfd6c7e6db6fd5e81310b3326d2aad5829041 /drivers/net/wireless/orinoco/wext.c | |
parent | f7c65594f7148b778f41d591a701e94bb22428e4 (diff) |
orinoco: add hermes_ops
Pave the way for introducing USB alternative functions.
Force callers to dereference ops instead of providing wrappers.
Signed-off-by: David Kilroy <kilroyd@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/orinoco/wext.c')
-rw-r--r-- | drivers/net/wireless/orinoco/wext.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/orinoco/wext.c b/drivers/net/wireless/orinoco/wext.c index d261423ecf6..b7fef250237 100644 --- a/drivers/net/wireless/orinoco/wext.c +++ b/drivers/net/wireless/orinoco/wext.c | |||
@@ -457,7 +457,7 @@ static int orinoco_ioctl_setfreq(struct net_device *dev, | |||
457 | if (priv->iw_mode == NL80211_IFTYPE_MONITOR) { | 457 | if (priv->iw_mode == NL80211_IFTYPE_MONITOR) { |
458 | /* Fast channel change - no commit if successful */ | 458 | /* Fast channel change - no commit if successful */ |
459 | hermes_t *hw = &priv->hw; | 459 | hermes_t *hw = &priv->hw; |
460 | err = hermes_docmd_wait(hw, HERMES_CMD_TEST | | 460 | err = hw->ops->cmd_wait(hw, HERMES_CMD_TEST | |
461 | HERMES_TEST_SET_CHANNEL, | 461 | HERMES_TEST_SET_CHANNEL, |
462 | chan, NULL); | 462 | chan, NULL); |
463 | } | 463 | } |
@@ -1272,8 +1272,8 @@ static int orinoco_ioctl_getrid(struct net_device *dev, | |||
1272 | if (orinoco_lock(priv, &flags) != 0) | 1272 | if (orinoco_lock(priv, &flags) != 0) |
1273 | return -EBUSY; | 1273 | return -EBUSY; |
1274 | 1274 | ||
1275 | err = hermes_read_ltv(hw, USER_BAP, rid, MAX_RID_LEN, &length, | 1275 | err = hw->ops->read_ltv(hw, USER_BAP, rid, MAX_RID_LEN, &length, |
1276 | extra); | 1276 | extra); |
1277 | if (err) | 1277 | if (err) |
1278 | goto out; | 1278 | goto out; |
1279 | 1279 | ||