From 797f4d383d97f404a9d78c9201e752e8eec85667 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Thu, 7 Aug 2014 12:45:47 -0700
Subject: [PATCH] Fix classification of ethernet interfaces

---
 net/edit_bifc.cgi | 3 ++-
 net/save_bifc.cgi | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/net/edit_bifc.cgi b/net/edit_bifc.cgi
index 6b410eee1..0ebf6925a 100755
--- a/net/edit_bifc.cgi
+++ b/net/edit_bifc.cgi
@@ -288,7 +288,8 @@ if (($in{'new'} && $in{'virtual'} eq "" && !$in{'bridge'}) ||
 if ($in{'bridge'} || $b && $b->{'bridge'}) {
 	@ethboot = sort { $a cmp $b }
 		     map { $_->{'fullname'} }
-		       grep { $_->{'fullname'} =~ /^(eth|vlan|bond)/ &&
+		       grep { ($_->{'fullname'} =~ /^(vlan|bond)/ ||
+			       &iface_type($_->{'fullname'}) eq 'Ethernet') &&
 			      $_->{'virtual'} eq '' } @boot;
 	print &ui_table_row($text{'bifc_bridgeto'},
 		&ui_select("bridgeto", $b->{'bridgeto'},
diff --git a/net/save_bifc.cgi b/net/save_bifc.cgi
index 00f363c0f..d9608c9f6 100755
--- a/net/save_bifc.cgi
+++ b/net/save_bifc.cgi
@@ -299,7 +299,7 @@ else {
 	# Save bridge settings
 	if ($b->{'bridge'}) {
 		if ($in{'bridgeto'}) {
-			($in{'bridgeto'} =~ /^eth\d+$/ || $in{'bridgeto'} =~ /^eth\d+.\d+$/) ||
+			&iface_type($in{'bridgeto'}) eq 'Ethernet' ||
 				&error($text{'bifc_ebridgeto'});
 			($bt) = grep { $_->{'fullname'} eq $in{'bridgeto'} }
 				     @boot;