Selaa lähdekoodia

wireless: fix ipw warning; add is_broadcast_ether_addr() to linux/etherdevice.h

Jeff Garzik 20 vuotta sitten
vanhempi
commit
9bd481f859
2 muutettua tiedostoa jossa 7 lisäystä ja 1 poistoa
  1. 1 1
      drivers/net/wireless/ipw2200.c
  2. 6 0
      include/linux/etherdevice.h

+ 1 - 1
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);
 		HOST_COMPLETE_TIMEOUT);
 	if (rc == 0) {
 	if (rc == 0) {
 		IPW_DEBUG_INFO("Command completion failed out after %dms.\n",
 		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;
 		priv->status &= ~STATUS_HCMD_ACTIVE;
 		return -EIO;
 		return -EIO;
 	}
 	}

+ 6 - 0
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]));
 	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
  * is_valid_ether_addr - Determine if the given Ethernet address is valid
  * @addr: Pointer to a six-byte array containing the Ethernet address
  * @addr: Pointer to a six-byte array containing the Ethernet address