diff -urN ./bridge-utils-1.0.4-old/brctl/brctl.c ./bridge-utils-1.0.4/brctl/brctl.c
--- ./bridge-utils-1.0.4-old/brctl/brctl.c	2004-05-21 19:41:49.000000000 +0200
+++ ./bridge-utils-1.0.4/brctl/brctl.c	2004-06-16 12:10:10.000000000 +0200
@@ -54,7 +54,7 @@
 		goto help;
 	}
 	
-	if (argc < cmd->nargs + 2) {
+	if (argc < cmd->nargs + 2  ) {
 		fprintf(stderr, "incorrect number of arguments for command\n");
 		goto help;
 	}
diff -urN ./bridge-utils-1.0.4-old/brctl/brctl_cmd.c ./bridge-utils-1.0.4/brctl/brctl_cmd.c
--- ./bridge-utils-1.0.4-old/brctl/brctl_cmd.c	2004-06-04 20:03:40.000000000 +0200
+++ ./bridge-utils-1.0.4/brctl/brctl_cmd.c	2004-06-16 00:17:21.000000000 +0200
@@ -83,7 +83,7 @@
 {
 	int err;
 
-	switch (err = br_add_interface(argv[1], argv[2])) {
+	switch (err = br_add_interface(argv[1], argv[2], argv[3])) {
 	case 0:
 		return 0;
 	case ENODEV:
@@ -369,33 +369,33 @@
 }
 
 static const struct command commands[] = {
-	{ 1, "addbr", br_cmd_addbr, "<bridge>\t\tadd bridge" },
-	{ 1, "delbr", br_cmd_delbr, "<bridge>\t\tdelete bridge" },
+	{ 1, "addbr", br_cmd_addbr, "<bridge>\t\t\tadd bridge" },
+	{ 1, "delbr", br_cmd_delbr, "<bridge>\t\t\tdelete bridge" },
 	{ 2, "addif", br_cmd_addif, 
-	  "<bridge> <device>\tadd interface to bridge" },
+	  "<bridge> <dev> [<realdev>]\tadd interface to bridge, <dev> is the bridge device,\n\t\t\t\t\t\t\trealdev (optional) is the device with link information\n\t\t\t\t\t\t\tExample : brctl addif eth0.10 eth0" },
 	{ 2, "delif", br_cmd_delif,
-	  "<bridge> <device>\tdelete interface from bridge" },
+	  "<bridge> <device>\t\tdelete interface from bridge" },
 	{ 2, "setageing", br_cmd_setageing,
-	  "<bridge> <time>\t\tset ageing time" },
+	  "<bridge> <time>\t\t\tset ageing time" },
 	{ 2, "setbridgeprio", br_cmd_setbridgeprio,
-	  "<bridge> <prio>\t\tset bridge priority" },
+	  "<bridge> <prio>\t\t\tset bridge priority" },
 	{ 2, "setfd", br_cmd_setfd,
-	  "<bridge> <time>\t\tset bridge forward delay" },
+	  "<bridge> <time>\t\t\tset bridge forward delay" },
 	{ 2, "sethello", br_cmd_sethello,
-	  "<bridge> <time>\t\tset hello time" },
+	  "<bridge> <time>\t\t\tset hello time" },
 	{ 2, "setmaxage", br_cmd_setmaxage,
-	  "<bridge> <time>\t\tset max message age" },
+	  "<bridge> <time>\t\t\tset max message age" },
 	{ 3, "setpathcost", br_cmd_setpathcost, 
-	  "<bridge> <port> <cost>\tset path cost" },
+	  "<bridge> <port> <cost>\t\tset path cost" },
 	{ 3, "setportprio", br_cmd_setportprio,
-	  "<bridge> <port> <prio>\tset port priority" },
-	{ 0, "show", br_cmd_show, "\t\t\tshow a list of bridges" },
+	  "<bridge> <port> <prio>\t\tset port priority" },
+	{ 0, "show", br_cmd_show, "\t\t\t\tshow a list of bridges" },
 	{ 1, "showmacs", br_cmd_showmacs, 
-	  "<bridge>\t\tshow a list of mac addrs"},
+	  "<bridge>\t\t\tshow a list of mac addrs"},
 	{ 1, "showstp", br_cmd_showstp, 
-	  "<bridge>\t\tshow bridge stp info"},
+	  "<bridge>\t\t\tshow bridge stp info"},
 	{ 1, "stp", br_cmd_stp,
-	  "<bridge> <state>\tturn stp on/off" },
+	  "<bridge> <state>\t\tturn stp on/off" },
 };
 
 const struct command *command_lookup(const char *cmd)
