From e421575c9ede68e1e8287efa32955c0273a545b3 Mon Sep 17 00:00:00 2001 From: Allan Stephens Date: Fri, 27 May 2011 14:02:48 -0400 Subject: [PATCH] --- yaml --- r: 266115 b: refs/heads/master c: 18abf0fb6b8f05be2a289abbbc054d4869281476 h: refs/heads/master i: 266113: 8bedd8b1599ed0371fccf98fb63f460045856601 266111: a76b342847cf316ec0334607d603fb805f212792 v: v3 --- [refs] | 2 +- trunk/net/tipc/eth_media.c | 24 +++++++++--------------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index 4ffaef4d15d7..10bec06d050c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bcd326e844c46e0533a79f91e75dea160469cf86 +refs/heads/master: 18abf0fb6b8f05be2a289abbbc054d4869281476 diff --git a/trunk/net/tipc/eth_media.c b/trunk/net/tipc/eth_media.c index 69bedd8a297b..413b33742a99 100644 --- a/trunk/net/tipc/eth_media.c +++ b/trunk/net/tipc/eth_media.c @@ -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 */