From 7cbea20dfcff525d436d0579dd9821d5b1c78ab3 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 6 Jun 2010 16:59:33 +0200 Subject: [PATCH 1/1] network: Remove deprecated function device_set_mac. --- functions.device | 9 +-------- hooks/bridge | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/functions.device b/functions.device index 03e96011..102c5cea 100644 --- a/functions.device +++ b/functions.device @@ -388,13 +388,6 @@ function device_set_parent_down() { return ${EXIT_OK} } -# Set new address to a device -function device_set_mac() { - warning_log "Called deprecated function 'device_set_mac'" - - device_set_address $@ -} - function device_get_mtu() { local device=${1} @@ -606,7 +599,7 @@ function device_bonding_create() { log INFO "Creating bonding device '${device}' (${mac})." echo "+${device}" > /sys/class/net/bonding_masters - device_set_mac ${mac} + device_set_address ${mac} device_set_up ${device} } diff --git a/hooks/bridge b/hooks/bridge index 257a12fb..2525c48b 100755 --- a/hooks/bridge +++ b/hooks/bridge @@ -75,7 +75,7 @@ function _up() { brctl addbr ${zone} fi - [ -n "${MAC}" ] && device_set_mac ${zone} ${MAC} + [ -n "${MAC}" ] && device_set_address ${zone} ${MAC} [ -n "${MTU}" ] && device_set_mtu ${zone} ${MTU} # Enable STP -- 2.39.2