diff -urN ./bridge-utils-1.0.4-old/libbridge/libbridge.h ./bridge-utils-1.0.4/libbridge/libbridge.h
--- ./bridge-utils-1.0.4-old/libbridge/libbridge.h	2004-06-08 17:57:49.000000000 +0200
+++ ./bridge-utils-1.0.4/libbridge/libbridge.h	2004-06-15 23:50:23.000000000 +0200
@@ -93,7 +93,7 @@
 			    struct port_info *info);
 extern int br_add_bridge(const char *brname);
 extern int br_del_bridge(const char *brname);
-extern int br_add_interface(const char *br, const char *dev);
+extern int br_add_interface(const char *br, const char *dev, const char *rdev);
 extern int br_del_interface(const char *br, const char *dev);
 extern int br_set_bridge_forward_delay(const char *br, struct timeval *tv);
 extern int br_set_bridge_hello_time(const char *br, struct timeval *tv);
diff -urN ./bridge-utils-1.0.4-old/libbridge/libbridge_if.c ./bridge-utils-1.0.4/libbridge/libbridge_if.c
--- ./bridge-utils-1.0.4-old/libbridge/libbridge_if.c	2004-06-04 20:03:42.000000000 +0200
+++ ./bridge-utils-1.0.4/libbridge/libbridge_if.c	2004-06-15 23:49:47.000000000 +0200
@@ -66,14 +66,16 @@
 	return  ret < 0 ? errno : 0;
 }
 
-int br_add_interface(const char *bridge, const char *dev)
+int br_add_interface(const char *bridge, const char *dev, const char *rdev )
 {
 	struct ifreq ifr;
 	int err;
 	int ifindex = if_nametoindex(dev);
+        int master_ifindex = if_nametoindex(rdev);
 
 	if (ifindex == 0) 
 		return ENODEV;
+        if (master_ifindex == 0 ) master_ifindex=ifindex;
 	
 	strncpy(ifr.ifr_name, bridge, IFNAMSIZ);
 #ifdef SIOCBRADDIF
@@ -82,7 +84,7 @@
 	if (err < 0)
 #endif
 	{
-		unsigned long args[4] = { BRCTL_ADD_IF, ifindex, 0, 0 };
+		unsigned long args[4] = { BRCTL_ADD_IF, ifindex, master_ifindex, 0 };
 					  
 		ifr.ifr_data = (char *) args;
 		err = ioctl(br_socket_fd, SIOCDEVPRIVATE, &ifr);
diff -urN ./bridge-utils-1.0.4-old/libbridge/libbridge_misc.c ./bridge-utils-1.0.4/libbridge/libbridge_misc.c
--- ./bridge-utils-1.0.4-old/libbridge/libbridge_misc.c	2004-05-21 19:41:49.000000000 +0200
+++ ./bridge-utils-1.0.4/libbridge/libbridge_misc.c	2004-06-15 23:33:30.000000000 +0200
@@ -25,17 +25,18 @@
 #include "libbridge_private.h"
 
 
-static const char *state_names[5] = {
+static const char *state_names[6] = {
 	[BR_STATE_DISABLED] = "disabled", 
 	[BR_STATE_LISTENING] = "listening", 
 	[BR_STATE_LEARNING] = "learning", 
 	[BR_STATE_FORWARDING] = "forwarding", 
 	[BR_STATE_BLOCKING] ="blocking",
+	[BR_STATE_NOLINK] ="nolink",
 };
 
 const char *br_get_state_name(int state)
 {
-	if (state >= 0 && state <= 4)
+	if (state >= 0 && state <= 5)
 		return state_names[state];
 
 	return "<INVALID STATE>";