2 files changed, 7 insertions, 1 deletions

diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 16cfd907e715..133666d43d7e 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -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;
         }
diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h
index 8a2df4dfbc59..ae588aab21b6 100644
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
@@ -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