Merge upstream 2.6.13-rc1-git1 into 'ieee80211' branch of netdev-2.6.

diff --combined include/linux/etherdevice.h
index ae588aab21b68a8fb2310bdef5f4cdbbb6e2321c,cf3847edc50f6c0199965d338b6e687d36786b74..a6626dac6e3f5f467af9692543aa74611ce87a36
--- 1/include/linux/etherdevice.h
--- 2/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
@@@ -25,6 -25,7 +25,7 @@@
  #define _LINUX_ETHERDEVICE_H
  
  #include <linux/if_ether.h>
+ #include <linux/netdevice.h>
  #include <linux/random.h>
  
  #ifdef __KERNEL__
@@@ -68,12 -69,6 +69,12 @@@ static inline int is_multicast_ether_ad
        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