diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-06-28 01:46:35 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-28 01:46:35 -0400 |
commit | 9bd481f85940726bf66aae5cd03c5b912ad0ae4c (patch) | |
tree | 3ccd9be1df9cff30863e47d32f631b9c43da5783 | |
parent | 2179a59db18ddf8eb3fd0133a3bee57f1c2b5b06 (diff) |
wireless: fix ipw warning; add is_broadcast_ether_addr() to linux/etherdevice.h
-rw-r--r-- | drivers/net/wireless/ipw2200.c | 2 | ||||
-rw-r--r-- | include/linux/etherdevice.h | 6 |
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) | |||
1170 | HOST_COMPLETE_TIMEOUT); | 1170 | HOST_COMPLETE_TIMEOUT); |
1171 | if (rc == 0) { | 1171 | if (rc == 0) { |
1172 | IPW_DEBUG_INFO("Command completion failed out after %dms.\n", | 1172 | IPW_DEBUG_INFO("Command completion failed out after %dms.\n", |
1173 | HOST_COMPLETE_TIMEOUT / (HZ / 1000)); | 1173 | jiffies_to_msecs(HOST_COMPLETE_TIMEOUT)); |
1174 | priv->status &= ~STATUS_HCMD_ACTIVE; | 1174 | priv->status &= ~STATUS_HCMD_ACTIVE; |
1175 | return -EIO; | 1175 | return -EIO; |
1176 | } | 1176 | } |
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) | |||
68 | return ((addr[0] != 0xff) && (0x01 & addr[0])); | 68 | return ((addr[0] != 0xff) && (0x01 & addr[0])); |
69 | } | 69 | } |
70 | 70 | ||
71 | static inline int is_broadcast_ether_addr(const u8 *addr) | ||
72 | { | ||
73 | return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && | ||
74 | (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff)); | ||
75 | } | ||
76 | |||
71 | /** | 77 | /** |
72 | * is_valid_ether_addr - Determine if the given Ethernet address is valid | 78 | * is_valid_ether_addr - Determine if the given Ethernet address is valid |
73 | * @addr: Pointer to a six-byte array containing the Ethernet address | 79 | * @addr: Pointer to a six-byte array containing the Ethernet address |