Browse Source

update patches

Karsten Böddeker 8 years ago
parent
commit
ab1907e6b5

+ 2 - 2
patches/0001-fix-ubnt-model-detection.patch

@@ -21,7 +21,7 @@ index 0000000..79180b4
 +Signed-off-by: Neal Oakey <neal.oakey@bingo-ev.de>
 +
 +diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-+index 5768286..7f50d8a 100755
++index dab4d2c..e7b3cd2 100755
 +--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
 ++++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
 +@@ -64,6 +64,40 @@ wndr3700_board_detect() {
@@ -89,7 +89,7 @@ index 0000000..79180b4
 + 	*"Rocket M XW")
 + 		name="rocket-m-xw"
 diff --git a/targets/ar71xx-generic/profiles.mk b/targets/ar71xx-generic/profiles.mk
-index 14fee2a..316064d 100644
+index 4a63667..da178ea 100644
 --- a/targets/ar71xx-generic/profiles.mk
 +++ b/targets/ar71xx-generic/profiles.mk
 @@ -162,12 +162,19 @@ $(eval $(call GluonModel,UBNT,ubnt-air-gateway,ubiquiti-airgateway))

+ 2 - 2
patches/0002-openwrt-patch-iw.patch

@@ -3,13 +3,13 @@ Date: Sat, 23 Apr 2016 15:20:30 +0200
 Subject: [PATCH] openwrt: patch iw
 
 ---
- .../openwrt/1001-iw-patch-200-reduce_size.patch.patch   | 23 +++++++++++++++++++++
+ .../1001-iw-patch-200-reduce-size-patch.patch      | 23 ++++++++++++++++++++++
  1 file changed, 23 insertions(+)
  create mode 100644 patches/openwrt/1001-iw-patch-200-reduce-size-patch.patch
 
 diff --git a/patches/openwrt/1001-iw-patch-200-reduce-size-patch.patch b/patches/openwrt/1001-iw-patch-200-reduce-size-patch.patch
 new file mode 100644
-index 0000000..6f59663
+index 0000000..09c978e
 --- /dev/null
 +++ b/patches/openwrt/1001-iw-patch-200-reduce-size-patch.patch
 @@ -0,0 +1,23 @@

+ 1 - 1
patches/0003-scripts-add-function-needed_var_in_array-to-check_si.patch

@@ -1,6 +1,6 @@
 From: Karsten Böddeker <freifunk@kb-light.de>
 Date: Thu, 30 Jun 2016 21:40:28 +0200
-Subject: [PATCH 1/2] scripts: add function needed_var_in_array to
+Subject: [PATCH] scripts: add function needed_var_in_array to
  check_site_lib.lua
 
 The function need_var_in_array(varname, array, required) checks weather a value of a variable (specified by its name) is included in an array.

+ 18 - 14
patches/0004-gluon-core-make-wifi-rates-configurable-by-site.conf.patch

@@ -1,17 +1,17 @@
 From: Karsten Böddeker <freifunk@kb-light.de>
-Date: Thu, 30 Jun 2016 23:39:08 +0200
-Subject: [PATCH 2/2] gluon-core: make wifi rates configurable by site.conf
+Date: Fri, 1 Jul 2016 14:53:39 +0200
+Subject: [PATCH] gluon-core: make wifi rates configurable by site.conf
 
 and add documentation
 ---
- docs/site-example/site.conf                             | 8 ++++++++
- docs/user/site.rst                                      | 8 ++++++++
- package/gluon-core/check_site.lua                       | 8 ++++++++
- package/gluon-core/files/lib/gluon/upgrade/200-wireless | 8 ++++++++
- 4 files changed, 32 insertions(+)
+ docs/site-example/site.conf                             |  8 ++++++++
+ docs/user/site.rst                                      |  8 ++++++++
+ package/gluon-core/check_site.lua                       |  8 ++++++++
+ package/gluon-core/files/lib/gluon/upgrade/200-wireless | 12 ++++++++++++
+ 4 files changed, 36 insertions(+)
 
 diff --git a/docs/site-example/site.conf b/docs/site-example/site.conf
-index b58f525..19fe740 100644
+index b58f525..1f67aab 100644
 --- a/docs/site-example/site.conf
 +++ b/docs/site-example/site.conf
 @@ -35,6 +35,14 @@
@@ -20,17 +20,17 @@ index b58f525..19fe740 100644
  
 +    -- List of supported wifi rates (optional, implies basic_rate)
 +    -- Example removes 802.11b compatibility for better performance
-+    -- supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
++    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
 +
 +    -- List of basic wifi rates (optional)
 +    -- Example removes 802.11b compatibility for better performance
-+    -- basic_rate = {6000, 9000, 18000, 36000, 54000},
++    basic_rate = {6000, 9000, 18000, 36000, 54000},
 +
      -- ESSID used for client network.
      ap = {
        ssid = 'entenhausen.freifunk.net',
 diff --git a/docs/user/site.rst b/docs/user/site.rst
-index b26a28a..e449bcb 100644
+index b26a28a..1ba9b4a 100644
 --- a/docs/user/site.rst
 +++ b/docs/user/site.rst
 @@ -95,6 +95,12 @@ wifi24 : optional
@@ -38,7 +38,7 @@ index b26a28a..e449bcb 100644
      Upgrades will not changed the disabled state.
  
 +    Additionally it is possible to configure the ``supported_rates`` and ``basic_rate``
-+    of each radio. Booth are optional and defaults to hostapd/driver default. But
++    of each radio. Both are optional, by default hostapd/driver dictate the rates.
 +    ``supported_rates`` implies ``basic_rate``, because ``basic_rate`` has to be a subset
 +    of ``supported_rates``.
 +    The example below disables 802.11b rates.
@@ -74,20 +74,24 @@ index 1647d77..555360a 100644
    end
  end
 diff --git a/package/gluon-core/files/lib/gluon/upgrade/200-wireless b/package/gluon-core/files/lib/gluon/upgrade/200-wireless
-index 5a98a70..a469683 100755
+index 5a98a70..d217428 100755
 --- a/package/gluon-core/files/lib/gluon/upgrade/200-wireless
 +++ b/package/gluon-core/files/lib/gluon/upgrade/200-wireless
-@@ -17,6 +17,14 @@ local function configure_radio(radio, index, config)
+@@ -17,6 +17,18 @@ local function configure_radio(radio, index, config)
      uci:set('wireless', radio, 'channel', config.channel)
      uci:set('wireless', radio, 'htmode', 'HT20')
      uci:set('wireless', radio, 'country', site.regdom)
 +
 +    if config.supported_rates then
 +      uci:set_list('wireless', radio, 'supported_rates', config.supported_rates)
++    else
++      uci:delete('wireless', radio, 'supported_rates')
 +    end
 +
 +    if config.basic_rate then
 +      uci:set_list('wireless', radio, 'basic_rate', config.basic_rate)
++    else
++      uci:delete('wireless', radio, 'basic_rate')
 +    end
    end
  end