Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (42 commits)
  [IOAT]: Do not dereference THIS_MODULE directly to set unsafe.
  [NETROM]: Fix possible null pointer dereference.
  [NET] netpoll: break recursive loop in netpoll rx path
  [NET] netpoll: don't spin forever sending to stopped queues
  [IRDA]: add some IBM think pads
  [ATM]: atm/mpc.c warning fix
  [NET]: skb_find_text ignores to argument
  [NET]: make net/core/dev.c:netdev_nit static
  [NET]: Fix GSO problems in dev_hard_start_xmit()
  [NET]: Fix CHECKSUM_HW GSO problems.
  [TIPC]: Fix incorrect correction to discovery timer frequency computation.
  [TIPC]: Get rid of dynamically allocated arrays in broadcast code.
  [TIPC]: Fixed link switchover bugs
  [TIPC]: Enhanced & cleaned up system messages; fixed 2 obscure memory leaks.
  [TIPC]: First phase of assert() cleanup
  [TIPC]: Disallow config operations that aren't supported in certain modes.
  [TIPC]: Fixed memory leak in tipc_link_send() when destination is unreachable
  [TIPC]: Added missing warning for out-of-memory condition
  [TIPC]: Withdrawing all names from nameless port now returns success, not error
  [TIPC]: Optimized argument validation done by connect().
  ...

1 files changed, 16 insertions, 13 deletions

diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c
index 7a252785f727..682da4a28041 100644
--- a/net/tipc/eth_media.c
+++ b/net/tipc/eth_media.c
@@ -2,7 +2,7 @@
  * net/tipc/eth_media.c: Ethernet bearer support for TIPC
  * 
  * Copyright (c) 2001-2006, Ericsson AB
- * Copyright (c) 2005, Wind River Systems
+ * Copyright (c) 2005-2006, Wind River Systems
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -98,17 +98,19 @@ static int recv_msg(struct sk_buff *buf, struct net_device *dev,
         u32 size;
 
         if (likely(eb_ptr->bearer)) {
-                size = msg_size((struct tipc_msg *)buf->data);
-                skb_trim(buf, size);
-                if (likely(buf->len == size)) {
-                        buf->next = NULL;
-                        tipc_recv_msg(buf, eb_ptr->bearer);
-                } else {
-                        kfree_skb(buf);
+               if (likely(!dev->promiscuity) ||
+                   !memcmp(buf->mac.raw,dev->dev_addr,ETH_ALEN) ||
+                   !memcmp(buf->mac.raw,dev->broadcast,ETH_ALEN)) {
+                        size = msg_size((struct tipc_msg *)buf->data);
+                        skb_trim(buf, size);
+                        if (likely(buf->len == size)) {
+                                buf->next = NULL;
+                                tipc_recv_msg(buf, eb_ptr->bearer);
+                                return TIPC_OK;
+                        }
                 }
-        } else {
-                kfree_skb(buf);
         }
+        kfree_skb(buf);
         return TIPC_OK;
 }
 
@@ -125,8 +127,7 @@ static int enable_bearer(struct tipc_bearer *tb_ptr)
 
         /* Find device with specified name */
 
-        while (dev && dev->name &&
-               (memcmp(dev->name, driver_name, strlen(dev->name)))) {
+        while (dev && dev->name && strncmp(dev->name, driver_name, IFNAMSIZ)) { 
                 dev = dev->next;
         }
         if (!dev)
@@ -252,7 +253,9 @@ int tipc_eth_media_start(void)
         if (eth_started)
                 return -EINVAL;
 
-        memset(&bcast_addr, 0xff, sizeof(bcast_addr));
+        bcast_addr.type = htonl(TIPC_MEDIA_TYPE_ETH);
+        memset(&bcast_addr.dev_addr, 0xff, ETH_ALEN);
+
         memset(eth_bearers, 0, sizeof(eth_bearers));
 
         res = tipc_register_media(TIPC_MEDIA_TYPE_ETH, "eth",