wireless: fix ipw warning; add is_broadcast_ether_addr() to linux/etherdevice.h
authorJeff Garzik <jgarzik@pobox.com>
Tue, 28 Jun 2005 05:46:35 +0000 (01:46 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 28 Jun 2005 05:46:35 +0000 (01:46 -0400)
drivers/net/wireless/ipw2200.c
include/linux/etherdevice.h

index 16cfd907e7153976868221834aeb45f7a83cbd94..133666d43d7e5901f2c91c51723e3ff50922cf3f 100644 (file)
@@ -1170,7 +1170,7 @@ static int ipw_send_cmd(struct ipw_priv *priv, struct host_cmd *cmd)
                HOST_COMPLETE_TIMEOUT);
        if (rc == 0) {
                IPW_DEBUG_INFO("Command completion failed out after %dms.\n",
-                              HOST_COMPLETE_TIMEOUT / (HZ / 1000));
+                              jiffies_to_msecs(HOST_COMPLETE_TIMEOUT));
                priv->status &= ~STATUS_HCMD_ACTIVE;
                return -EIO;
        }
index 8a2df4dfbc59c08962a1e37b0d1ad8bf147616b2..ae588aab21b68a8fb2310bdef5f4cdbbb6e2321c 100644 (file)
@@ -68,6 +68,12 @@ static inline int is_multicast_ether_addr(const u8 *addr)
        return ((addr[0] != 0xff) && (0x01 & addr[0]));
 }
 
+static inline int is_broadcast_ether_addr(const u8 *addr)
+{
+        return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) &&  
+               (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff));
+}
+
 /**
  * is_valid_ether_addr - Determine if the given Ethernet address is valid
  * @addr: Pointer to a six-byte array containing the Ethernet address