From 721d930667295414bf8709fa30c1194569110637 Mon Sep 17 00:00:00 2001 From: Allan Stephens Date: Sun, 25 Jun 2006 23:43:21 -0700 Subject: [PATCH] --- yaml --- r: 30401 b: refs/heads/master c: 687a25f1cdfc6ee1f2f60f299dbd294908eb0d59 h: refs/heads/master i: 30399: 17791267c872b4c09a6da1f889a4ba77a54ded88 v: v3 --- [refs] | 2 +- trunk/net/tipc/eth_media.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3104f0315d68..ae133ac3e4f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a592ea6362a967a49eb4b5d1cd36b78d8f180622 +refs/heads/master: 687a25f1cdfc6ee1f2f60f299dbd294908eb0d59 diff --git a/trunk/net/tipc/eth_media.c b/trunk/net/tipc/eth_media.c index 3ecb1006a42d..682da4a28041 100644 --- a/trunk/net/tipc/eth_media.c +++ b/trunk/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 @@ -127,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)