orinoco: fix last beacon reporting on 64-bit systems

[~andy/linux] / drivers / net / wireless / orinoco / orinoco.c

diff --git a/drivers/net/wireless/orinoco/orinoco.c b/drivers/net/wireless/orinoco/orinoco.c
index f4ea08f969706405987d50865744dedeadc630dd..fd9263980d695ead99d16adbbe7a223a9b7deb67 100644 (file)
--- a/drivers/net/wireless/orinoco/orinoco.c
+++ b/drivers/net/wireless/orinoco/orinoco.c
@@ -5444,7 +5444,7 @@ static inline char *orinoco_translate_scan(struct net_device *dev,
                                           char *current_ev,
                                           char *end_buf,
                                           union hermes_scan_info *bss,
-                                          unsigned int last_scanned)
+                                          unsigned long last_scanned)
 {
        struct orinoco_private *priv = netdev_priv(dev);
        u16                     capabilities;
@@ -5591,7 +5591,7 @@ static inline char *orinoco_translate_ext_scan(struct net_device *dev,
                                               char *current_ev,
                                               char *end_buf,
                                               struct agere_ext_scan_info *bss,
-                                              unsigned int last_scanned)
+                                              unsigned long last_scanned)
 {
        u16                     capabilities;
        u16                     channel;
@@ -5987,7 +5987,7 @@ static void orinoco_get_drvinfo(struct net_device *dev,
        strncpy(info->version, DRIVER_VERSION, sizeof(info->version) - 1);
        strncpy(info->fw_version, priv->fw_name, sizeof(info->fw_version) - 1);
        if (dev->dev.parent)
-               strncpy(info->bus_info, dev->dev.parent->bus_id,
+               strncpy(info->bus_info, dev_name(dev->dev.parent),
                        sizeof(info->bus_info) - 1);
        else
                snprintf(info->bus_info, sizeof(info->bus_info) - 1,