Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9bd481f8 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

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

parent 2179a59d

drivers/net/wireless/ipw2200.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;

	}

	}

include/linux/etherdevice.h

+6 −0
Original line number Original line Diff line number Diff line
@@ -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