From 8c6a8966045010adc9dfb42ab5d97fbfa679930f Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 23 Jul 2010 15:31:11 +0200
Subject: [PATCH] network: Remove deprecated functions.

---
 functions.device    | 18 +++---------------
 functions.ethernet  | 13 -------------
 functions.virtual   | 25 -------------------------
 hooks/ports/virtual |  4 ++--
 4 files changed, 5 insertions(+), 55 deletions(-)

diff --git a/functions.device b/functions.device
index 8ee7ca53..d0ab0ce3 100644
--- a/functions.device
+++ b/functions.device
@@ -121,12 +121,6 @@ function device_has_virtuals() {
 	grep -q "${1}$" /proc/net/vlan/config
 }
 
-function device_is_vlan() { # XXX Compat function
-	log DEBUG "Deprecated function device_is_vlan() was used."
-
-	device_is_virtual $@
-}
-
 # Check if the device is a ppp device
 function device_is_ppp() {
 	local device=${1}
@@ -166,7 +160,7 @@ function device_is_real() {
 function device_get_type() {
 	local device=$(devicify ${1})
 
-	if device_is_vlan ${device}; then
+	if device_is_virtual ${device}; then
 		echo "vlan"
 
 	elif device_is_bonding ${device}; then
@@ -317,12 +311,6 @@ function device_get_free() {
 	echo "${destination}"
 }
 
-function device_rename() {
-	warning_log "Called deprecated function 'device_rename'"
-
-	device_set_name $@
-}
-
 function device_hash() {
 	local device=${1}
 
@@ -378,7 +366,7 @@ function device_set_parent_up() {
 	local parent
 
 	if device_is_virtual ${device}; then
-		parent=$(device_virtual_get_parent ${device})
+		parent=$(virtual_get_parent ${device})
 
 		device_is_up ${parent} && return ${EXIT_OK}
 
@@ -414,7 +402,7 @@ function device_set_parent_down() {
 	local parent
 
 	if device_is_virtual ${device}; then
-		parent=$(device_virtual_get_parent ${device})
+		parent=$(virtual_get_parent ${device})
 
 		device_is_up ${parent} || return ${EXIT_OK}
 
diff --git a/functions.ethernet b/functions.ethernet
index f0bfbc07..189950fe 100644
--- a/functions.ethernet
+++ b/functions.ethernet
@@ -1,15 +1,2 @@
 #!/bin/bash
 # XXX header missing
-
-function ethernet_device_print() {
-	local device=${1}
-
-	printf "${DEVICE_PRINT_LINE1}" "Address:" "$(device_get_address ${device})"
-	printf "${DEVICE_PRINT_LINE1}" "MTU:"     "$(device_get_mtu ${device})"
-}
-
-function real_device_print() {
-	warning_log "Deprecated function called: real_device_print"
-
-	ethernet_device_print $@
-}
diff --git a/functions.virtual b/functions.virtual
index 74347d73..b9d03354 100644
--- a/functions.virtual
+++ b/functions.virtual
@@ -36,11 +36,6 @@ EOF
 
 init_register virtual_init
 
-function device_create_virtual() {
-	log WARN "Called deprecated function device_create_virtual"
-	device_virtual_create $@
-}
-
 function virtual_create() {
 	local port=$(devicify ${1})
 	local vid=${2}
@@ -181,23 +176,3 @@ function virtual_get_by_parent_and_vid() {
 
 	return ${EXIT_ERROR}
 }
-
-function device_virtual_create() {
-	log WARN "Called deprecated function device_virtual_create"
-	virtual_create $@
-}
-
-function device_virtual_remove() {
-	log WARN "Called deprecated function device_virtual_remove"
-	virtual_remove $@
-}
-
-function device_virtual_get_parent() {
-	log WARN "Called deprecated function device_virtual_get_parent"
-	virtual_get_parent $@
-}
-
-function device_virtual_get_by_parent_and_vid() {
-	log WARN "Called deprecated function device_virtual_get_by_parent_and_vid"
-	virtual_get_by_parent_and_vid $@
-}
diff --git a/hooks/ports/virtual b/hooks/ports/virtual
index 4c35ebce..10f0b80d 100755
--- a/hooks/ports/virtual
+++ b/hooks/ports/virtual
@@ -103,7 +103,7 @@ function _up() {
 	config_read $(port_file ${port})
 
 	if ! device_exists ${port}; then
-		device_virtual_create ${DEVICE} ${DEVICE_VID} ${DEVICE_MAC}
+		virtual_create ${DEVICE} ${DEVICE_VID} ${DEVICE_MAC}
 	fi
 
 	exit ${EXIT_OK}
@@ -120,7 +120,7 @@ function _down() {
 		exit ${EXIT_OK}
 	fi
 
-	device_virtual_remove ${port}
+	virtual_remove ${port}
 
 	exit ${EXIT_OK}
 }
-- 
2.39.2