From 94d6593659579896367bcaf05a332bad976e5246 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Sun, 11 Dec 2016 02:35:19 +0100
Subject: [PATCH] cpe: tune wifis

---
 salt-pillar/cpe/aps.sls | 20 ++++++++++----------
 salt/cpe/ap.sh          |  1 +
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/salt-pillar/cpe/aps.sls b/salt-pillar/cpe/aps.sls
index c4d5d0a..2eabca2 100644
--- a/salt-pillar/cpe/aps.sls
+++ b/salt-pillar/cpe/aps.sls
@@ -15,7 +15,7 @@ cpe:
       =QPF0
       -----END PGP MESSAGE-----
     model: TL-WR841N
-    location: abhanden
+    location: In stock
     lan-access: pub
     radios:
       'platform/qca953x_wmac':
@@ -58,12 +58,12 @@ cpe:
       -----END PGP MESSAGE-----
 
     model: TL-Archer-C7v2
-    location: Netzbiotop Main
+    location: C3D2 Main
     lan-access: priv1
     radios:
       'platform/qca955x_wmac':
-        channel: 11
-        htmode: HT40-
+        channel: 1
+        htmode: HT40+
         ssids:
           'ZW public':
             net: pub
@@ -120,12 +120,12 @@ cpe:
       -----END PGP MESSAGE-----
 
     model: TL-WDR4300
-    location: weg
+    location: C3D2 Kammer
     lan-access: priv1
     radios:
       'platform/ar934x_wmac':
-        channel: 6
-        htmode: HT40+
+        channel: 13
+        htmode: HT40-
         ssids:
           'ZW public':
             net: pub
@@ -145,7 +145,7 @@ cpe:
               =TEEI
               -----END PGP MESSAGE-----
       'pci0000:00/0000:00:00.0':
-        channel: 36
+        channel: 149
         htmode: HT40+
         ssids:
           'ZW public':
@@ -181,7 +181,7 @@ cpe:
       =JLKE
       -----END PGP MESSAGE-----
     model: TL-WR1043ND
-    location: abhanden
+    location: In stock
     lan-access: priv1
     radios:
       'platform/qca955x_wmac':
@@ -221,7 +221,7 @@ cpe:
       =JLKE
       -----END PGP MESSAGE-----
     model: TL-WR1043ND
-    location: abhanden
+    location: In stock
     lan-access: priv1
     radios:
       'platform/qca955x_wmac':
diff --git a/salt/cpe/ap.sh b/salt/cpe/ap.sh
index b3b2df5..e6a25ff 100644
--- a/salt/cpe/ap.sh
+++ b/salt/cpe/ap.sh
@@ -198,6 +198,7 @@ set network.{{ net }}.ifname='{{ ' '.join(ports) }}'
 {%- for path, radio in conf['radios'].items() %}
 set wireless.radio{{ radionum }}=wifi-device
 set wireless.radio{{ radionum }}.type=mac80211
+set wireless.radio{{ radionum }}.country=DE
 set wireless.radio{{ radionum }}.channel={{ radio['channel'] }}
 set wireless.radio{{ radionum }}.path={{ path }}
 set wireless.radio{{ radionum }}.hwmode={{ radio.get('hwmode') or '11n' }}