From: Michel Normand <normand@fr.ibm.com>
Date: Thu, 29 Apr 2010 08:03:59 +0000 (+0200)
Subject: lxc: remove unused lxc_bridge_detach
X-Git-Tag: lxc-0.7.0~91
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d1635085fc0157282039585805189cc657f8235;p=thirdparty%2Flxc.git

lxc: remove unused lxc_bridge_detach

Signed-off-by: Michel Normand <normand@fr.ibm.com>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---

diff --git a/src/lxc/network.c b/src/lxc/network.c
index f8cb8a465..f1f0beb11 100644
--- a/src/lxc/network.c
+++ b/src/lxc/network.c
@@ -753,8 +753,11 @@ out:
 	return err;
 }
 
-static int bridge_add_del_interface(const char *bridge,
-				    const char *ifname, int detach)
+/*
+ * There is a lxc_bridge_attach, but no need of a bridge detach
+ * as automatically done by kernel when device deleted.
+ */
+int lxc_bridge_attach(const char *bridge, const char *ifname)
 {
 	int fd, index, err;
 	struct ifreq ifr;
@@ -772,20 +775,10 @@ static int bridge_add_del_interface(const char *bridge,
 
 	strncpy(ifr.ifr_name, bridge, IFNAMSIZ);
 	ifr.ifr_ifindex = index;
-	err = ioctl(fd, detach?SIOCBRDELIF:SIOCBRADDIF, &ifr);
+	err = ioctl(fd, SIOCBRADDIF, &ifr);
 	close(fd);
 	if (err)
 		err = -errno;
 
 	return err;
 }
-
-int lxc_bridge_attach(const char *bridge, const char *ifname)
-{
-	return bridge_add_del_interface(bridge, ifname, 0);
-}
-
-int lxc_bridge_detach(const char *bridge, const char *ifname)
-{
-	return bridge_add_del_interface(bridge, ifname, 1);
-}
diff --git a/src/lxc/network.h b/src/lxc/network.h
index 59f2a4180..0d743433e 100644
--- a/src/lxc/network.h
+++ b/src/lxc/network.h
@@ -98,11 +98,6 @@ extern int lxc_ip_addr_add(int family, int ifindex, void *addr, int prefix);
  */
 extern int lxc_bridge_attach(const char *bridge, const char *ifname);
 
-/*
- * Detach an interface from the bridge
- */
-extern int lxc_bridge_detach(const char *bridge, const char *ifname);
-
 /* 
  * Create default gateway
  */