diff -ur bridge-utils-0.9.5/brctl/brctl.c bridge-utils-0.9.5-ipmode/brctl/brctl.c
--- bridge-utils-0.9.5/brctl/brctl.c	Fri Dec  7 14:25:58 2001
+++ bridge-utils-0.9.5-ipmode/brctl/brctl.c	Tue Jun 18 00:50:59 2002
@@ -42,7 +42,8 @@
 "\tsetmaxage\t<bridge> <time>\t\tset max message age\n"
 "\tsetpathcost\t<bridge> <port> <cost>\tset path cost\n"
 "\tsetportprio\t<bridge> <port> <prio>\tset port priority\n"
-"\tstp\t\t<bridge> <state>\tturn stp on/off\n";
+"\tstp\t\t<bridge> <state>\tturn stp on/off\n"
+"\tipmode\t\t<bridge> <state>\tturn ipmode on/off\n";
 
 void help()
 {
diff -ur bridge-utils-0.9.5/brctl/brctl_cmd.c bridge-utils-0.9.5-ipmode/brctl/brctl_cmd.c
--- bridge-utils-0.9.5/brctl/brctl_cmd.c	Fri Dec  7 14:23:02 2001
+++ bridge-utils-0.9.5-ipmode/brctl/brctl_cmd.c	Tue Jun 18 00:52:10 2002
@@ -218,6 +218,17 @@
 	br_set_port_priority(p, cost);
 }
 
+void br_cmd_ip_mode(struct bridge *br, char *arg0, char *arg1)
+{
+	int v;
+
+	v = 0;
+	if (!strcmp(arg0, "on") || !strcmp(arg0, "yes") || !strcmp(arg0, "1"))
+		v = 1;
+
+	br_set_bridge_ip_mode(br, v);
+}
+
 void br_cmd_stp(struct bridge *br, char *arg0, char *arg1)
 {
 	int stp;
@@ -236,12 +247,13 @@
 
 void br_cmd_show(struct bridge *br, char *arg0, char *arg1)
 {
-	printf("bridge name\tbridge id\t\tSTP enabled\tinterfaces\n");
+	printf("bridge name\tbridge id\t\tSTP enabled\tIP Mode\tinterfaces\n");
 	br = bridge_list;
 	while (br != NULL) {
 		printf("%s\t\t", br->ifname);
 		br_dump_bridge_id((unsigned char *)&br->info.bridge_id);
 		printf("\t%s\t\t", br->info.stp_enabled?"yes":"no");
+		printf("%s\t", br->info.ip_mode?"yes":"no");
 		br_dump_interface_list(br);
 
 		br = br->next;
@@ -317,6 +329,7 @@
 	{1, 0, "showmacs", br_cmd_showmacs},
 	{1, 0, "showstp", br_cmd_showstp},
 	{1, 1, "stp", br_cmd_stp},
+	{1, 1, "ipmode", br_cmd_ip_mode},
 };
 
 struct command *br_command_lookup(char *cmd)
diff -ur bridge-utils-0.9.5/brctl/brctl_disp.c bridge-utils-0.9.5-ipmode/brctl/brctl_disp.c
--- bridge-utils-0.9.5/brctl/brctl_disp.c	Fri Jun 22 19:59:02 2001
+++ bridge-utils-0.9.5-ipmode/brctl/brctl_disp.c	Tue Jun 18 00:50:59 2002
@@ -46,7 +46,7 @@
 	printf("\n");
 
 	while (p != NULL) {
-		printf("\t\t\t\t\t\t\t%s\n", if_indextoname(p->ifindex, ifname));
+		printf("\t\t\t\t\t\t\t\t%s\n", if_indextoname(p->ifindex, ifname));
 		p = p->next;
 	}
 }
diff -ur bridge-utils-0.9.5/libbridge/libbridge.h bridge-utils-0.9.5-ipmode/libbridge/libbridge.h
--- bridge-utils-0.9.5/libbridge/libbridge.h	Fri Jun 22 19:59:03 2001
+++ bridge-utils-0.9.5-ipmode/libbridge/libbridge.h	Tue Jun 18 00:50:59 2002
@@ -55,6 +55,7 @@
 	struct timeval tcn_timer_value;
 	struct timeval topology_change_timer_value;
 	struct timeval gc_timer_value;
+	unsigned ip_mode:1;
 };
 
 struct bridge
@@ -119,6 +120,7 @@
 int br_set_bridge_max_age(struct bridge *br, struct timeval *tv);
 int br_set_ageing_time(struct bridge *br, struct timeval *tv);
 int br_set_gc_interval(struct bridge *br, struct timeval *tv);
+int br_set_bridge_ip_mode(struct bridge *br, int state);
 int br_set_stp_state(struct bridge *br, int stp_state);
 int br_set_bridge_priority(struct bridge *br, int bridge_priority);
 int br_set_port_priority(struct port *p, int port_priority);
diff -ur bridge-utils-0.9.5/libbridge/libbridge_devif.c bridge-utils-0.9.5-ipmode/libbridge/libbridge_devif.c
--- bridge-utils-0.9.5/libbridge/libbridge_devif.c	Wed Jan 16 12:04:45 2002
+++ bridge-utils-0.9.5-ipmode/libbridge/libbridge_devif.c	Tue Jun 18 00:50:59 2002
@@ -146,6 +146,15 @@
 	return 0;
 }
 
+int br_set_bridge_ip_mode(struct bridge *br, int state)
+{
+	if (br_device_ioctl(br, BRCTL_SET_BRIDGE_IP_MODE, state,
+			    0, 0) < 0)
+		return errno;
+
+	return 0;
+}
+
 int br_set_bridge_priority(struct bridge *br, int bridge_priority)
 {
 	if (br_device_ioctl(br, BRCTL_SET_BRIDGE_PRIORITY, bridge_priority,
diff -ur bridge-utils-0.9.5/libbridge/libbridge_init.c bridge-utils-0.9.5-ipmode/libbridge/libbridge_init.c
--- bridge-utils-0.9.5/libbridge/libbridge_init.c	Fri Jun 22 19:59:03 2001
+++ bridge-utils-0.9.5-ipmode/libbridge/libbridge_init.c	Tue Jun 18 00:50:59 2002
@@ -51,6 +51,7 @@
 	__jiffies_to_tv(&info->topology_change_timer_value,
 			i->topology_change_timer_value);
 	__jiffies_to_tv(&info->gc_timer_value, i->gc_timer_value);
+	info->ip_mode = i->ip_mode;
 }
 
 static void __port_info_copy(struct port_info *info, struct __port_info *i)