Merge branch 'for-linus' of git://github.com/gregungerer/m68knommu

[~andy/linux] / net / tipc / eth_media.c

diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c
index 69bedd8a297b966c33a2ff989aa504055df79f03..e728d4ce2a1b4bd10aa1ff375fef4a5e7b5634a9 100644 (file)
--- a/net/tipc/eth_media.c
+++ b/net/tipc/eth_media.c
@@ -37,7 +37,7 @@
 #include "core.h"
 #include "bearer.h"
 
-#define MAX_ETH_BEARERS                2
+#define MAX_ETH_BEARERS                MAX_BEARERS
 #define ETH_LINK_PRIORITY      TIPC_DEF_LINK_PRI
 #define ETH_LINK_TOLERANCE     TIPC_DEF_LINK_TOL
 #define ETH_LINK_WINDOW                TIPC_DEF_LINK_WIN
@@ -156,21 +156,15 @@ static int enable_bearer(struct tipc_bearer *tb_ptr)
        if (!dev)
                return -ENODEV;
 
-       /* Find Ethernet bearer for device (or create one) */
-
-       while ((eb_ptr != stop) && eb_ptr->dev && (eb_ptr->dev != dev))
-               eb_ptr++;
-       if (eb_ptr == stop)
-               return -EDQUOT;
-       if (!eb_ptr->dev) {
-               eb_ptr->dev = dev;
-               eb_ptr->tipc_packet_type.type = htons(ETH_P_TIPC);
-               eb_ptr->tipc_packet_type.dev = dev;
-               eb_ptr->tipc_packet_type.func = recv_msg;
-               eb_ptr->tipc_packet_type.af_packet_priv = eb_ptr;
-               INIT_LIST_HEAD(&(eb_ptr->tipc_packet_type.list));
-               dev_add_pack(&eb_ptr->tipc_packet_type);
-       }
+       /* Create Ethernet bearer for device */
+
+       eb_ptr->dev = dev;
+       eb_ptr->tipc_packet_type.type = htons(ETH_P_TIPC);
+       eb_ptr->tipc_packet_type.dev = dev;
+       eb_ptr->tipc_packet_type.func = recv_msg;
+       eb_ptr->tipc_packet_type.af_packet_priv = eb_ptr;
+       INIT_LIST_HEAD(&(eb_ptr->tipc_packet_type.list));
+       dev_add_pack(&eb_ptr->tipc_packet_type);
 
        /* Associate TIPC bearer with Ethernet bearer */