From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. ad592fb878653d2abf970da02453d4a4893ac0a9 Date: Thu, 09 Apr 2015 15:35:25 +0200 Message-ID: <20150409133526.20DF621ACE@argus.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1544292096552973696==" List-Id: --===============1544292096552973696== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via ad592fb878653d2abf970da02453d4a4893ac0a9 (commit) via 9ee54998cbb36cf1781c0e1ba856992d3d1f068a (commit) via 0f3d0cec24c4a75d59e4a105e5f4d6b24fb6d5aa (commit) from ecb2d6b954ba5f7cee25ac0e46f245c16e49ceaa (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ad592fb878653d2abf970da02453d4a4893ac0a9 Author: Arne Fitzenreiter Date: Thu Apr 9 15:34:14 2015 +0200 backports: rt2x00 supress more queue warnings commit 9ee54998cbb36cf1781c0e1ba856992d3d1f068a Author: Arne Fitzenreiter Date: Thu Apr 9 15:32:42 2015 +0200 hostapd: increase EAPOL timeouts =20 Android clients need more time because sleep modes and low wlan interrupt= priority. commit 0f3d0cec24c4a75d59e4a105e5f4d6b24fb6d5aa Author: Arne Fitzenreiter Date: Thu Apr 9 15:29:25 2015 +0200 strongswan: rootfile update ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/strongswan | 2 -- lfs/backports | 2 +- lfs/hostapd | 3 ++- ...rts-3.18.1-1_rt2x00usb_suppress_queue_warnings.patch} | 14 +++++++++++++- src/patches/hostapd-2.3_increase_EAPOL-timeouts.patch | 16 ++++++++++++++= ++ 5 files changed, 32 insertions(+), 5 deletions(-) rename src/patches/{backports-3.18.1-1_rt2800usb_suppress_queue_warnings.pat= ch =3D> backports-3.18.1-1_rt2x00usb_suppress_queue_warnings.patch} (65%) create mode 100644 src/patches/hostapd-2.3_increase_EAPOL-timeouts.patch Difference in files: diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/str= ongswan index 2abb58e..7564d38 100644 --- a/config/rootfiles/common/strongswan +++ b/config/rootfiles/common/strongswan @@ -147,7 +147,6 @@ usr/lib/ipsec/plugins/libstrongswan-xcbc.so #usr/libexec/ipsec usr/libexec/ipsec/_copyright usr/libexec/ipsec/_updown -usr/libexec/ipsec/_updown_espmark usr/libexec/ipsec/charon usr/libexec/ipsec/scepclient usr/libexec/ipsec/starter @@ -169,7 +168,6 @@ usr/sbin/ipsec #usr/share/man/man5/ipsec.secrets.5 #usr/share/man/man5/strongswan.conf.5 #usr/share/man/man8/_updown.8 -#usr/share/man/man8/_updown_espmark.8 #usr/share/man/man8/ipsec.8 #usr/share/man/man8/openac.8 #usr/share/man/man8/scepclient.8 diff --git a/lfs/backports b/lfs/backports index 96de955..59baacc 100644 --- a/lfs/backports +++ b/lfs/backports @@ -90,7 +90,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-drivers-3.8.3-a= th_ignore_eeprom_regdomain.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.22-iwlwifi-= noibss_only_on_radar_chan.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.37-rt2800us= b_add_dlink_dwa137_usbid.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1_rt2= 800usb_suppress_queue_warnings.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1_rt2= x00usb_suppress_queue_warnings.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1_add= _libertas_uap.patch =20 # smsc mac address patch for pandaboard and raspberry pi diff --git a/lfs/hostapd b/lfs/hostapd index 74c2ae8..2252837 100644 --- a/lfs/hostapd +++ b/lfs/hostapd @@ -32,7 +32,7 @@ DL_FROM =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) PROG =3D hostapd -PAK_VER =3D 33 +PAK_VER =3D 34 =20 DEPS =3D "" =20 @@ -77,6 +77,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/hostapd-2.3_increase_E= APOL-timeouts.patch cd $(DIR_APP)/hostapd && cp $(DIR_SRC)/config/hostapd/config ./.config cd $(DIR_APP)/hostapd && sed -e "s@/usr/local@/usr(a)g" -i Makefile cd $(DIR_APP)/hostapd && make $(MAKETUNING) $(EXTRA_MAKE) diff --git a/src/patches/backports-3.18.1-1_rt2800usb_suppress_queue_warnings= .patch b/src/patches/backports-3.18.1-1_rt2800usb_suppress_queue_warnings.pat= ch deleted file mode 100644 index 8270d31..0000000 --- a/src/patches/backports-3.18.1-1_rt2800usb_suppress_queue_warnings.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Naur backports-3.18.1-1.org/drivers/net/wireless/rt2x00/rt2800usb.c ba= ckports-3.18.1-1/drivers/net/wireless/rt2x00/rt2800usb.c ---- backports-3.18.1-1.org/drivers/net/wireless/rt2x00/rt2800usb.c 2014-12-2= 1 22:37:14.000000000 +0100 -+++ backports-3.18.1-1/drivers/net/wireless/rt2x00/rt2800usb.c 2015-03-29 21= :42:13.865183543 +0200 -@@ -444,7 +444,7 @@ -=20 - rt2x00usb_register_read(rt2x00dev, TXRXQ_PCNT, ®); - if (rt2x00_get_field32(reg, TXRXQ_PCNT_TX0Q)) { -- rt2x00_warn(rt2x00dev, "TX HW queue 0 timed out, invoke forced kick\n"); -+ rt2x00_dbg(rt2x00dev, "TX HW queue 0 timed out, invoke forced kick\n"); -=20 - rt2x00usb_register_write(rt2x00dev, PBF_CFG, 0xf40012); -=20 -@@ -459,7 +459,7 @@ -=20 - rt2x00usb_register_read(rt2x00dev, TXRXQ_PCNT, ®); - if (rt2x00_get_field32(reg, TXRXQ_PCNT_TX1Q)) { -- rt2x00_warn(rt2x00dev, "TX HW queue 1 timed out, invoke forced kick\n"); -+ rt2x00_dbg(rt2x00dev, "TX HW queue 1 timed out, invoke forced kick\n"); -=20 - rt2x00usb_register_write(rt2x00dev, PBF_CFG, 0xf4000a); -=20 -@@ -609,7 +609,7 @@ -=20 - if (unlikely(test_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags) || - !test_bit(ENTRY_DATA_STATUS_PENDING, &entry->flags))) { -- rt2x00_warn(rt2x00dev, "Data pending for entry %u in queue %u\n", -+ rt2x00_dbg(rt2x00dev, "Data pending for entry %u in queue %u\n", - entry->entry_idx, qid); - break; - } diff --git a/src/patches/backports-3.18.1-1_rt2x00usb_suppress_queue_warnings= .patch b/src/patches/backports-3.18.1-1_rt2x00usb_suppress_queue_warnings.pat= ch new file mode 100644 index 0000000..3f9308e --- /dev/null +++ b/src/patches/backports-3.18.1-1_rt2x00usb_suppress_queue_warnings.patch @@ -0,0 +1,42 @@ +diff -Naur backports-3.18.1-1.org/drivers/net/wireless/rt2x00/rt2800usb.c ba= ckports-3.18.1-1/drivers/net/wireless/rt2x00/rt2800usb.c +--- backports-3.18.1-1.org/drivers/net/wireless/rt2x00/rt2800usb.c 2014-12-2= 1 22:37:14.000000000 +0100 ++++ backports-3.18.1-1/drivers/net/wireless/rt2x00/rt2800usb.c 2015-04-07 11= :44:16.647963570 +0200 +@@ -444,7 +444,7 @@ +=20 + rt2x00usb_register_read(rt2x00dev, TXRXQ_PCNT, ®); + if (rt2x00_get_field32(reg, TXRXQ_PCNT_TX0Q)) { +- rt2x00_warn(rt2x00dev, "TX HW queue 0 timed out, invoke forced kick\n"); ++ rt2x00_dbg(rt2x00dev, "TX HW queue 0 timed out, invoke forced kick\n"); +=20 + rt2x00usb_register_write(rt2x00dev, PBF_CFG, 0xf40012); +=20 +@@ -459,7 +459,7 @@ +=20 + rt2x00usb_register_read(rt2x00dev, TXRXQ_PCNT, ®); + if (rt2x00_get_field32(reg, TXRXQ_PCNT_TX1Q)) { +- rt2x00_warn(rt2x00dev, "TX HW queue 1 timed out, invoke forced kick\n"); ++ rt2x00_dbg(rt2x00dev, "TX HW queue 1 timed out, invoke forced kick\n"); +=20 + rt2x00usb_register_write(rt2x00dev, PBF_CFG, 0xf4000a); +=20 +@@ -609,7 +609,7 @@ +=20 + if (unlikely(test_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags) || + !test_bit(ENTRY_DATA_STATUS_PENDING, &entry->flags))) { +- rt2x00_warn(rt2x00dev, "Data pending for entry %u in queue %u\n", ++ rt2x00_dbg(rt2x00dev, "Data pending for entry %u in queue %u\n", + entry->entry_idx, qid); + break; + } +diff -Naur backports-3.18.1-1.org/drivers/net/wireless/rt2x00/rt2x00usb.c ba= ckports-3.18.1-1/drivers/net/wireless/rt2x00/rt2x00usb.c +--- backports-3.18.1-1.org/drivers/net/wireless/rt2x00/rt2x00usb.c 2014-12-2= 1 22:37:14.000000000 +0100 ++++ backports-3.18.1-1/drivers/net/wireless/rt2x00/rt2x00usb.c 2015-04-07 11= :42:41.723492892 +0200 +@@ -524,7 +524,7 @@ +=20 + static void rt2x00usb_watchdog_tx_dma(struct data_queue *queue) + { +- rt2x00_warn(queue->rt2x00dev, "TX queue %d DMA timed out, invoke forced fo= rced reset\n", ++ rt2x00_dbg(queue->rt2x00dev, "TX queue %d DMA timed out, invoke forced res= et\n", + queue->qid); +=20 + rt2x00queue_stop_queue(queue); diff --git a/src/patches/hostapd-2.3_increase_EAPOL-timeouts.patch b/src/patc= hes/hostapd-2.3_increase_EAPOL-timeouts.patch new file mode 100644 index 0000000..bbda55a --- /dev/null +++ b/src/patches/hostapd-2.3_increase_EAPOL-timeouts.patch @@ -0,0 +1,16 @@ +diff -Naur hostapd-2.3.org/src/ap/wpa_auth.c hostapd-2.3/src/ap/wpa_auth.c +--- hostapd-2.3.org/src/ap/wpa_auth.c 2014-10-09 16:41:31.000000000 +0200 ++++ hostapd-2.3/src/ap/wpa_auth.c 2015-04-07 16:32:10.671422975 +0200 +@@ -45,9 +45,9 @@ +=20 + static const u32 dot11RSNAConfigGroupUpdateCount =3D 4; + static const u32 dot11RSNAConfigPairwiseUpdateCount =3D 4; +-static const u32 eapol_key_timeout_first =3D 100; /* ms */ +-static const u32 eapol_key_timeout_subseq =3D 1000; /* ms */ +-static const u32 eapol_key_timeout_first_group =3D 500; /* ms */ ++static const u32 eapol_key_timeout_first =3D 300; /* ms */ ++static const u32 eapol_key_timeout_subseq =3D 3000; /* ms */ ++static const u32 eapol_key_timeout_first_group =3D 1500; /* ms */ +=20 + /* TODO: make these configurable */ + static const int dot11RSNAConfigPMKLifetime =3D 43200; hooks/post-receive -- IPFire 2.x development tree --===============1544292096552973696==--