Skip to content
This repository was archived by the owner on May 21, 2024. It is now read-only.

Commit 9d32be8

Browse files
mwarningmwarning
committed
gluon: udpate gluon patches
1 parent cec0f5b commit 9d32be8

6 files changed

+232
-11
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ Install dependencies for the build environment (Debian/Ubuntu):
1919
Build commands for the console:
2020

2121
```bash
22-
git clone -b lede-17.01 git://git.lede-project.org/source.git
23-
cd source
22+
git clone -b lede-17.01 git://git.lede-project.org/source.git && cd source
23+
git reset --hard 3dbc4175a82c0cfe6c8f435b49bd9370ab442a4f
2424

2525
./scripts/feeds update -a
2626
./scripts/feeds install -a

‎patches/lede/0001-extend-small-flash-option.patch‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
From 2127b14539b016ff3e37dd2598571fc5547c90e4 Mon Sep 17 00:00:00 2001
1+
From b2701eec52f77fd16b76e433bf2a7799477f850f Mon Sep 17 00:00:00 2001
22
From: Moritz Warning <moritzwarning@web.de>
33
Date: Sun, 29 Jan 2017 22:10:01 +0100
4-
Subject: [PATCH 1/2] extend small flash option
4+
Subject: [PATCH 1/5] extend small flash option
55

66
---
77
config/Config-build.in | 2 ++
88
config/Config-kernel.in | 2 +-
99
2 files changed, 3 insertions(+), 1 deletion(-)
1010

1111
diff --git a/config/Config-build.in b/config/Config-build.in
12-
index 9b8e4b2283..ae4ca6308a 100644
12+
index e0889fcccf..5bf7176fda 100644
1313
--- a/config/Config-build.in
1414
+++ b/config/Config-build.in
15-
@@ -127,6 +127,7 @@ menu "Global build settings"
15+
@@ -137,6 +137,7 @@ menu "Global build settings"
1616

1717
config STRIP_KERNEL_EXPORTS
1818
bool "Strip unnecessary exports from the kernel image"
1919
+ default y if SMALL_FLASH
2020
help
2121
Reduces kernel size by stripping unused kernel exports from the kernel
2222
image. Note that this might make the kernel incompatible with any kernel
23-
@@ -134,6 +135,7 @@ menu "Global build settings"
23+
@@ -144,6 +145,7 @@ menu "Global build settings"
2424

2525
config USE_MKLIBS
2626
bool "Strip unnecessary functions from libraries"
@@ -42,5 +42,5 @@ index a4c46f55ae..8033c6e193 100644
4242
help
4343
This will compile your kernel and modules with debug information.
4444
--
45-
2.11.0
45+
2.12.2
4646

patches/lede/0001-remove-default-selection-of-ppp.patch renamed to patches/lede/0002-remove-default-selection-of-ppp.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 0385bd02365720b84cf0df02b1fc6ed39f343f41 Mon Sep 17 00:00:00 2001
1+
From bc293318fa98c2298ca27fcbfaa8c03d2af6bd67 Mon Sep 17 00:00:00 2001
22
From: Moritz Warning <moritzwarning@web.de>
33
Date: Sun, 12 Feb 2017 12:09:43 +0100
4-
Subject: [PATCH 1/1] remove default selection of ppp
4+
Subject: [PATCH 2/5] remove default selection of ppp
55

66
---
77
include/target.mk | 2 +-
@@ -21,5 +21,5 @@ index 30994485e1..8f6971f2c4 100644
2121

2222
ifneq ($(DUMP),)
2323
--
24-
2.11.1
24+
2.12.2
2525

‎patches/lede/0003-hostapd-prevent-channel-switch-for-5GHz.patch‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
From 416449c68e9f75c92774eeeec9ed32d4b5cd7f6f Mon Sep 17 00:00:00 2001
2+
From: Matthias Schiffer <mschiffer@universe-factory.net>
3+
Date: Mon, 27 Jul 2015 20:42:50 +0200
4+
Subject: [PATCH 3/5] hostapd: prevent channel switch for 5GHz
5+
6+
hostapd would switch the primary and secondary channel on 5GHz networks in
7+
certain circumstances, completely breaking the adhoc interfaces of the WLAN
8+
adapter (they would lose their configuration).
9+
10+
As a temporary fix, disable this channel switch function.
11+
---
12+
.../hostapd/patches/900-no_channel_switch.patch | 68 ++++++++++++++++++++++
13+
1 file changed, 68 insertions(+)
14+
create mode 100644 package/network/services/hostapd/patches/900-no_channel_switch.patch
15+
16+
diff --git a/package/network/services/hostapd/patches/900-no_channel_switch.patch b/package/network/services/hostapd/patches/900-no_channel_switch.patch
17+
new file mode 100644
18+
index 0000000000..c614515692
19+
--- /dev/null
20+
+++ b/package/network/services/hostapd/patches/900-no_channel_switch.patch
21+
@@ -0,0 +1,68 @@
22+
+--- a/src/common/hw_features_common.c
23+
++++ b/src/common/hw_features_common.c
24+
+@@ -171,7 +171,6 @@ int check_40mhz_5g(struct hostapd_hw_mod
25+
+ struct wpa_scan_results *scan_res, int pri_chan,
26+
+ int sec_chan)
27+
+ {
28+
+- int pri_freq, sec_freq, pri_bss, sec_bss;
29+
+ int bss_pri_chan, bss_sec_chan;
30+
+ size_t i;
31+
+ int match;
32+
+@@ -180,57 +179,6 @@ int check_40mhz_5g(struct hostapd_hw_mod
33+
+ pri_chan == sec_chan)
34+
+ return 0;
35+
+
36+
+- pri_freq = hw_get_freq(mode, pri_chan);
37+
+- sec_freq = hw_get_freq(mode, sec_chan);
38+
+-
39+
+- /*
40+
+- * Switch PRI/SEC channels if Beacons were detected on selected SEC
41+
+- * channel, but not on selected PRI channel.
42+
+- */
43+
+- pri_bss = sec_bss = 0;
44+
+- for (i = 0; i < scan_res->num; i++) {
45+
+- struct wpa_scan_res *bss = scan_res->res[i];
46+
+- if (bss->freq == pri_freq)
47+
+- pri_bss++;
48+
+- else if (bss->freq == sec_freq)
49+
+- sec_bss++;
50+
+- }
51+
+- if (sec_bss && !pri_bss) {
52+
+- wpa_printf(MSG_INFO,
53+
+- "Switch own primary and secondary channel to get secondary channel with no Beacons from other BSSes");
54+
+- return 2;
55+
+- }
56+
+-
57+
+- /*
58+
+- * Match PRI/SEC channel with any existing HT40 BSS on the same
59+
+- * channels that we are about to use (if already mixed order in
60+
+- * existing BSSes, use own preference).
61+
+- */
62+
+- match = 0;
63+
+- for (i = 0; i < scan_res->num; i++) {
64+
+- struct wpa_scan_res *bss = scan_res->res[i];
65+
+- get_pri_sec_chan(bss, &bss_pri_chan, &bss_sec_chan);
66+
+- if (pri_chan == bss_pri_chan &&
67+
+- sec_chan == bss_sec_chan) {
68+
+- match = 1;
69+
+- break;
70+
+- }
71+
+- }
72+
+- if (!match) {
73+
+- for (i = 0; i < scan_res->num; i++) {
74+
+- struct wpa_scan_res *bss = scan_res->res[i];
75+
+- get_pri_sec_chan(bss, &bss_pri_chan, &bss_sec_chan);
76+
+- if (pri_chan == bss_sec_chan &&
77+
+- sec_chan == bss_pri_chan) {
78+
+- wpa_printf(MSG_INFO, "Switch own primary and "
79+
+- "secondary channel due to BSS "
80+
+- "overlap with " MACSTR,
81+
+- MAC2STR(bss->bssid));
82+
+- return 2;
83+
+- }
84+
+- }
85+
+- }
86+
+-
87+
+ return 1;
88+
+ }
89+
+
90+
--
91+
2.12.2
92+

‎patches/lede/0004-netifd-update-to-git-HEAD-version.patch‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
From 8df38fa0e30ca1177d7387266aae4be4012b4c1c Mon Sep 17 00:00:00 2001
2+
From: Matthias Schiffer <mschiffer@universe-factory.net>
3+
Date: Fri, 10 Mar 2017 01:58:42 +0100
4+
Subject: [PATCH 4/5] netifd: update to git HEAD version
5+
6+
91810ec system-linux: add VXLAN support
7+
f107656 netifd: Add option to configure locktime for each device
8+
cdc0e80 interface: add prefix assignment priority support
9+
6397f5e device: add veth support
10+
6228d0f wireless: fix _wireless_add_process
11+
7cc2f10 treewide: fix white space errors
12+
---
13+
package/network/config/netifd/Makefile | 6 +++---
14+
1 file changed, 3 insertions(+), 3 deletions(-)
15+
16+
diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile
17+
index fb03586401..d6d91ba014 100644
18+
--- a/package/network/config/netifd/Makefile
19+
+++ b/package/network/config/netifd/Makefile
20+
@@ -5,9 +5,9 @@ PKG_RELEASE:=1
21+
22+
PKG_SOURCE_PROTO:=git
23+
PKG_SOURCE_URL=$(LEDE_GIT)/project/netifd.git
24+
-PKG_SOURCE_DATE:=2017-01-25
25+
-PKG_SOURCE_VERSION:=650758b16e5185505a3fbc1307949340af70b611
26+
-PKG_MIRROR_HASH:=d09c740bc1bf6269678bd75c9af52ecd4be3d1d59402a543ceb9d4459cecfa2b
27+
+PKG_SOURCE_DATE:=2017-03-07
28+
+PKG_SOURCE_VERSION:=91810ecc13239f3b18c8299de265b4f3531c0017
29+
+PKG_MIRROR_HASH:=51d0a8866c6b004185f1fb83f37e7aed33fc94b72bd85954c773549a57c3c761
30+
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
31+
32+
PKG_LICENSE:=GPL-2.0
33+
--
34+
2.12.2
35+

‎patches/lede/0005-mac80211-revert-upstream-change-breaking-AP-11s-VIF-.patch‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
From 59f355007d08f4976f07d88bcb21daf612734a42 Mon Sep 17 00:00:00 2001
2+
From: Matthias Schiffer <mschiffer@universe-factory.net>
3+
Date: Sat, 11 Mar 2017 06:15:18 +0100
4+
Subject: [PATCH 5/5] mac80211: revert upstream change breaking AP+11s VIF
5+
combinations
6+
7+
Fixes FS#619.
8+
9+
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
10+
---
11+
...0211-validate-new-interface-s-beacon-inte.patch | 48 ++++++++++++++++++++++
12+
.../522-mac80211_configure_antenna_gain.patch | 4 +-
13+
2 files changed, 50 insertions(+), 2 deletions(-)
14+
create mode 100644 package/kernel/mac80211/patches/323-Revert-mac80211-validate-new-interface-s-beacon-inte.patch
15+
16+
diff --git a/package/kernel/mac80211/patches/323-Revert-mac80211-validate-new-interface-s-beacon-inte.patch b/package/kernel/mac80211/patches/323-Revert-mac80211-validate-new-interface-s-beacon-inte.patch
17+
new file mode 100644
18+
index 0000000000..60d0e9181e
19+
--- /dev/null
20+
+++ b/package/kernel/mac80211/patches/323-Revert-mac80211-validate-new-interface-s-beacon-inte.patch
21+
@@ -0,0 +1,48 @@
22+
+From: Matthias Schiffer <mschiffer@universe-factory.net>
23+
+Date: Sat, 11 Mar 2017 06:07:03 +0100
24+
+Subject: [PATCH] Revert "mac80211: validate new interface's beacon intervals"
25+
+
26+
+This reverts commit ac668afe414b1d41366f92a33b4d32428335db54, as it
27+
+prevents simultaneous operation of AP and mesh point VIFs.
28+
+
29+
+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
30+
+---
31+
+
32+
+--- a/net/mac80211/cfg.c
33+
++++ b/net/mac80211/cfg.c
34+
+@@ -864,8 +864,6 @@ static int ieee80211_start_ap(struct wip
35+
+ }
36+
+ sdata->needed_rx_chains = sdata->local->rx_chains;
37+
+
38+
+- sdata->vif.bss_conf.beacon_int = params->beacon_interval;
39+
+-
40+
+ mutex_lock(&local->mtx);
41+
+ err = ieee80211_vif_use_channel(sdata, &params->chandef,
42+
+ IEEE80211_CHANCTX_SHARED);
43+
+@@ -896,6 +894,7 @@ static int ieee80211_start_ap(struct wip
44+
+ vlan->vif.type);
45+
+ }
46+
+
47+
++ sdata->vif.bss_conf.beacon_int = params->beacon_interval;
48+
+ sdata->vif.bss_conf.dtim_period = params->dtim_period;
49+
+ sdata->vif.bss_conf.enable_beacon = true;
50+
+ sdata->vif.bss_conf.allow_p2p_go_ps = sdata->vif.p2p;
51+
+--- a/net/mac80211/util.c
52+
++++ b/net/mac80211/util.c
53+
+@@ -3330,16 +3330,6 @@ int ieee80211_check_combinations(struct
54+
+ if (WARN_ON(iftype >= NUM_NL80211_IFTYPES))
55+
+ return -EINVAL;
56+
+
57+
+- if (sdata->vif.type == NL80211_IFTYPE_AP ||
58+
+- sdata->vif.type == NL80211_IFTYPE_MESH_POINT) {
59+
+- /*
60+
+- * always passing this is harmless, since it'll be the
61+
+- * same value that cfg80211 finds if it finds the same
62+
+- * interface ... and that's always allowed
63+
+- */
64+
+- params.new_beacon_int = sdata->vif.bss_conf.beacon_int;
65+
+- }
66+
+-
67+
+ /* Always allow software iftypes */
68+
+ if (local->hw.wiphy->software_iftypes & BIT(iftype)) {
69+
+ if (radar_detect)
70+
diff --git a/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch b/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch
71+
index 9a0f6f5dbd..6856d6919d 100644
72+
--- a/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch
73+
+++ b/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch
74+
@@ -57,7 +57,7 @@
75+
__NL80211_ATTR_AFTER_LAST,
76+
--- a/net/mac80211/cfg.c
77+
+++ b/net/mac80211/cfg.c
78+
-@@ -2396,6 +2396,19 @@ static int ieee80211_get_tx_power(struct
79+
+@@ -2395,6 +2395,19 @@ static int ieee80211_get_tx_power(struct
80+
return 0;
81+
}
82+
83+
@@ -77,7 +77,7 @@
84+
static int ieee80211_set_wds_peer(struct wiphy *wiphy, struct net_device *dev,
85+
const u8 *addr)
86+
{
87+
-@@ -3627,6 +3640,7 @@ const struct cfg80211_ops mac80211_confi
88+
+@@ -3626,6 +3639,7 @@ const struct cfg80211_ops mac80211_confi
89+
.set_wiphy_params = ieee80211_set_wiphy_params,
90+
.set_tx_power = ieee80211_set_tx_power,
91+
.get_tx_power = ieee80211_get_tx_power,
92+
--
93+
2.12.2
94+

0 commit comments

Comments
 (0)