Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index 107119c54301..d15bf22b9a03 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -1894,13 +1894,13 @@ static int eth_start_xmit (struct sk_buff *skb, struct net_device *net)
         if (!eth_is_promisc (dev)) {
                 u8              *dest = skb->data;
 
-                if (dest [0] & 0x01) {
+                if (is_multicast_ether_addr(dest)) {
                         u16     type;
 
                         /* ignores USB_CDC_PACKET_TYPE_MULTICAST and host
                          * SET_ETHERNET_MULTICAST_FILTERS requests
                          */
-                        if (memcmp (dest, net->broadcast, ETH_ALEN) == 0)
+                        if (is_broadcast_ether_addr(dest))
                                 type = USB_CDC_PACKET_TYPE_BROADCAST;
                         else
                                 type = USB_CDC_PACKET_TYPE_ALL_MULTICAST;