From 7223c92b843fc232ebe687cb806051ceab31bfff Mon Sep 17 00:00:00 2001
From: Jouke Witteveen <j.witteveen@gmail.com>
Date: Tue, 27 Mar 2012 17:24:56 +0200
Subject: Remove more deprecated code

No need to keep support the "-old" syntax when it doesn't really do anything.
---
 src/8021x                | 10 +++++-----
 src/connections/wireless |  4 ----
 2 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/8021x b/src/8021x
index 0699726..779e741 100644
--- a/src/8021x
+++ b/src/8021x
@@ -191,7 +191,7 @@ make_wpa_config_file() {
 # Requires already loaded profile
 make_wpa_config() {
     case $SECURITY in
-    wep|wep-old|wpa|none|none-old)
+    none|wep|wpa)
         case "${ESSID_TYPE:-ascii}" in
             ascii)
                 echo "ssid=\"$ESSID\""
@@ -220,7 +220,10 @@ make_wpa_config() {
 
     # Key management
     case $SECURITY in
-    wep|wep-old)
+    none)
+        echo "key_mgmt=NONE"
+        ;;
+    wep)
         echo "key_mgmt=NONE"
         echo "wep_tx_keyidx=0"
         if [[ ${KEY:0:2} == "s:" ]]; then # TODO: does wpa_supplicant handle this as expected?
@@ -229,9 +232,6 @@ make_wpa_config() {
             echo "wep_key0=$KEY"
         fi
         ;;
-    none|none-old)
-        echo "key_mgmt=NONE"
-        ;;
     wpa)
         echo "proto=RSN WPA"
         if [[ "${#KEY}" -eq 64 ]]; then
diff --git a/src/connections/wireless b/src/connections/wireless
index 7abb180..a5b7ad2 100644
--- a/src/connections/wireless
+++ b/src/connections/wireless
@@ -10,10 +10,6 @@ wireless_up() {
 
     # Default settings
     SECURITY=${SECURITY:-none}
-    if [[ "$SECURITY" != "${SECURITY%-old}" ]]; then
-        report_warn "SECURITY=none-old, wep-old are deprecated, please use none, wep instead!"
-        SECURITY=${SECURITY%-old}
-    fi
     WPA_DRIVER=${WPA_DRIVER:-nl80211,wext}
 
     enable_rf $INTERFACE $RFKILL $RFKILL_NAME || return 1
-- 
cgit v1.2.3-24-g4f1b