diff options
author | David Kilroy <kilroyd@googlemail.com> | 2009-02-04 18:05:49 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-02-11 11:44:27 -0500 |
commit | aea48b1529c6c4d39af82fc36728da49668392c6 (patch) | |
tree | da3ef02089418bfd214a43f61b60f9e1f713d19a /drivers/net/wireless/orinoco | |
parent | 47445cb95015bef0d54ca799f31e454797378a71 (diff) |
orinoco: use orinoco_private instead of net_device in scan helper
This makes the interface to the scan helpers consistent, so we can split
them out.
Signed-off-by: David Kilroy <kilroyd@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/orinoco')
-rw-r--r-- | drivers/net/wireless/orinoco/main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/orinoco/main.c b/drivers/net/wireless/orinoco/main.c index e43e3e20df94..9e8da9cbee8c 100644 --- a/drivers/net/wireless/orinoco/main.c +++ b/drivers/net/wireless/orinoco/main.c | |||
@@ -1929,11 +1929,10 @@ static void orinoco_add_ext_scan_result(struct orinoco_private *priv, | |||
1929 | } | 1929 | } |
1930 | } | 1930 | } |
1931 | 1931 | ||
1932 | static int orinoco_process_scan_results(struct net_device *dev, | 1932 | static int orinoco_process_scan_results(struct orinoco_private *priv, |
1933 | unsigned char *buf, | 1933 | unsigned char *buf, |
1934 | int len) | 1934 | int len) |
1935 | { | 1935 | { |
1936 | struct orinoco_private *priv = netdev_priv(dev); | ||
1937 | int offset; /* In the scan data */ | 1936 | int offset; /* In the scan data */ |
1938 | union hermes_scan_info *atom; | 1937 | union hermes_scan_info *atom; |
1939 | int atom_len; | 1938 | int atom_len; |
@@ -1967,7 +1966,8 @@ static int orinoco_process_scan_results(struct net_device *dev, | |||
1967 | /* Sanity check for atom_len */ | 1966 | /* Sanity check for atom_len */ |
1968 | if (atom_len < sizeof(struct prism2_scan_apinfo)) { | 1967 | if (atom_len < sizeof(struct prism2_scan_apinfo)) { |
1969 | printk(KERN_ERR "%s: Invalid atom_len in scan " | 1968 | printk(KERN_ERR "%s: Invalid atom_len in scan " |
1970 | "data: %d\n", dev->name, atom_len); | 1969 | "data: %d\n", priv->ndev->name, |
1970 | atom_len); | ||
1971 | return -EIO; | 1971 | return -EIO; |
1972 | } | 1972 | } |
1973 | } else | 1973 | } else |
@@ -1980,7 +1980,7 @@ static int orinoco_process_scan_results(struct net_device *dev, | |||
1980 | /* Check that we got an whole number of atoms */ | 1980 | /* Check that we got an whole number of atoms */ |
1981 | if ((len - offset) % atom_len) { | 1981 | if ((len - offset) % atom_len) { |
1982 | printk(KERN_ERR "%s: Unexpected scan data length %d, " | 1982 | printk(KERN_ERR "%s: Unexpected scan data length %d, " |
1983 | "atom_len %d, offset %d\n", dev->name, len, | 1983 | "atom_len %d, offset %d\n", priv->ndev->name, len, |
1984 | atom_len, offset); | 1984 | atom_len, offset); |
1985 | return -EIO; | 1985 | return -EIO; |
1986 | } | 1986 | } |
@@ -2187,7 +2187,7 @@ static void __orinoco_ev_info(struct net_device *dev, hermes_t *hw) | |||
2187 | } | 2187 | } |
2188 | #endif /* ORINOCO_DEBUG */ | 2188 | #endif /* ORINOCO_DEBUG */ |
2189 | 2189 | ||
2190 | if (orinoco_process_scan_results(dev, buf, len) == 0) { | 2190 | if (orinoco_process_scan_results(priv, buf, len) == 0) { |
2191 | /* Send an empty event to user space. | 2191 | /* Send an empty event to user space. |
2192 | * We don't send the received data on the event because | 2192 | * We don't send the received data on the event because |
2193 | * it would require us to do complex transcoding, and | 2193 | * it would require us to do complex transcoding, and |