forked from freifunk-franken/firmware
Compare commits
23 Commits
Author | SHA1 | Date |
---|---|---|
Adrian Schmutzler | ca107276c2 | |
Adrian Schmutzler | 19ff2e81a0 | |
Fabian Bläse | a87c756485 | |
Robert Langhammer | af89738650 | |
Adrian Schmutzler | c9a4562bb4 | |
Fabian Bläse | 8f4c2f7c06 | |
Robert Langhammer | ddb6b28368 | |
Fabian Bläse | 6ca1c4a368 | |
Fabian Bläse | fb00f1d86c | |
Fabian Bläse | 993f167c51 | |
Adrian Schmutzler | 2114a99dac | |
Johannes Kimmel | 96c56894ac | |
Adrian Schmutzler | a2ab02cab9 | |
Adrian Schmutzler | 5ca2dbaff8 | |
Fabian Bläse | c8e0dcd7f4 | |
Fabian Bläse | 779f5c1c47 | |
Johannes Kimmel | 59ee8d64aa | |
Christian Dresel | d1aef8e20c | |
Christian Dresel | 6275094992 | |
Fabian Bläse | 034d459fc0 | |
Christian Dresel | 42e6dfdf5e | |
Christian Dresel | 04e6dd8e51 | |
Christian Dresel | 706736eeca |
356
LICENSES/GPL-2.0
356
LICENSES/GPL-2.0
|
@ -1,356 +0,0 @@
|
||||||
Valid-License-Identifier: GPL-2.0-only
|
|
||||||
Valid-License-Identifier: GPL-2.0
|
|
||||||
Valid-License-Identifier: GPL-2.0-or-later
|
|
||||||
Valid-License-Identifier: GPL-2.0+
|
|
||||||
SPDX-URL: https://spdx.org/licenses/GPL-2.0-only.html
|
|
||||||
SPDX-URL: https://spdx.org/licenses/GPL-2.0-or-later.html
|
|
||||||
Usage-Guide:
|
|
||||||
To use this license in source code, put one of the following SPDX
|
|
||||||
tag/value pairs into a comment according to the placement
|
|
||||||
guidelines in the licensing rules documentation.
|
|
||||||
For 'GNU General Public License (GPL) version 2 only' use:
|
|
||||||
SPDX-License-Identifier: GPL-2.0-only
|
|
||||||
For 'GNU General Public License (GPL) version 2 or any later version' use:
|
|
||||||
SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
License-Text:
|
|
||||||
|
|
||||||
GNU GENERAL PUBLIC LICENSE
|
|
||||||
Version 2, June 1991
|
|
||||||
|
|
||||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
|
|
||||||
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
|
||||||
of this license document, but changing it is not allowed.
|
|
||||||
|
|
||||||
Preamble
|
|
||||||
|
|
||||||
The licenses for most software are designed to take away your
|
|
||||||
freedom to share and change it. By contrast, the GNU General Public
|
|
||||||
License is intended to guarantee your freedom to share and change free
|
|
||||||
software--to make sure the software is free for all its users. This
|
|
||||||
General Public License applies to most of the Free Software
|
|
||||||
Foundation's software and to any other program whose authors commit to
|
|
||||||
using it. (Some other Free Software Foundation software is covered by
|
|
||||||
the GNU Library General Public License instead.) You can apply it to
|
|
||||||
your programs, too.
|
|
||||||
|
|
||||||
When we speak of free software, we are referring to freedom, not
|
|
||||||
price. Our General Public Licenses are designed to make sure that you
|
|
||||||
have the freedom to distribute copies of free software (and charge for
|
|
||||||
this service if you wish), that you receive source code or can get it
|
|
||||||
if you want it, that you can change the software or use pieces of it
|
|
||||||
in new free programs; and that you know you can do these things.
|
|
||||||
|
|
||||||
To protect your rights, we need to make restrictions that forbid
|
|
||||||
anyone to deny you these rights or to ask you to surrender the rights.
|
|
||||||
These restrictions translate to certain responsibilities for you if you
|
|
||||||
distribute copies of the software, or if you modify it.
|
|
||||||
|
|
||||||
For example, if you distribute copies of such a program, whether
|
|
||||||
gratis or for a fee, you must give the recipients all the rights that
|
|
||||||
you have. You must make sure that they, too, receive or can get the
|
|
||||||
source code. And you must show them these terms so they know their
|
|
||||||
rights.
|
|
||||||
|
|
||||||
We protect your rights with two steps: (1) copyright the software, and
|
|
||||||
(2) offer you this license which gives you legal permission to copy,
|
|
||||||
distribute and/or modify the software.
|
|
||||||
|
|
||||||
Also, for each author's protection and ours, we want to make certain
|
|
||||||
that everyone understands that there is no warranty for this free
|
|
||||||
software. If the software is modified by someone else and passed on, we
|
|
||||||
want its recipients to know that what they have is not the original, so
|
|
||||||
that any problems introduced by others will not reflect on the original
|
|
||||||
authors' reputations.
|
|
||||||
|
|
||||||
Finally, any free program is threatened constantly by software
|
|
||||||
patents. We wish to avoid the danger that redistributors of a free
|
|
||||||
program will individually obtain patent licenses, in effect making the
|
|
||||||
program proprietary. To prevent this, we have made it clear that any
|
|
||||||
patent must be licensed for everyone's free use or not licensed at all.
|
|
||||||
|
|
||||||
The precise terms and conditions for copying, distribution and
|
|
||||||
modification follow.
|
|
||||||
|
|
||||||
GNU GENERAL PUBLIC LICENSE
|
|
||||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
|
||||||
|
|
||||||
0. This License applies to any program or other work which contains
|
|
||||||
a notice placed by the copyright holder saying it may be distributed
|
|
||||||
under the terms of this General Public License. The "Program", below,
|
|
||||||
refers to any such program or work, and a "work based on the Program"
|
|
||||||
means either the Program or any derivative work under copyright law:
|
|
||||||
that is to say, a work containing the Program or a portion of it,
|
|
||||||
either verbatim or with modifications and/or translated into another
|
|
||||||
language. (Hereinafter, translation is included without limitation in
|
|
||||||
the term "modification".) Each licensee is addressed as "you".
|
|
||||||
|
|
||||||
Activities other than copying, distribution and modification are not
|
|
||||||
covered by this License; they are outside its scope. The act of
|
|
||||||
running the Program is not restricted, and the output from the Program
|
|
||||||
is covered only if its contents constitute a work based on the
|
|
||||||
Program (independent of having been made by running the Program).
|
|
||||||
Whether that is true depends on what the Program does.
|
|
||||||
|
|
||||||
1. You may copy and distribute verbatim copies of the Program's
|
|
||||||
source code as you receive it, in any medium, provided that you
|
|
||||||
conspicuously and appropriately publish on each copy an appropriate
|
|
||||||
copyright notice and disclaimer of warranty; keep intact all the
|
|
||||||
notices that refer to this License and to the absence of any warranty;
|
|
||||||
and give any other recipients of the Program a copy of this License
|
|
||||||
along with the Program.
|
|
||||||
|
|
||||||
You may charge a fee for the physical act of transferring a copy, and
|
|
||||||
you may at your option offer warranty protection in exchange for a fee.
|
|
||||||
|
|
||||||
2. You may modify your copy or copies of the Program or any portion
|
|
||||||
of it, thus forming a work based on the Program, and copy and
|
|
||||||
distribute such modifications or work under the terms of Section 1
|
|
||||||
above, provided that you also meet all of these conditions:
|
|
||||||
|
|
||||||
a) You must cause the modified files to carry prominent notices
|
|
||||||
stating that you changed the files and the date of any change.
|
|
||||||
|
|
||||||
b) You must cause any work that you distribute or publish, that in
|
|
||||||
whole or in part contains or is derived from the Program or any
|
|
||||||
part thereof, to be licensed as a whole at no charge to all third
|
|
||||||
parties under the terms of this License.
|
|
||||||
|
|
||||||
c) If the modified program normally reads commands interactively
|
|
||||||
when run, you must cause it, when started running for such
|
|
||||||
interactive use in the most ordinary way, to print or display an
|
|
||||||
announcement including an appropriate copyright notice and a
|
|
||||||
notice that there is no warranty (or else, saying that you provide
|
|
||||||
a warranty) and that users may redistribute the program under
|
|
||||||
these conditions, and telling the user how to view a copy of this
|
|
||||||
License. (Exception: if the Program itself is interactive but
|
|
||||||
does not normally print such an announcement, your work based on
|
|
||||||
the Program is not required to print an announcement.)
|
|
||||||
|
|
||||||
These requirements apply to the modified work as a whole. If
|
|
||||||
identifiable sections of that work are not derived from the Program,
|
|
||||||
and can be reasonably considered independent and separate works in
|
|
||||||
themselves, then this License, and its terms, do not apply to those
|
|
||||||
sections when you distribute them as separate works. But when you
|
|
||||||
distribute the same sections as part of a whole which is a work based
|
|
||||||
on the Program, the distribution of the whole must be on the terms of
|
|
||||||
this License, whose permissions for other licensees extend to the
|
|
||||||
entire whole, and thus to each and every part regardless of who wrote it.
|
|
||||||
|
|
||||||
Thus, it is not the intent of this section to claim rights or contest
|
|
||||||
your rights to work written entirely by you; rather, the intent is to
|
|
||||||
exercise the right to control the distribution of derivative or
|
|
||||||
collective works based on the Program.
|
|
||||||
|
|
||||||
In addition, mere aggregation of another work not based on the Program
|
|
||||||
with the Program (or with a work based on the Program) on a volume of
|
|
||||||
a storage or distribution medium does not bring the other work under
|
|
||||||
the scope of this License.
|
|
||||||
|
|
||||||
3. You may copy and distribute the Program (or a work based on it,
|
|
||||||
under Section 2) in object code or executable form under the terms of
|
|
||||||
Sections 1 and 2 above provided that you also do one of the following:
|
|
||||||
|
|
||||||
a) Accompany it with the complete corresponding machine-readable
|
|
||||||
source code, which must be distributed under the terms of Sections
|
|
||||||
1 and 2 above on a medium customarily used for software interchange; or,
|
|
||||||
|
|
||||||
b) Accompany it with a written offer, valid for at least three
|
|
||||||
years, to give any third party, for a charge no more than your
|
|
||||||
cost of physically performing source distribution, a complete
|
|
||||||
machine-readable copy of the corresponding source code, to be
|
|
||||||
distributed under the terms of Sections 1 and 2 above on a medium
|
|
||||||
customarily used for software interchange; or,
|
|
||||||
|
|
||||||
c) Accompany it with the information you received as to the offer
|
|
||||||
to distribute corresponding source code. (This alternative is
|
|
||||||
allowed only for noncommercial distribution and only if you
|
|
||||||
received the program in object code or executable form with such
|
|
||||||
an offer, in accord with Subsection b above.)
|
|
||||||
|
|
||||||
The source code for a work means the preferred form of the work for
|
|
||||||
making modifications to it. For an executable work, complete source
|
|
||||||
code means all the source code for all modules it contains, plus any
|
|
||||||
associated interface definition files, plus the scripts used to
|
|
||||||
control compilation and installation of the executable. However, as a
|
|
||||||
special exception, the source code distributed need not include
|
|
||||||
anything that is normally distributed (in either source or binary
|
|
||||||
form) with the major components (compiler, kernel, and so on) of the
|
|
||||||
operating system on which the executable runs, unless that component
|
|
||||||
itself accompanies the executable.
|
|
||||||
|
|
||||||
If distribution of executable or object code is made by offering
|
|
||||||
access to copy from a designated place, then offering equivalent
|
|
||||||
access to copy the source code from the same place counts as
|
|
||||||
distribution of the source code, even though third parties are not
|
|
||||||
compelled to copy the source along with the object code.
|
|
||||||
|
|
||||||
4. You may not copy, modify, sublicense, or distribute the Program
|
|
||||||
except as expressly provided under this License. Any attempt
|
|
||||||
otherwise to copy, modify, sublicense or distribute the Program is
|
|
||||||
void, and will automatically terminate your rights under this License.
|
|
||||||
However, parties who have received copies, or rights, from you under
|
|
||||||
this License will not have their licenses terminated so long as such
|
|
||||||
parties remain in full compliance.
|
|
||||||
|
|
||||||
5. You are not required to accept this License, since you have not
|
|
||||||
signed it. However, nothing else grants you permission to modify or
|
|
||||||
distribute the Program or its derivative works. These actions are
|
|
||||||
prohibited by law if you do not accept this License. Therefore, by
|
|
||||||
modifying or distributing the Program (or any work based on the
|
|
||||||
Program), you indicate your acceptance of this License to do so, and
|
|
||||||
all its terms and conditions for copying, distributing or modifying
|
|
||||||
the Program or works based on it.
|
|
||||||
|
|
||||||
6. Each time you redistribute the Program (or any work based on the
|
|
||||||
Program), the recipient automatically receives a license from the
|
|
||||||
original licensor to copy, distribute or modify the Program subject to
|
|
||||||
these terms and conditions. You may not impose any further
|
|
||||||
restrictions on the recipients' exercise of the rights granted herein.
|
|
||||||
You are not responsible for enforcing compliance by third parties to
|
|
||||||
this License.
|
|
||||||
|
|
||||||
7. If, as a consequence of a court judgment or allegation of patent
|
|
||||||
infringement or for any other reason (not limited to patent issues),
|
|
||||||
conditions are imposed on you (whether by court order, agreement or
|
|
||||||
otherwise) that contradict the conditions of this License, they do not
|
|
||||||
excuse you from the conditions of this License. If you cannot
|
|
||||||
distribute so as to satisfy simultaneously your obligations under this
|
|
||||||
License and any other pertinent obligations, then as a consequence you
|
|
||||||
may not distribute the Program at all. For example, if a patent
|
|
||||||
license would not permit royalty-free redistribution of the Program by
|
|
||||||
all those who receive copies directly or indirectly through you, then
|
|
||||||
the only way you could satisfy both it and this License would be to
|
|
||||||
refrain entirely from distribution of the Program.
|
|
||||||
|
|
||||||
If any portion of this section is held invalid or unenforceable under
|
|
||||||
any particular circumstance, the balance of the section is intended to
|
|
||||||
apply and the section as a whole is intended to apply in other
|
|
||||||
circumstances.
|
|
||||||
|
|
||||||
It is not the purpose of this section to induce you to infringe any
|
|
||||||
patents or other property right claims or to contest validity of any
|
|
||||||
such claims; this section has the sole purpose of protecting the
|
|
||||||
integrity of the free software distribution system, which is
|
|
||||||
implemented by public license practices. Many people have made
|
|
||||||
generous contributions to the wide range of software distributed
|
|
||||||
through that system in reliance on consistent application of that
|
|
||||||
system; it is up to the author/donor to decide if he or she is willing
|
|
||||||
to distribute software through any other system and a licensee cannot
|
|
||||||
impose that choice.
|
|
||||||
|
|
||||||
This section is intended to make thoroughly clear what is believed to
|
|
||||||
be a consequence of the rest of this License.
|
|
||||||
|
|
||||||
8. If the distribution and/or use of the Program is restricted in
|
|
||||||
certain countries either by patents or by copyrighted interfaces, the
|
|
||||||
original copyright holder who places the Program under this License
|
|
||||||
may add an explicit geographical distribution limitation excluding
|
|
||||||
those countries, so that distribution is permitted only in or among
|
|
||||||
countries not thus excluded. In such case, this License incorporates
|
|
||||||
the limitation as if written in the body of this License.
|
|
||||||
|
|
||||||
9. The Free Software Foundation may publish revised and/or new versions
|
|
||||||
of the General Public License from time to time. Such new versions will
|
|
||||||
be similar in spirit to the present version, but may differ in detail to
|
|
||||||
address new problems or concerns.
|
|
||||||
|
|
||||||
Each version is given a distinguishing version number. If the Program
|
|
||||||
specifies a version number of this License which applies to it and "any
|
|
||||||
later version", you have the option of following the terms and conditions
|
|
||||||
either of that version or of any later version published by the Free
|
|
||||||
Software Foundation. If the Program does not specify a version number of
|
|
||||||
this License, you may choose any version ever published by the Free Software
|
|
||||||
Foundation.
|
|
||||||
|
|
||||||
10. If you wish to incorporate parts of the Program into other free
|
|
||||||
programs whose distribution conditions are different, write to the author
|
|
||||||
to ask for permission. For software which is copyrighted by the Free
|
|
||||||
Software Foundation, write to the Free Software Foundation; we sometimes
|
|
||||||
make exceptions for this. Our decision will be guided by the two goals
|
|
||||||
of preserving the free status of all derivatives of our free software and
|
|
||||||
of promoting the sharing and reuse of software generally.
|
|
||||||
|
|
||||||
NO WARRANTY
|
|
||||||
|
|
||||||
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
|
||||||
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
|
||||||
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
|
||||||
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
|
||||||
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
||||||
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
|
|
||||||
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
|
|
||||||
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
|
|
||||||
REPAIR OR CORRECTION.
|
|
||||||
|
|
||||||
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
|
||||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
|
||||||
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
|
||||||
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
|
||||||
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
|
||||||
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
|
||||||
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
|
||||||
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
|
||||||
POSSIBILITY OF SUCH DAMAGES.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
How to Apply These Terms to Your New Programs
|
|
||||||
|
|
||||||
If you develop a new program, and you want it to be of the greatest
|
|
||||||
possible use to the public, the best way to achieve this is to make it
|
|
||||||
free software which everyone can redistribute and change under these terms.
|
|
||||||
|
|
||||||
To do so, attach the following notices to the program. It is safest
|
|
||||||
to attach them to the start of each source file to most effectively
|
|
||||||
convey the exclusion of warranty; and each file should have at least
|
|
||||||
the "copyright" line and a pointer to where the full notice is found.
|
|
||||||
|
|
||||||
<one line to give the program's name and a brief idea of what it does.>
|
|
||||||
Copyright (C) <year> <name of author>
|
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation; either version 2 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program; if not, write to the Free Software
|
|
||||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
|
|
||||||
|
|
||||||
Also add information on how to contact you by electronic and paper mail.
|
|
||||||
|
|
||||||
If the program is interactive, make it output a short notice like this
|
|
||||||
when it starts in an interactive mode:
|
|
||||||
|
|
||||||
Gnomovision version 69, Copyright (C) year name of author
|
|
||||||
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
|
||||||
This is free software, and you are welcome to redistribute it
|
|
||||||
under certain conditions; type `show c' for details.
|
|
||||||
|
|
||||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
|
||||||
parts of the General Public License. Of course, the commands you use may
|
|
||||||
be called something other than `show w' and `show c'; they could even be
|
|
||||||
mouse-clicks or menu items--whatever suits your program.
|
|
||||||
|
|
||||||
You should also get your employer (if you work as a programmer) or your
|
|
||||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
|
||||||
necessary. Here is a sample; alter the names:
|
|
||||||
|
|
||||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
|
||||||
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
|
||||||
|
|
||||||
<signature of Ty Coon>, 1 April 1989
|
|
||||||
Ty Coon, President of Vice
|
|
||||||
|
|
||||||
This General Public License does not permit incorporating your program into
|
|
||||||
proprietary programs. If your program is a subroutine library, you may
|
|
||||||
consider it more useful to permit linking proprietary applications with the
|
|
||||||
library. If this is what you want to do, use the GNU Library General
|
|
||||||
Public License instead of this License.
|
|
690
LICENSES/GPL-3.0
690
LICENSES/GPL-3.0
|
@ -1,690 +0,0 @@
|
||||||
Valid-License-Identifier: GPL-3.0-only
|
|
||||||
Valid-License-Identifier: GPL-3.0
|
|
||||||
Valid-License-Identifier: GPL-3.0-or-later
|
|
||||||
Valid-License-Identifier: GPL-3.0+
|
|
||||||
SPDX-URL: https://spdx.org/licenses/GPL-3.0-only.html
|
|
||||||
SPDX-URL: https://spdx.org/licenses/GPL-3.0-or-later.html
|
|
||||||
Usage-Guide:
|
|
||||||
To use this license in source code, put one of the following SPDX
|
|
||||||
tag/value pairs into a comment according to the placement
|
|
||||||
guidelines in the licensing rules documentation.
|
|
||||||
For 'GNU General Public License (GPL) version 3 only' use:
|
|
||||||
SPDX-License-Identifier: GPL-3.0-only
|
|
||||||
For 'GNU General Public License (GPL) version 3 or any later version' use:
|
|
||||||
SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
License-Text:
|
|
||||||
|
|
||||||
GNU GENERAL PUBLIC LICENSE
|
|
||||||
Version 3, 29 June 2007
|
|
||||||
|
|
||||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
|
||||||
of this license document, but changing it is not allowed.
|
|
||||||
|
|
||||||
Preamble
|
|
||||||
|
|
||||||
The GNU General Public License is a free, copyleft license for
|
|
||||||
software and other kinds of works.
|
|
||||||
|
|
||||||
The licenses for most software and other practical works are designed
|
|
||||||
to take away your freedom to share and change the works. By contrast,
|
|
||||||
the GNU General Public License is intended to guarantee your freedom to
|
|
||||||
share and change all versions of a program--to make sure it remains free
|
|
||||||
software for all its users. We, the Free Software Foundation, use the
|
|
||||||
GNU General Public License for most of our software; it applies also to
|
|
||||||
any other work released this way by its authors. You can apply it to
|
|
||||||
your programs, too.
|
|
||||||
|
|
||||||
When we speak of free software, we are referring to freedom, not
|
|
||||||
price. Our General Public Licenses are designed to make sure that you
|
|
||||||
have the freedom to distribute copies of free software (and charge for
|
|
||||||
them if you wish), that you receive source code or can get it if you
|
|
||||||
want it, that you can change the software or use pieces of it in new
|
|
||||||
free programs, and that you know you can do these things.
|
|
||||||
|
|
||||||
To protect your rights, we need to prevent others from denying you
|
|
||||||
these rights or asking you to surrender the rights. Therefore, you have
|
|
||||||
certain responsibilities if you distribute copies of the software, or if
|
|
||||||
you modify it: responsibilities to respect the freedom of others.
|
|
||||||
|
|
||||||
For example, if you distribute copies of such a program, whether
|
|
||||||
gratis or for a fee, you must pass on to the recipients the same
|
|
||||||
freedoms that you received. You must make sure that they, too, receive
|
|
||||||
or can get the source code. And you must show them these terms so they
|
|
||||||
know their rights.
|
|
||||||
|
|
||||||
Developers that use the GNU GPL protect your rights with two steps:
|
|
||||||
(1) assert copyright on the software, and (2) offer you this License
|
|
||||||
giving you legal permission to copy, distribute and/or modify it.
|
|
||||||
|
|
||||||
For the developers' and authors' protection, the GPL clearly explains
|
|
||||||
that there is no warranty for this free software. For both users' and
|
|
||||||
authors' sake, the GPL requires that modified versions be marked as
|
|
||||||
changed, so that their problems will not be attributed erroneously to
|
|
||||||
authors of previous versions.
|
|
||||||
|
|
||||||
Some devices are designed to deny users access to install or run
|
|
||||||
modified versions of the software inside them, although the manufacturer
|
|
||||||
can do so. This is fundamentally incompatible with the aim of
|
|
||||||
protecting users' freedom to change the software. The systematic
|
|
||||||
pattern of such abuse occurs in the area of products for individuals to
|
|
||||||
use, which is precisely where it is most unacceptable. Therefore, we
|
|
||||||
have designed this version of the GPL to prohibit the practice for those
|
|
||||||
products. If such problems arise substantially in other domains, we
|
|
||||||
stand ready to extend this provision to those domains in future versions
|
|
||||||
of the GPL, as needed to protect the freedom of users.
|
|
||||||
|
|
||||||
Finally, every program is threatened constantly by software patents.
|
|
||||||
States should not allow patents to restrict development and use of
|
|
||||||
software on general-purpose computers, but in those that do, we wish to
|
|
||||||
avoid the special danger that patents applied to a free program could
|
|
||||||
make it effectively proprietary. To prevent this, the GPL assures that
|
|
||||||
patents cannot be used to render the program non-free.
|
|
||||||
|
|
||||||
The precise terms and conditions for copying, distribution and
|
|
||||||
modification follow.
|
|
||||||
|
|
||||||
TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
0. Definitions.
|
|
||||||
|
|
||||||
"This License" refers to version 3 of the GNU General Public License.
|
|
||||||
|
|
||||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
|
||||||
works, such as semiconductor masks.
|
|
||||||
|
|
||||||
"The Program" refers to any copyrightable work licensed under this
|
|
||||||
License. Each licensee is addressed as "you". "Licensees" and
|
|
||||||
"recipients" may be individuals or organizations.
|
|
||||||
|
|
||||||
To "modify" a work means to copy from or adapt all or part of the work
|
|
||||||
in a fashion requiring copyright permission, other than the making of an
|
|
||||||
exact copy. The resulting work is called a "modified version" of the
|
|
||||||
earlier work or a work "based on" the earlier work.
|
|
||||||
|
|
||||||
A "covered work" means either the unmodified Program or a work based
|
|
||||||
on the Program.
|
|
||||||
|
|
||||||
To "propagate" a work means to do anything with it that, without
|
|
||||||
permission, would make you directly or secondarily liable for
|
|
||||||
infringement under applicable copyright law, except executing it on a
|
|
||||||
computer or modifying a private copy. Propagation includes copying,
|
|
||||||
distribution (with or without modification), making available to the
|
|
||||||
public, and in some countries other activities as well.
|
|
||||||
|
|
||||||
To "convey" a work means any kind of propagation that enables other
|
|
||||||
parties to make or receive copies. Mere interaction with a user through
|
|
||||||
a computer network, with no transfer of a copy, is not conveying.
|
|
||||||
|
|
||||||
An interactive user interface displays "Appropriate Legal Notices"
|
|
||||||
to the extent that it includes a convenient and prominently visible
|
|
||||||
feature that (1) displays an appropriate copyright notice, and (2)
|
|
||||||
tells the user that there is no warranty for the work (except to the
|
|
||||||
extent that warranties are provided), that licensees may convey the
|
|
||||||
work under this License, and how to view a copy of this License. If
|
|
||||||
the interface presents a list of user commands or options, such as a
|
|
||||||
menu, a prominent item in the list meets this criterion.
|
|
||||||
|
|
||||||
1. Source Code.
|
|
||||||
|
|
||||||
The "source code" for a work means the preferred form of the work
|
|
||||||
for making modifications to it. "Object code" means any non-source
|
|
||||||
form of a work.
|
|
||||||
|
|
||||||
A "Standard Interface" means an interface that either is an official
|
|
||||||
standard defined by a recognized standards body, or, in the case of
|
|
||||||
interfaces specified for a particular programming language, one that
|
|
||||||
is widely used among developers working in that language.
|
|
||||||
|
|
||||||
The "System Libraries" of an executable work include anything, other
|
|
||||||
than the work as a whole, that (a) is included in the normal form of
|
|
||||||
packaging a Major Component, but which is not part of that Major
|
|
||||||
Component, and (b) serves only to enable use of the work with that
|
|
||||||
Major Component, or to implement a Standard Interface for which an
|
|
||||||
implementation is available to the public in source code form. A
|
|
||||||
"Major Component", in this context, means a major essential component
|
|
||||||
(kernel, window system, and so on) of the specific operating system
|
|
||||||
(if any) on which the executable work runs, or a compiler used to
|
|
||||||
produce the work, or an object code interpreter used to run it.
|
|
||||||
|
|
||||||
The "Corresponding Source" for a work in object code form means all
|
|
||||||
the source code needed to generate, install, and (for an executable
|
|
||||||
work) run the object code and to modify the work, including scripts to
|
|
||||||
control those activities. However, it does not include the work's
|
|
||||||
System Libraries, or general-purpose tools or generally available free
|
|
||||||
programs which are used unmodified in performing those activities but
|
|
||||||
which are not part of the work. For example, Corresponding Source
|
|
||||||
includes interface definition files associated with source files for
|
|
||||||
the work, and the source code for shared libraries and dynamically
|
|
||||||
linked subprograms that the work is specifically designed to require,
|
|
||||||
such as by intimate data communication or control flow between those
|
|
||||||
subprograms and other parts of the work.
|
|
||||||
|
|
||||||
The Corresponding Source need not include anything that users
|
|
||||||
can regenerate automatically from other parts of the Corresponding
|
|
||||||
Source.
|
|
||||||
|
|
||||||
The Corresponding Source for a work in source code form is that
|
|
||||||
same work.
|
|
||||||
|
|
||||||
2. Basic Permissions.
|
|
||||||
|
|
||||||
All rights granted under this License are granted for the term of
|
|
||||||
copyright on the Program, and are irrevocable provided the stated
|
|
||||||
conditions are met. This License explicitly affirms your unlimited
|
|
||||||
permission to run the unmodified Program. The output from running a
|
|
||||||
covered work is covered by this License only if the output, given its
|
|
||||||
content, constitutes a covered work. This License acknowledges your
|
|
||||||
rights of fair use or other equivalent, as provided by copyright law.
|
|
||||||
|
|
||||||
You may make, run and propagate covered works that you do not
|
|
||||||
convey, without conditions so long as your license otherwise remains
|
|
||||||
in force. You may convey covered works to others for the sole purpose
|
|
||||||
of having them make modifications exclusively for you, or provide you
|
|
||||||
with facilities for running those works, provided that you comply with
|
|
||||||
the terms of this License in conveying all material for which you do
|
|
||||||
not control copyright. Those thus making or running the covered works
|
|
||||||
for you must do so exclusively on your behalf, under your direction
|
|
||||||
and control, on terms that prohibit them from making any copies of
|
|
||||||
your copyrighted material outside their relationship with you.
|
|
||||||
|
|
||||||
Conveying under any other circumstances is permitted solely under
|
|
||||||
the conditions stated below. Sublicensing is not allowed; section 10
|
|
||||||
makes it unnecessary.
|
|
||||||
|
|
||||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
|
||||||
|
|
||||||
No covered work shall be deemed part of an effective technological
|
|
||||||
measure under any applicable law fulfilling obligations under article
|
|
||||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
|
||||||
similar laws prohibiting or restricting circumvention of such
|
|
||||||
measures.
|
|
||||||
|
|
||||||
When you convey a covered work, you waive any legal power to forbid
|
|
||||||
circumvention of technological measures to the extent such circumvention
|
|
||||||
is effected by exercising rights under this License with respect to
|
|
||||||
the covered work, and you disclaim any intention to limit operation or
|
|
||||||
modification of the work as a means of enforcing, against the work's
|
|
||||||
users, your or third parties' legal rights to forbid circumvention of
|
|
||||||
technological measures.
|
|
||||||
|
|
||||||
4. Conveying Verbatim Copies.
|
|
||||||
|
|
||||||
You may convey verbatim copies of the Program's source code as you
|
|
||||||
receive it, in any medium, provided that you conspicuously and
|
|
||||||
appropriately publish on each copy an appropriate copyright notice;
|
|
||||||
keep intact all notices stating that this License and any
|
|
||||||
non-permissive terms added in accord with section 7 apply to the code;
|
|
||||||
keep intact all notices of the absence of any warranty; and give all
|
|
||||||
recipients a copy of this License along with the Program.
|
|
||||||
|
|
||||||
You may charge any price or no price for each copy that you convey,
|
|
||||||
and you may offer support or warranty protection for a fee.
|
|
||||||
|
|
||||||
5. Conveying Modified Source Versions.
|
|
||||||
|
|
||||||
You may convey a work based on the Program, or the modifications to
|
|
||||||
produce it from the Program, in the form of source code under the
|
|
||||||
terms of section 4, provided that you also meet all of these conditions:
|
|
||||||
|
|
||||||
a) The work must carry prominent notices stating that you modified
|
|
||||||
it, and giving a relevant date.
|
|
||||||
|
|
||||||
b) The work must carry prominent notices stating that it is
|
|
||||||
released under this License and any conditions added under section
|
|
||||||
7. This requirement modifies the requirement in section 4 to
|
|
||||||
"keep intact all notices".
|
|
||||||
|
|
||||||
c) You must license the entire work, as a whole, under this
|
|
||||||
License to anyone who comes into possession of a copy. This
|
|
||||||
License will therefore apply, along with any applicable section 7
|
|
||||||
additional terms, to the whole of the work, and all its parts,
|
|
||||||
regardless of how they are packaged. This License gives no
|
|
||||||
permission to license the work in any other way, but it does not
|
|
||||||
invalidate such permission if you have separately received it.
|
|
||||||
|
|
||||||
d) If the work has interactive user interfaces, each must display
|
|
||||||
Appropriate Legal Notices; however, if the Program has interactive
|
|
||||||
interfaces that do not display Appropriate Legal Notices, your
|
|
||||||
work need not make them do so.
|
|
||||||
|
|
||||||
A compilation of a covered work with other separate and independent
|
|
||||||
works, which are not by their nature extensions of the covered work,
|
|
||||||
and which are not combined with it such as to form a larger program,
|
|
||||||
in or on a volume of a storage or distribution medium, is called an
|
|
||||||
"aggregate" if the compilation and its resulting copyright are not
|
|
||||||
used to limit the access or legal rights of the compilation's users
|
|
||||||
beyond what the individual works permit. Inclusion of a covered work
|
|
||||||
in an aggregate does not cause this License to apply to the other
|
|
||||||
parts of the aggregate.
|
|
||||||
|
|
||||||
6. Conveying Non-Source Forms.
|
|
||||||
|
|
||||||
You may convey a covered work in object code form under the terms
|
|
||||||
of sections 4 and 5, provided that you also convey the
|
|
||||||
machine-readable Corresponding Source under the terms of this License,
|
|
||||||
in one of these ways:
|
|
||||||
|
|
||||||
a) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by the
|
|
||||||
Corresponding Source fixed on a durable physical medium
|
|
||||||
customarily used for software interchange.
|
|
||||||
|
|
||||||
b) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by a
|
|
||||||
written offer, valid for at least three years and valid for as
|
|
||||||
long as you offer spare parts or customer support for that product
|
|
||||||
model, to give anyone who possesses the object code either (1) a
|
|
||||||
copy of the Corresponding Source for all the software in the
|
|
||||||
product that is covered by this License, on a durable physical
|
|
||||||
medium customarily used for software interchange, for a price no
|
|
||||||
more than your reasonable cost of physically performing this
|
|
||||||
conveying of source, or (2) access to copy the
|
|
||||||
Corresponding Source from a network server at no charge.
|
|
||||||
|
|
||||||
c) Convey individual copies of the object code with a copy of the
|
|
||||||
written offer to provide the Corresponding Source. This
|
|
||||||
alternative is allowed only occasionally and noncommercially, and
|
|
||||||
only if you received the object code with such an offer, in accord
|
|
||||||
with subsection 6b.
|
|
||||||
|
|
||||||
d) Convey the object code by offering access from a designated
|
|
||||||
place (gratis or for a charge), and offer equivalent access to the
|
|
||||||
Corresponding Source in the same way through the same place at no
|
|
||||||
further charge. You need not require recipients to copy the
|
|
||||||
Corresponding Source along with the object code. If the place to
|
|
||||||
copy the object code is a network server, the Corresponding Source
|
|
||||||
may be on a different server (operated by you or a third party)
|
|
||||||
that supports equivalent copying facilities, provided you maintain
|
|
||||||
clear directions next to the object code saying where to find the
|
|
||||||
Corresponding Source. Regardless of what server hosts the
|
|
||||||
Corresponding Source, you remain obligated to ensure that it is
|
|
||||||
available for as long as needed to satisfy these requirements.
|
|
||||||
|
|
||||||
e) Convey the object code using peer-to-peer transmission, provided
|
|
||||||
you inform other peers where the object code and Corresponding
|
|
||||||
Source of the work are being offered to the general public at no
|
|
||||||
charge under subsection 6d.
|
|
||||||
|
|
||||||
A separable portion of the object code, whose source code is excluded
|
|
||||||
from the Corresponding Source as a System Library, need not be
|
|
||||||
included in conveying the object code work.
|
|
||||||
|
|
||||||
A "User Product" is either (1) a "consumer product", which means any
|
|
||||||
tangible personal property which is normally used for personal, family,
|
|
||||||
or household purposes, or (2) anything designed or sold for incorporation
|
|
||||||
into a dwelling. In determining whether a product is a consumer product,
|
|
||||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
|
||||||
product received by a particular user, "normally used" refers to a
|
|
||||||
typical or common use of that class of product, regardless of the status
|
|
||||||
of the particular user or of the way in which the particular user
|
|
||||||
actually uses, or expects or is expected to use, the product. A product
|
|
||||||
is a consumer product regardless of whether the product has substantial
|
|
||||||
commercial, industrial or non-consumer uses, unless such uses represent
|
|
||||||
the only significant mode of use of the product.
|
|
||||||
|
|
||||||
"Installation Information" for a User Product means any methods,
|
|
||||||
procedures, authorization keys, or other information required to install
|
|
||||||
and execute modified versions of a covered work in that User Product from
|
|
||||||
a modified version of its Corresponding Source. The information must
|
|
||||||
suffice to ensure that the continued functioning of the modified object
|
|
||||||
code is in no case prevented or interfered with solely because
|
|
||||||
modification has been made.
|
|
||||||
|
|
||||||
If you convey an object code work under this section in, or with, or
|
|
||||||
specifically for use in, a User Product, and the conveying occurs as
|
|
||||||
part of a transaction in which the right of possession and use of the
|
|
||||||
User Product is transferred to the recipient in perpetuity or for a
|
|
||||||
fixed term (regardless of how the transaction is characterized), the
|
|
||||||
Corresponding Source conveyed under this section must be accompanied
|
|
||||||
by the Installation Information. But this requirement does not apply
|
|
||||||
if neither you nor any third party retains the ability to install
|
|
||||||
modified object code on the User Product (for example, the work has
|
|
||||||
been installed in ROM).
|
|
||||||
|
|
||||||
The requirement to provide Installation Information does not include a
|
|
||||||
requirement to continue to provide support service, warranty, or updates
|
|
||||||
for a work that has been modified or installed by the recipient, or for
|
|
||||||
the User Product in which it has been modified or installed. Access to a
|
|
||||||
network may be denied when the modification itself materially and
|
|
||||||
adversely affects the operation of the network or violates the rules and
|
|
||||||
protocols for communication across the network.
|
|
||||||
|
|
||||||
Corresponding Source conveyed, and Installation Information provided,
|
|
||||||
in accord with this section must be in a format that is publicly
|
|
||||||
documented (and with an implementation available to the public in
|
|
||||||
source code form), and must require no special password or key for
|
|
||||||
unpacking, reading or copying.
|
|
||||||
|
|
||||||
7. Additional Terms.
|
|
||||||
|
|
||||||
"Additional permissions" are terms that supplement the terms of this
|
|
||||||
License by making exceptions from one or more of its conditions.
|
|
||||||
Additional permissions that are applicable to the entire Program shall
|
|
||||||
be treated as though they were included in this License, to the extent
|
|
||||||
that they are valid under applicable law. If additional permissions
|
|
||||||
apply only to part of the Program, that part may be used separately
|
|
||||||
under those permissions, but the entire Program remains governed by
|
|
||||||
this License without regard to the additional permissions.
|
|
||||||
|
|
||||||
When you convey a copy of a covered work, you may at your option
|
|
||||||
remove any additional permissions from that copy, or from any part of
|
|
||||||
it. (Additional permissions may be written to require their own
|
|
||||||
removal in certain cases when you modify the work.) You may place
|
|
||||||
additional permissions on material, added by you to a covered work,
|
|
||||||
for which you have or can give appropriate copyright permission.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, for material you
|
|
||||||
add to a covered work, you may (if authorized by the copyright holders of
|
|
||||||
that material) supplement the terms of this License with terms:
|
|
||||||
|
|
||||||
a) Disclaiming warranty or limiting liability differently from the
|
|
||||||
terms of sections 15 and 16 of this License; or
|
|
||||||
|
|
||||||
b) Requiring preservation of specified reasonable legal notices or
|
|
||||||
author attributions in that material or in the Appropriate Legal
|
|
||||||
Notices displayed by works containing it; or
|
|
||||||
|
|
||||||
c) Prohibiting misrepresentation of the origin of that material, or
|
|
||||||
requiring that modified versions of such material be marked in
|
|
||||||
reasonable ways as different from the original version; or
|
|
||||||
|
|
||||||
d) Limiting the use for publicity purposes of names of licensors or
|
|
||||||
authors of the material; or
|
|
||||||
|
|
||||||
e) Declining to grant rights under trademark law for use of some
|
|
||||||
trade names, trademarks, or service marks; or
|
|
||||||
|
|
||||||
f) Requiring indemnification of licensors and authors of that
|
|
||||||
material by anyone who conveys the material (or modified versions of
|
|
||||||
it) with contractual assumptions of liability to the recipient, for
|
|
||||||
any liability that these contractual assumptions directly impose on
|
|
||||||
those licensors and authors.
|
|
||||||
|
|
||||||
All other non-permissive additional terms are considered "further
|
|
||||||
restrictions" within the meaning of section 10. If the Program as you
|
|
||||||
received it, or any part of it, contains a notice stating that it is
|
|
||||||
governed by this License along with a term that is a further
|
|
||||||
restriction, you may remove that term. If a license document contains
|
|
||||||
a further restriction but permits relicensing or conveying under this
|
|
||||||
License, you may add to a covered work material governed by the terms
|
|
||||||
of that license document, provided that the further restriction does
|
|
||||||
not survive such relicensing or conveying.
|
|
||||||
|
|
||||||
If you add terms to a covered work in accord with this section, you
|
|
||||||
must place, in the relevant source files, a statement of the
|
|
||||||
additional terms that apply to those files, or a notice indicating
|
|
||||||
where to find the applicable terms.
|
|
||||||
|
|
||||||
Additional terms, permissive or non-permissive, may be stated in the
|
|
||||||
form of a separately written license, or stated as exceptions;
|
|
||||||
the above requirements apply either way.
|
|
||||||
|
|
||||||
8. Termination.
|
|
||||||
|
|
||||||
You may not propagate or modify a covered work except as expressly
|
|
||||||
provided under this License. Any attempt otherwise to propagate or
|
|
||||||
modify it is void, and will automatically terminate your rights under
|
|
||||||
this License (including any patent licenses granted under the third
|
|
||||||
paragraph of section 11).
|
|
||||||
|
|
||||||
However, if you cease all violation of this License, then your
|
|
||||||
license from a particular copyright holder is reinstated (a)
|
|
||||||
provisionally, unless and until the copyright holder explicitly and
|
|
||||||
finally terminates your license, and (b) permanently, if the copyright
|
|
||||||
holder fails to notify you of the violation by some reasonable means
|
|
||||||
prior to 60 days after the cessation.
|
|
||||||
|
|
||||||
Moreover, your license from a particular copyright holder is
|
|
||||||
reinstated permanently if the copyright holder notifies you of the
|
|
||||||
violation by some reasonable means, this is the first time you have
|
|
||||||
received notice of violation of this License (for any work) from that
|
|
||||||
copyright holder, and you cure the violation prior to 30 days after
|
|
||||||
your receipt of the notice.
|
|
||||||
|
|
||||||
Termination of your rights under this section does not terminate the
|
|
||||||
licenses of parties who have received copies or rights from you under
|
|
||||||
this License. If your rights have been terminated and not permanently
|
|
||||||
reinstated, you do not qualify to receive new licenses for the same
|
|
||||||
material under section 10.
|
|
||||||
|
|
||||||
9. Acceptance Not Required for Having Copies.
|
|
||||||
|
|
||||||
You are not required to accept this License in order to receive or
|
|
||||||
run a copy of the Program. Ancillary propagation of a covered work
|
|
||||||
occurring solely as a consequence of using peer-to-peer transmission
|
|
||||||
to receive a copy likewise does not require acceptance. However,
|
|
||||||
nothing other than this License grants you permission to propagate or
|
|
||||||
modify any covered work. These actions infringe copyright if you do
|
|
||||||
not accept this License. Therefore, by modifying or propagating a
|
|
||||||
covered work, you indicate your acceptance of this License to do so.
|
|
||||||
|
|
||||||
10. Automatic Licensing of Downstream Recipients.
|
|
||||||
|
|
||||||
Each time you convey a covered work, the recipient automatically
|
|
||||||
receives a license from the original licensors, to run, modify and
|
|
||||||
propagate that work, subject to this License. You are not responsible
|
|
||||||
for enforcing compliance by third parties with this License.
|
|
||||||
|
|
||||||
An "entity transaction" is a transaction transferring control of an
|
|
||||||
organization, or substantially all assets of one, or subdividing an
|
|
||||||
organization, or merging organizations. If propagation of a covered
|
|
||||||
work results from an entity transaction, each party to that
|
|
||||||
transaction who receives a copy of the work also receives whatever
|
|
||||||
licenses to the work the party's predecessor in interest had or could
|
|
||||||
give under the previous paragraph, plus a right to possession of the
|
|
||||||
Corresponding Source of the work from the predecessor in interest, if
|
|
||||||
the predecessor has it or can get it with reasonable efforts.
|
|
||||||
|
|
||||||
You may not impose any further restrictions on the exercise of the
|
|
||||||
rights granted or affirmed under this License. For example, you may
|
|
||||||
not impose a license fee, royalty, or other charge for exercise of
|
|
||||||
rights granted under this License, and you may not initiate litigation
|
|
||||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
|
||||||
any patent claim is infringed by making, using, selling, offering for
|
|
||||||
sale, or importing the Program or any portion of it.
|
|
||||||
|
|
||||||
11. Patents.
|
|
||||||
|
|
||||||
A "contributor" is a copyright holder who authorizes use under this
|
|
||||||
License of the Program or a work on which the Program is based. The
|
|
||||||
work thus licensed is called the contributor's "contributor version".
|
|
||||||
|
|
||||||
A contributor's "essential patent claims" are all patent claims
|
|
||||||
owned or controlled by the contributor, whether already acquired or
|
|
||||||
hereafter acquired, that would be infringed by some manner, permitted
|
|
||||||
by this License, of making, using, or selling its contributor version,
|
|
||||||
but do not include claims that would be infringed only as a
|
|
||||||
consequence of further modification of the contributor version. For
|
|
||||||
purposes of this definition, "control" includes the right to grant
|
|
||||||
patent sublicenses in a manner consistent with the requirements of
|
|
||||||
this License.
|
|
||||||
|
|
||||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
|
||||||
patent license under the contributor's essential patent claims, to
|
|
||||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
|
||||||
propagate the contents of its contributor version.
|
|
||||||
|
|
||||||
In the following three paragraphs, a "patent license" is any express
|
|
||||||
agreement or commitment, however denominated, not to enforce a patent
|
|
||||||
(such as an express permission to practice a patent or covenant not to
|
|
||||||
sue for patent infringement). To "grant" such a patent license to a
|
|
||||||
party means to make such an agreement or commitment not to enforce a
|
|
||||||
patent against the party.
|
|
||||||
|
|
||||||
If you convey a covered work, knowingly relying on a patent license,
|
|
||||||
and the Corresponding Source of the work is not available for anyone
|
|
||||||
to copy, free of charge and under the terms of this License, through a
|
|
||||||
publicly available network server or other readily accessible means,
|
|
||||||
then you must either (1) cause the Corresponding Source to be so
|
|
||||||
available, or (2) arrange to deprive yourself of the benefit of the
|
|
||||||
patent license for this particular work, or (3) arrange, in a manner
|
|
||||||
consistent with the requirements of this License, to extend the patent
|
|
||||||
license to downstream recipients. "Knowingly relying" means you have
|
|
||||||
actual knowledge that, but for the patent license, your conveying the
|
|
||||||
covered work in a country, or your recipient's use of the covered work
|
|
||||||
in a country, would infringe one or more identifiable patents in that
|
|
||||||
country that you have reason to believe are valid.
|
|
||||||
|
|
||||||
If, pursuant to or in connection with a single transaction or
|
|
||||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
|
||||||
covered work, and grant a patent license to some of the parties
|
|
||||||
receiving the covered work authorizing them to use, propagate, modify
|
|
||||||
or convey a specific copy of the covered work, then the patent license
|
|
||||||
you grant is automatically extended to all recipients of the covered
|
|
||||||
work and works based on it.
|
|
||||||
|
|
||||||
A patent license is "discriminatory" if it does not include within
|
|
||||||
the scope of its coverage, prohibits the exercise of, or is
|
|
||||||
conditioned on the non-exercise of one or more of the rights that are
|
|
||||||
specifically granted under this License. You may not convey a covered
|
|
||||||
work if you are a party to an arrangement with a third party that is
|
|
||||||
in the business of distributing software, under which you make payment
|
|
||||||
to the third party based on the extent of your activity of conveying
|
|
||||||
the work, and under which the third party grants, to any of the
|
|
||||||
parties who would receive the covered work from you, a discriminatory
|
|
||||||
patent license (a) in connection with copies of the covered work
|
|
||||||
conveyed by you (or copies made from those copies), or (b) primarily
|
|
||||||
for and in connection with specific products or compilations that
|
|
||||||
contain the covered work, unless you entered into that arrangement,
|
|
||||||
or that patent license was granted, prior to 28 March 2007.
|
|
||||||
|
|
||||||
Nothing in this License shall be construed as excluding or limiting
|
|
||||||
any implied license or other defenses to infringement that may
|
|
||||||
otherwise be available to you under applicable patent law.
|
|
||||||
|
|
||||||
12. No Surrender of Others' Freedom.
|
|
||||||
|
|
||||||
If conditions are imposed on you (whether by court order, agreement or
|
|
||||||
otherwise) that contradict the conditions of this License, they do not
|
|
||||||
excuse you from the conditions of this License. If you cannot convey a
|
|
||||||
covered work so as to satisfy simultaneously your obligations under this
|
|
||||||
License and any other pertinent obligations, then as a consequence you may
|
|
||||||
not convey it at all. For example, if you agree to terms that obligate you
|
|
||||||
to collect a royalty for further conveying from those to whom you convey
|
|
||||||
the Program, the only way you could satisfy both those terms and this
|
|
||||||
License would be to refrain entirely from conveying the Program.
|
|
||||||
|
|
||||||
13. Use with the GNU Affero General Public License.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, you have
|
|
||||||
permission to link or combine any covered work with a work licensed
|
|
||||||
under version 3 of the GNU Affero General Public License into a single
|
|
||||||
combined work, and to convey the resulting work. The terms of this
|
|
||||||
License will continue to apply to the part which is the covered work,
|
|
||||||
but the special requirements of the GNU Affero General Public License,
|
|
||||||
section 13, concerning interaction through a network will apply to the
|
|
||||||
combination as such.
|
|
||||||
|
|
||||||
14. Revised Versions of this License.
|
|
||||||
|
|
||||||
The Free Software Foundation may publish revised and/or new versions of
|
|
||||||
the GNU General Public License from time to time. Such new versions will
|
|
||||||
be similar in spirit to the present version, but may differ in detail to
|
|
||||||
address new problems or concerns.
|
|
||||||
|
|
||||||
Each version is given a distinguishing version number. If the
|
|
||||||
Program specifies that a certain numbered version of the GNU General
|
|
||||||
Public License "or any later version" applies to it, you have the
|
|
||||||
option of following the terms and conditions either of that numbered
|
|
||||||
version or of any later version published by the Free Software
|
|
||||||
Foundation. If the Program does not specify a version number of the
|
|
||||||
GNU General Public License, you may choose any version ever published
|
|
||||||
by the Free Software Foundation.
|
|
||||||
|
|
||||||
If the Program specifies that a proxy can decide which future
|
|
||||||
versions of the GNU General Public License can be used, that proxy's
|
|
||||||
public statement of acceptance of a version permanently authorizes you
|
|
||||||
to choose that version for the Program.
|
|
||||||
|
|
||||||
Later license versions may give you additional or different
|
|
||||||
permissions. However, no additional obligations are imposed on any
|
|
||||||
author or copyright holder as a result of your choosing to follow a
|
|
||||||
later version.
|
|
||||||
|
|
||||||
15. Disclaimer of Warranty.
|
|
||||||
|
|
||||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
|
||||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
|
||||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
|
||||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
||||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
|
||||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
|
||||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
|
||||||
|
|
||||||
16. Limitation of Liability.
|
|
||||||
|
|
||||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
|
||||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
|
||||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
|
||||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
|
||||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
|
||||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
|
||||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
|
||||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
|
||||||
SUCH DAMAGES.
|
|
||||||
|
|
||||||
17. Interpretation of Sections 15 and 16.
|
|
||||||
|
|
||||||
If the disclaimer of warranty and limitation of liability provided
|
|
||||||
above cannot be given local legal effect according to their terms,
|
|
||||||
reviewing courts shall apply local law that most closely approximates
|
|
||||||
an absolute waiver of all civil liability in connection with the
|
|
||||||
Program, unless a warranty or assumption of liability accompanies a
|
|
||||||
copy of the Program in return for a fee.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
How to Apply These Terms to Your New Programs
|
|
||||||
|
|
||||||
If you develop a new program, and you want it to be of the greatest
|
|
||||||
possible use to the public, the best way to achieve this is to make it
|
|
||||||
free software which everyone can redistribute and change under these terms.
|
|
||||||
|
|
||||||
To do so, attach the following notices to the program. It is safest
|
|
||||||
to attach them to the start of each source file to most effectively
|
|
||||||
state the exclusion of warranty; and each file should have at least
|
|
||||||
the "copyright" line and a pointer to where the full notice is found.
|
|
||||||
|
|
||||||
<one line to give the program's name and a brief idea of what it does.>
|
|
||||||
Copyright (C) <year> <name of author>
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
Also add information on how to contact you by electronic and paper mail.
|
|
||||||
|
|
||||||
If the program does terminal interaction, make it output a short
|
|
||||||
notice like this when it starts in an interactive mode:
|
|
||||||
|
|
||||||
<program> Copyright (C) <year> <name of author>
|
|
||||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
|
||||||
This is free software, and you are welcome to redistribute it
|
|
||||||
under certain conditions; type `show c' for details.
|
|
||||||
|
|
||||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
|
||||||
parts of the General Public License. Of course, your program's commands
|
|
||||||
might be different; for a GUI interface, you would use an "about box".
|
|
||||||
|
|
||||||
You should also get your employer (if you work as a programmer) or school,
|
|
||||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
|
||||||
For more information on this, and how to apply and follow the GNU GPL, see
|
|
||||||
<https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
The GNU General Public License does not permit incorporating your program
|
|
||||||
into proprietary programs. If your program is a subroutine library, you
|
|
||||||
may consider it more useful to permit linking proprietary applications with
|
|
||||||
the library. If this is what you want to do, use the GNU Lesser General
|
|
||||||
Public License instead of this License. But first, please read
|
|
||||||
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
chipset=ar71xx
|
||||||
|
subtarget=generic
|
||||||
|
images=("openwrt-${chipset}-${subtarget}-cpe210-220-v1-squashfs-*"
|
||||||
|
"openwrt-${chipset}-${subtarget}-cpe510-520-v1-squashfs-*"
|
||||||
|
)
|
|
@ -0,0 +1,34 @@
|
||||||
|
# Generated using "./buildscript config openwrt".
|
||||||
|
# Do no edit manually
|
||||||
|
#
|
||||||
|
CONFIG_TARGET_ar71xx=y
|
||||||
|
CONFIG_TARGET_ar71xx_generic=y
|
||||||
|
CONFIG_TARGET_MULTI_PROFILE=y
|
||||||
|
CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_cpe210-220-v1=y
|
||||||
|
CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_cpe210-220-v1="-rssileds"
|
||||||
|
CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_cpe510-520-v1=y
|
||||||
|
CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_cpe510-520-v1="-rssileds"
|
||||||
|
CONFIG_BUSYBOX_CUSTOM=y
|
||||||
|
CONFIG_TARGET_PER_DEVICE_ROOTFS=y
|
||||||
|
# CONFIG_BUSYBOX_CONFIG_BRCTL is not set
|
||||||
|
# CONFIG_BUSYBOX_CONFIG_CROND is not set
|
||||||
|
# CONFIG_BUSYBOX_CONFIG_CRONTAB is not set
|
||||||
|
# CONFIG_BUSYBOX_CONFIG_FEATURE_FAST_TOP is not set
|
||||||
|
# CONFIG_BUSYBOX_CONFIG_FEATURE_NTPD_SERVER is not set
|
||||||
|
CONFIG_CLEAN_IPKG=y
|
||||||
|
# CONFIG_DROPBEAR_CURVE25519 is not set
|
||||||
|
# CONFIG_FASTD_ENABLE_CIPHER_SALSA2012 is not set
|
||||||
|
# CONFIG_FASTD_ENABLE_MAC_GHASH is not set
|
||||||
|
# CONFIG_FASTD_ENABLE_MAC_UHASH is not set
|
||||||
|
# CONFIG_FASTD_ENABLE_METHOD_COMPOSED_GMAC is not set
|
||||||
|
# CONFIG_FASTD_ENABLE_METHOD_COMPOSED_UMAC is not set
|
||||||
|
# CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC is not set
|
||||||
|
# CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC is not set
|
||||||
|
CONFIG_KERNEL_SQUASHFS_FRAGMENT_CACHE_SIZE=1
|
||||||
|
# CONFIG_PACKAGE_ALFRED_VIS is not set
|
||||||
|
CONFIG_PACKAGE_hostapd-mini=y
|
||||||
|
CONFIG_PACKAGE_iwinfo=m
|
||||||
|
CONFIG_PACKAGE_libiwinfo=m
|
||||||
|
CONFIG_PACKAGE_opkg=m
|
||||||
|
CONFIG_PACKAGE_wpad-mini=m
|
||||||
|
CONFIG_STRIP_KERNEL_EXPORTS=y
|
|
@ -6,19 +6,24 @@ images=("openwrt-${chipset}-${subtarget}-glinet_gl-ar150-squashfs-*"
|
||||||
"openwrt-${chipset}-${subtarget}-tplink_archer-c60-v2-squashfs-*"
|
"openwrt-${chipset}-${subtarget}-tplink_archer-c60-v2-squashfs-*"
|
||||||
"openwrt-${chipset}-${subtarget}-tplink_archer-c7-v2-squashfs-*"
|
"openwrt-${chipset}-${subtarget}-tplink_archer-c7-v2-squashfs-*"
|
||||||
"openwrt-${chipset}-${subtarget}-tplink_archer-c7-v5-squashfs-*"
|
"openwrt-${chipset}-${subtarget}-tplink_archer-c7-v5-squashfs-*"
|
||||||
"openwrt-${chipset}-${subtarget}-tplink_cpe210-v1-squashfs-*"
|
|
||||||
"openwrt-${chipset}-${subtarget}-tplink_cpe210-v2-squashfs-*"
|
"openwrt-${chipset}-${subtarget}-tplink_cpe210-v2-squashfs-*"
|
||||||
"openwrt-${chipset}-${subtarget}-tplink_cpe210-v3-squashfs-*"
|
"openwrt-${chipset}-${subtarget}-tplink_cpe210-v3-squashfs-*"
|
||||||
"openwrt-${chipset}-${subtarget}-tplink_cpe510-v1-squashfs-*"
|
|
||||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wdr3500-v1-squashfs-*"
|
"openwrt-${chipset}-${subtarget}-tplink_tl-wdr3500-v1-squashfs-*"
|
||||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wdr3600-v1-squashfs-*"
|
"openwrt-${chipset}-${subtarget}-tplink_tl-wdr3600-v1-squashfs-*"
|
||||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wdr4300-v1-squashfs-*"
|
"openwrt-${chipset}-${subtarget}-tplink_tl-wdr4300-v1-squashfs-*"
|
||||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wdr4310-v1-squashfs-*"
|
"openwrt-${chipset}-${subtarget}-tplink_tl-wdr4310-v1-squashfs-*"
|
||||||
|
"openwrt-${chipset}-${subtarget}-tplink_tl-wr1043nd-v1-squashfs-*"
|
||||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wr1043nd-v2-squashfs-*"
|
"openwrt-${chipset}-${subtarget}-tplink_tl-wr1043nd-v2-squashfs-*"
|
||||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wr1043nd-v3-squashfs-*"
|
"openwrt-${chipset}-${subtarget}-tplink_tl-wr1043nd-v3-squashfs-*"
|
||||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wr1043nd-v4-squashfs-*"
|
"openwrt-${chipset}-${subtarget}-tplink_tl-wr1043nd-v4-squashfs-*"
|
||||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wr1043n-v5-squashfs-*"
|
"openwrt-${chipset}-${subtarget}-tplink_tl-wr1043n-v5-squashfs-*"
|
||||||
|
"openwrt-${chipset}-${subtarget}-tplink_tl-wr710n-v1-squashfs-*"
|
||||||
|
"openwrt-${chipset}-${subtarget}-tplink_tl-wr842n-v2-squashfs-*"
|
||||||
|
"openwrt-${chipset}-${subtarget}-ubnt_bullet-m-squashfs-*"
|
||||||
|
"openwrt-${chipset}-${subtarget}-ubnt_nanostation-loco-m-squashfs-*"
|
||||||
"openwrt-${chipset}-${subtarget}-ubnt_nanostation-loco-m-xw-squashfs-*"
|
"openwrt-${chipset}-${subtarget}-ubnt_nanostation-loco-m-xw-squashfs-*"
|
||||||
|
"openwrt-${chipset}-${subtarget}-ubnt_nanostation-m-squashfs-*"
|
||||||
|
"openwrt-${chipset}-${subtarget}-ubnt_picostation-m-squashfs-*"
|
||||||
"openwrt-${chipset}-${subtarget}-ubnt_unifi-squashfs-*"
|
"openwrt-${chipset}-${subtarget}-ubnt_unifi-squashfs-*"
|
||||||
"openwrt-${chipset}-${subtarget}-ubnt_unifiac-mesh-squashfs-*"
|
"openwrt-${chipset}-${subtarget}-ubnt_unifiac-mesh-squashfs-*"
|
||||||
)
|
)
|
||||||
|
|
|
@ -16,14 +16,10 @@ CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_archer-c7-v2=y
|
||||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_archer-c7-v2="-kmod-ath10k-ct kmod-ath10k -ath10k-firmware-qca988x-ct ath10k-firmware-qca988x"
|
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_archer-c7-v2="-kmod-ath10k-ct kmod-ath10k -ath10k-firmware-qca988x-ct ath10k-firmware-qca988x"
|
||||||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_archer-c7-v5=y
|
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_archer-c7-v5=y
|
||||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_archer-c7-v5="-kmod-ath10k-ct kmod-ath10k -ath10k-firmware-qca988x-ct ath10k-firmware-qca988x"
|
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_archer-c7-v5="-kmod-ath10k-ct kmod-ath10k -ath10k-firmware-qca988x-ct ath10k-firmware-qca988x"
|
||||||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_cpe210-v1=y
|
|
||||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_cpe210-v1="-rssileds"
|
|
||||||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_cpe210-v2=y
|
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_cpe210-v2=y
|
||||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_cpe210-v2="-rssileds"
|
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_cpe210-v2="-rssileds"
|
||||||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_cpe210-v3=y
|
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_cpe210-v3=y
|
||||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_cpe210-v3="-rssileds"
|
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_cpe210-v3="-rssileds"
|
||||||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_cpe510-v1=y
|
|
||||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_cpe510-v1="-rssileds"
|
|
||||||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_tl-wdr3500-v1=y
|
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_tl-wdr3500-v1=y
|
||||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_tl-wdr3500-v1=""
|
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_tl-wdr3500-v1=""
|
||||||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_tl-wdr3600-v1=y
|
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_tl-wdr3600-v1=y
|
||||||
|
@ -46,10 +42,8 @@ CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_tl-wr710n-v1=y
|
||||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_tl-wr710n-v1=""
|
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_tl-wr710n-v1=""
|
||||||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_tl-wr842n-v2=y
|
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_tplink_tl-wr842n-v2=y
|
||||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_tl-wr842n-v2=""
|
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_tplink_tl-wr842n-v2=""
|
||||||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_bullet-m-ar7240=y
|
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_bullet-m=y
|
||||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_ubnt_bullet-m-ar7240="-rssileds"
|
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_ubnt_bullet-m="-rssileds"
|
||||||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_bullet-m-ar7241=y
|
|
||||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_ubnt_bullet-m-ar7241="-rssileds"
|
|
||||||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_nanostation-loco-m=y
|
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_nanostation-loco-m=y
|
||||||
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_ubnt_nanostation-loco-m="-rssileds"
|
CONFIG_TARGET_DEVICE_PACKAGES_ath79_generic_DEVICE_ubnt_nanostation-loco-m="-rssileds"
|
||||||
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_nanostation-loco-m-xw=y
|
CONFIG_TARGET_DEVICE_ath79_generic_DEVICE_ubnt_nanostation-loco-m-xw=y
|
||||||
|
|
|
@ -0,0 +1,16 @@
|
||||||
|
chipset=ath79
|
||||||
|
subtarget=tiny
|
||||||
|
images=("openwrt-${chipset}-${subtarget}-tplink_tl-mr3020-v1-squashfs-*"
|
||||||
|
"openwrt-${chipset}-${subtarget}-tplink_tl-wa850re-v1-squashfs-*"
|
||||||
|
"openwrt-${chipset}-${subtarget}-tplink_tl-wa860re-v1-squashfs-*"
|
||||||
|
"openwrt-${chipset}-${subtarget}-tplink_tl-wa901nd-v2-squashfs-*"
|
||||||
|
"openwrt-${chipset}-${subtarget}-tplink_tl-wr740n-v4-squashfs-*"
|
||||||
|
"openwrt-${chipset}-${subtarget}-tplink_tl-wr741-v1-squashfs-*"
|
||||||
|
"openwrt-${chipset}-${subtarget}-tplink_tl-wr741nd-v4-squashfs-*"
|
||||||
|
"openwrt-${chipset}-${subtarget}-tplink_tl-wr841-v7-squashfs-*"
|
||||||
|
"openwrt-${chipset}-${subtarget}-tplink_tl-wr841-v8-squashfs-*"
|
||||||
|
"openwrt-${chipset}-${subtarget}-tplink_tl-wr841-v9-squashfs-*"
|
||||||
|
"openwrt-${chipset}-${subtarget}-tplink_tl-wr841-v10-squashfs-*"
|
||||||
|
"openwrt-${chipset}-${subtarget}-tplink_tl-wr841-v11-squashfs-*"
|
||||||
|
"openwrt-${chipset}-${subtarget}-tplink_tl-wr841-v12-squashfs-*"
|
||||||
|
)
|
|
@ -0,0 +1,56 @@
|
||||||
|
# Generated using "./buildscript config openwrt".
|
||||||
|
# Do no edit manually
|
||||||
|
#
|
||||||
|
CONFIG_TARGET_ath79=y
|
||||||
|
CONFIG_TARGET_ath79_tiny=y
|
||||||
|
CONFIG_TARGET_MULTI_PROFILE=y
|
||||||
|
CONFIG_TARGET_DEVICE_ath79_tiny_DEVICE_tplink_tl-mr3020-v1=y
|
||||||
|
CONFIG_TARGET_DEVICE_PACKAGES_ath79_tiny_DEVICE_tplink_tl-mr3020-v1="-uboot-envtools -kmod-usb-core -kmod-usb-chipidea2 -kmod-usb-ledtrig-usbport"
|
||||||
|
CONFIG_TARGET_DEVICE_ath79_tiny_DEVICE_tplink_tl-wa850re-v1=y
|
||||||
|
CONFIG_TARGET_DEVICE_PACKAGES_ath79_tiny_DEVICE_tplink_tl-wa850re-v1="-uboot-envtools -rssileds"
|
||||||
|
CONFIG_TARGET_DEVICE_ath79_tiny_DEVICE_tplink_tl-wa860re-v1=y
|
||||||
|
CONFIG_TARGET_DEVICE_PACKAGES_ath79_tiny_DEVICE_tplink_tl-wa860re-v1="-uboot-envtools"
|
||||||
|
CONFIG_TARGET_DEVICE_ath79_tiny_DEVICE_tplink_tl-wa901nd-v2=y
|
||||||
|
CONFIG_TARGET_DEVICE_PACKAGES_ath79_tiny_DEVICE_tplink_tl-wa901nd-v2="-uboot-envtools"
|
||||||
|
CONFIG_TARGET_DEVICE_ath79_tiny_DEVICE_tplink_tl-wr740n-v4=y
|
||||||
|
CONFIG_TARGET_DEVICE_PACKAGES_ath79_tiny_DEVICE_tplink_tl-wr740n-v4="-uboot-envtools"
|
||||||
|
CONFIG_TARGET_DEVICE_ath79_tiny_DEVICE_tplink_tl-wr741-v1=y
|
||||||
|
CONFIG_TARGET_DEVICE_PACKAGES_ath79_tiny_DEVICE_tplink_tl-wr741-v1="-uboot-envtools"
|
||||||
|
CONFIG_TARGET_DEVICE_ath79_tiny_DEVICE_tplink_tl-wr741nd-v4=y
|
||||||
|
CONFIG_TARGET_DEVICE_PACKAGES_ath79_tiny_DEVICE_tplink_tl-wr741nd-v4="-uboot-envtools"
|
||||||
|
CONFIG_TARGET_DEVICE_ath79_tiny_DEVICE_tplink_tl-wr841-v7=y
|
||||||
|
CONFIG_TARGET_DEVICE_PACKAGES_ath79_tiny_DEVICE_tplink_tl-wr841-v7="-uboot-envtools"
|
||||||
|
CONFIG_TARGET_DEVICE_ath79_tiny_DEVICE_tplink_tl-wr841-v8=y
|
||||||
|
CONFIG_TARGET_DEVICE_PACKAGES_ath79_tiny_DEVICE_tplink_tl-wr841-v8="-uboot-envtools"
|
||||||
|
CONFIG_TARGET_DEVICE_ath79_tiny_DEVICE_tplink_tl-wr841-v9=y
|
||||||
|
CONFIG_TARGET_DEVICE_PACKAGES_ath79_tiny_DEVICE_tplink_tl-wr841-v9="-uboot-envtools"
|
||||||
|
CONFIG_TARGET_DEVICE_ath79_tiny_DEVICE_tplink_tl-wr841-v10=y
|
||||||
|
CONFIG_TARGET_DEVICE_PACKAGES_ath79_tiny_DEVICE_tplink_tl-wr841-v10="-uboot-envtools"
|
||||||
|
CONFIG_TARGET_DEVICE_ath79_tiny_DEVICE_tplink_tl-wr841-v11=y
|
||||||
|
CONFIG_TARGET_DEVICE_PACKAGES_ath79_tiny_DEVICE_tplink_tl-wr841-v11="-uboot-envtools"
|
||||||
|
CONFIG_TARGET_DEVICE_ath79_tiny_DEVICE_tplink_tl-wr841-v12=y
|
||||||
|
CONFIG_TARGET_DEVICE_PACKAGES_ath79_tiny_DEVICE_tplink_tl-wr841-v12="-uboot-envtools"
|
||||||
|
CONFIG_BUSYBOX_CUSTOM=y
|
||||||
|
CONFIG_TARGET_PER_DEVICE_ROOTFS=y
|
||||||
|
# CONFIG_BUSYBOX_CONFIG_BRCTL is not set
|
||||||
|
# CONFIG_BUSYBOX_CONFIG_CROND is not set
|
||||||
|
# CONFIG_BUSYBOX_CONFIG_CRONTAB is not set
|
||||||
|
# CONFIG_BUSYBOX_CONFIG_FEATURE_FAST_TOP is not set
|
||||||
|
# CONFIG_BUSYBOX_CONFIG_FEATURE_NTPD_SERVER is not set
|
||||||
|
CONFIG_CLEAN_IPKG=y
|
||||||
|
# CONFIG_DROPBEAR_CURVE25519 is not set
|
||||||
|
# CONFIG_FASTD_ENABLE_CIPHER_SALSA2012 is not set
|
||||||
|
# CONFIG_FASTD_ENABLE_MAC_GHASH is not set
|
||||||
|
# CONFIG_FASTD_ENABLE_MAC_UHASH is not set
|
||||||
|
# CONFIG_FASTD_ENABLE_METHOD_COMPOSED_GMAC is not set
|
||||||
|
# CONFIG_FASTD_ENABLE_METHOD_COMPOSED_UMAC is not set
|
||||||
|
# CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC is not set
|
||||||
|
# CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC is not set
|
||||||
|
CONFIG_KERNEL_SQUASHFS_FRAGMENT_CACHE_SIZE=1
|
||||||
|
# CONFIG_PACKAGE_ALFRED_VIS is not set
|
||||||
|
CONFIG_PACKAGE_hostapd-mini=y
|
||||||
|
CONFIG_PACKAGE_iwinfo=m
|
||||||
|
CONFIG_PACKAGE_libiwinfo=m
|
||||||
|
CONFIG_PACKAGE_opkg=m
|
||||||
|
CONFIG_PACKAGE_wpad-mini=m
|
||||||
|
CONFIG_STRIP_KERNEL_EXPORTS=y
|
|
@ -14,7 +14,7 @@ export HOME=${HOME:-/root}
|
||||||
[ -x /usr/bin/ldd ] || ldd() { LD_TRACE_LOADED_OBJECTS=1 $*; }
|
[ -x /usr/bin/ldd ] || ldd() { LD_TRACE_LOADED_OBJECTS=1 $*; }
|
||||||
|
|
||||||
# update uhttpd passwd on passwd-change
|
# update uhttpd passwd on passwd-change
|
||||||
[ -e /etc/rc.d/S50uhttpd ] && passwd() { /bin/passwd "$@" && /etc/init.d/uhttpd restart; }
|
[ -e /etc/rc.d/S50uhttpd ] && passwd() { /bin/passwd && /etc/init.d/uhttpd restart; }
|
||||||
|
|
||||||
# I'm lazy, let's add some aliases
|
# I'm lazy, let's add some aliases
|
||||||
alias ..='cd ..'
|
alias ..='cd ..'
|
||||||
|
@ -23,7 +23,6 @@ alias l='ls -CF'
|
||||||
alias la='ls -A'
|
alias la='ls -A'
|
||||||
alias ll='ls -alF'
|
alias ll='ls -alF'
|
||||||
alias ls='ls --color=auto'
|
alias ls='ls --color=auto'
|
||||||
alias ip='ip --color=auto'
|
|
||||||
|
|
||||||
# and color my prompt
|
# and color my prompt
|
||||||
export PS1='\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
|
export PS1='\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
chipset=ipq40xx
|
|
||||||
subtarget=generic
|
|
||||||
|
|
||||||
images=(
|
|
||||||
"openwrt-${chipset}-${subtarget}-avm_fritzbox-4040-squashfs-*"
|
|
||||||
)
|
|
|
@ -1,25 +0,0 @@
|
||||||
# Generated using "./buildscript config openwrt".
|
|
||||||
# Do no edit manually
|
|
||||||
#
|
|
||||||
CONFIG_TARGET_ipq40xx=y
|
|
||||||
CONFIG_TARGET_ipq40xx_generic=y
|
|
||||||
CONFIG_TARGET_MULTI_PROFILE=y
|
|
||||||
CONFIG_TARGET_DEVICE_ipq40xx_generic_DEVICE_avm_fritzbox-4040=y
|
|
||||||
CONFIG_TARGET_DEVICE_PACKAGES_ipq40xx_generic_DEVICE_avm_fritzbox-4040="-kmod-ath10k-ct kmod-ath10k -ath10k-firmware-qca4019-ct ath10k-firmware-qca4019"
|
|
||||||
CONFIG_BUSYBOX_CUSTOM=y
|
|
||||||
CONFIG_TARGET_PER_DEVICE_ROOTFS=y
|
|
||||||
# CONFIG_BUSYBOX_CONFIG_BRCTL is not set
|
|
||||||
# CONFIG_BUSYBOX_CONFIG_CROND is not set
|
|
||||||
# CONFIG_BUSYBOX_CONFIG_CRONTAB is not set
|
|
||||||
# CONFIG_BUSYBOX_CONFIG_FEATURE_FAST_TOP is not set
|
|
||||||
# CONFIG_BUSYBOX_CONFIG_FEATURE_NTPD_SERVER is not set
|
|
||||||
CONFIG_CLEAN_IPKG=y
|
|
||||||
# CONFIG_DROPBEAR_CURVE25519 is not set
|
|
||||||
# CONFIG_PACKAGE_ALFRED_VIS is not set
|
|
||||||
CONFIG_PACKAGE_ath10k-firmware-qca4019=m
|
|
||||||
CONFIG_PACKAGE_ath10k-firmware-qca4019-ct=m
|
|
||||||
CONFIG_PACKAGE_kmod-ath10k=m
|
|
||||||
CONFIG_PACKAGE_kmod-ath10k-ct=m
|
|
||||||
CONFIG_PACKAGE_opkg=m
|
|
||||||
CONFIG_STRIP_KERNEL_EXPORTS=y
|
|
||||||
CONFIG_PACKAGE_kmod-hwmon-core=y
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
chipset=mpc85xx
|
||||||
|
subtarget=generic
|
||||||
|
|
||||||
|
images=(
|
||||||
|
"openwrt-${chipset}-${subtarget}-tl-wdr4900-v1-squashfs-*"
|
||||||
|
)
|
|
@ -2,10 +2,10 @@
|
||||||
# Do no edit manually
|
# Do no edit manually
|
||||||
#
|
#
|
||||||
CONFIG_TARGET_mpc85xx=y
|
CONFIG_TARGET_mpc85xx=y
|
||||||
CONFIG_TARGET_mpc85xx_p1010=y
|
CONFIG_TARGET_mpc85xx_generic=y
|
||||||
CONFIG_TARGET_MULTI_PROFILE=y
|
CONFIG_TARGET_MULTI_PROFILE=y
|
||||||
CONFIG_TARGET_DEVICE_mpc85xx_p1010_DEVICE_tplink_tl-wdr4900-v1=y
|
CONFIG_TARGET_DEVICE_mpc85xx_generic_DEVICE_tl-wdr4900-v1=y
|
||||||
CONFIG_TARGET_DEVICE_PACKAGES_mpc85xx_p1010_DEVICE_tplink_tl-wdr4900-v1=""
|
CONFIG_TARGET_DEVICE_PACKAGES_mpc85xx_generic_DEVICE_tl-wdr4900-v1=""
|
||||||
CONFIG_BUSYBOX_CUSTOM=y
|
CONFIG_BUSYBOX_CUSTOM=y
|
||||||
CONFIG_TARGET_PER_DEVICE_ROOTFS=y
|
CONFIG_TARGET_PER_DEVICE_ROOTFS=y
|
||||||
# CONFIG_BUSYBOX_CONFIG_BRCTL is not set
|
# CONFIG_BUSYBOX_CONFIG_BRCTL is not set
|
|
@ -1,6 +0,0 @@
|
||||||
chipset=mpc85xx
|
|
||||||
subtarget=p1010
|
|
||||||
|
|
||||||
images=(
|
|
||||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wdr4900-v1-squashfs-*"
|
|
||||||
)
|
|
|
@ -1,6 +0,0 @@
|
||||||
chipset=octeon
|
|
||||||
subtarget=generic
|
|
||||||
|
|
||||||
images=(
|
|
||||||
"openwrt-${chipset}-ubnt_edgerouter-4-*"
|
|
||||||
)
|
|
|
@ -1,21 +0,0 @@
|
||||||
# Generated using "./buildscript config openwrt".
|
|
||||||
# Do no edit manually
|
|
||||||
#
|
|
||||||
CONFIG_TARGET_octeon=y
|
|
||||||
CONFIG_TARGET_MULTI_PROFILE=y
|
|
||||||
CONFIG_TARGET_PER_DEVICE_ROOTFS=y
|
|
||||||
CONFIG_TARGET_DEVICE_octeon_DEVICE_ubnt_edgerouter-4=y
|
|
||||||
CONFIG_TARGET_DEVICE_PACKAGES_octeon_DEVICE_ubnt_edgerouter-4=""
|
|
||||||
CONFIG_BUSYBOX_CUSTOM=y
|
|
||||||
CONFIG_TARGET_PER_DEVICE_ROOTFS=y
|
|
||||||
# CONFIG_BUSYBOX_CONFIG_BRCTL is not set
|
|
||||||
# CONFIG_BUSYBOX_CONFIG_CROND is not set
|
|
||||||
# CONFIG_BUSYBOX_CONFIG_CRONTAB is not set
|
|
||||||
# CONFIG_BUSYBOX_CONFIG_FEATURE_FAST_TOP is not set
|
|
||||||
# CONFIG_BUSYBOX_CONFIG_FEATURE_NTPD_SERVER is not set
|
|
||||||
CONFIG_CLEAN_IPKG=y
|
|
||||||
# CONFIG_DROPBEAR_CURVE25519 is not set
|
|
||||||
# CONFIG_PACKAGE_ALFRED_VIS is not set
|
|
||||||
CONFIG_PACKAGE_opkg=m
|
|
||||||
CONFIG_STRIP_KERNEL_EXPORTS=y
|
|
||||||
CONFIG_TARGET_SQUASHFS_BLOCK_SIZE=512
|
|
|
@ -2,8 +2,7 @@ chipset=ramips
|
||||||
subtarget=mt7621
|
subtarget=mt7621
|
||||||
|
|
||||||
images=(
|
images=(
|
||||||
"openwrt-ramips-mt7621-netgear_r6220-squashfs-*"
|
"openwrt-ramips-mt7621-r6220-squashfs-*"
|
||||||
"openwrt-ramips-mt7621-ubnt_edgerouter-x-squashfs-*"
|
"openwrt-ramips-mt7621-ubnt-erx-squashfs-*"
|
||||||
"openwrt-ramips-mt7621-ubnt_edgerouter-x-sfp-squashfs-*"
|
"openwrt-ramips-mt7621-ubnt-erx-sfp-squashfs-*"
|
||||||
"openwrt-ramips-mt7621-xiaomi_mi-router-4a-gigabit-squashfs-*"
|
|
||||||
)
|
)
|
||||||
|
|
|
@ -4,14 +4,12 @@
|
||||||
CONFIG_TARGET_ramips=y
|
CONFIG_TARGET_ramips=y
|
||||||
CONFIG_TARGET_ramips_mt7621=y
|
CONFIG_TARGET_ramips_mt7621=y
|
||||||
CONFIG_TARGET_MULTI_PROFILE=y
|
CONFIG_TARGET_MULTI_PROFILE=y
|
||||||
CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_netgear_r6220=y
|
CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_r6220=y
|
||||||
CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt7621_DEVICE_netgear_r6220=""
|
CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt7621_DEVICE_r6220=""
|
||||||
CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_ubnt_edgerouter-x=y
|
CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_ubnt-erx=y
|
||||||
CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt7621_DEVICE_ubnt_edgerouter-x=""
|
CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt7621_DEVICE_ubnt-erx=""
|
||||||
CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_ubnt_edgerouter-x-sfp=y
|
CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_ubnt-erx-sfp=y
|
||||||
CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt7621_DEVICE_ubnt_edgerouter-x-sfp=""
|
CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt7621_DEVICE_ubnt-erx-sfp=""
|
||||||
CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_xiaomi_mi-router-4a-gigabit=y
|
|
||||||
CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt7621_DEVICE_xiaomi_mi-router-4a-gigabit=""
|
|
||||||
CONFIG_BUSYBOX_CUSTOM=y
|
CONFIG_BUSYBOX_CUSTOM=y
|
||||||
CONFIG_TARGET_PER_DEVICE_ROOTFS=y
|
CONFIG_TARGET_PER_DEVICE_ROOTFS=y
|
||||||
# CONFIG_BUSYBOX_CONFIG_BRCTL is not set
|
# CONFIG_BUSYBOX_CONFIG_BRCTL is not set
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
chipset=ramips
|
chipset=ramips
|
||||||
subtarget=mt76x8
|
subtarget=mt76x8
|
||||||
images=("openwrt-${chipset}-${subtarget}-tplink_archer-c50-v3-squashfs-*"
|
images=("openwrt-${chipset}-${subtarget}-tplink_c50-v3-squashfs-*"
|
||||||
"openwrt-${chipset}-${subtarget}-tplink_archer-c50-v4-squashfs-*"
|
"openwrt-${chipset}-${subtarget}-tplink_c50-v4-squashfs-*"
|
||||||
"openwrt-${chipset}-${subtarget}-tplink_tl-wr841n-v13-squashfs-*"
|
"openwrt-${chipset}-${subtarget}-tl-wr841n-v13-squashfs-*"
|
||||||
"openwrt-${chipset}-${subtarget}-xiaomi_mi-router-4a-100m-squashfs-*"
|
|
||||||
)
|
)
|
||||||
|
|
|
@ -4,14 +4,12 @@
|
||||||
CONFIG_TARGET_ramips=y
|
CONFIG_TARGET_ramips=y
|
||||||
CONFIG_TARGET_ramips_mt76x8=y
|
CONFIG_TARGET_ramips_mt76x8=y
|
||||||
CONFIG_TARGET_MULTI_PROFILE=y
|
CONFIG_TARGET_MULTI_PROFILE=y
|
||||||
CONFIG_TARGET_DEVICE_ramips_mt76x8_DEVICE_tplink_archer-c50-v3=y
|
CONFIG_TARGET_DEVICE_ramips_mt76x8_DEVICE_tplink_c50-v3=y
|
||||||
CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt76x8_DEVICE_tplink_archer-c50-v3=""
|
CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt76x8_DEVICE_tplink_c50-v3=""
|
||||||
CONFIG_TARGET_DEVICE_ramips_mt76x8_DEVICE_tplink_archer-c50-v4=y
|
CONFIG_TARGET_DEVICE_ramips_mt76x8_DEVICE_tplink_c50-v4=y
|
||||||
CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt76x8_DEVICE_tplink_archer-c50-v4=""
|
CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt76x8_DEVICE_tplink_c50-v4=""
|
||||||
CONFIG_TARGET_DEVICE_ramips_mt76x8_DEVICE_tplink_tl-wr841n-v13=y
|
CONFIG_TARGET_DEVICE_ramips_mt76x8_DEVICE_tl-wr841n-v13=y
|
||||||
CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt76x8_DEVICE_tplink_tl-wr841n-v13=""
|
CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt76x8_DEVICE_tl-wr841n-v13=""
|
||||||
CONFIG_TARGET_DEVICE_ramips_mt76x8_DEVICE_xiaomi_mi-router-4a-100m=y
|
|
||||||
CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt76x8_DEVICE_xiaomi_mi-router-4a-100m=""
|
|
||||||
CONFIG_BUSYBOX_CUSTOM=y
|
CONFIG_BUSYBOX_CUSTOM=y
|
||||||
CONFIG_TARGET_PER_DEVICE_ROOTFS=y
|
CONFIG_TARGET_PER_DEVICE_ROOTFS=y
|
||||||
# CONFIG_BUSYBOX_CONFIG_BRCTL is not set
|
# CONFIG_BUSYBOX_CONFIG_BRCTL is not set
|
||||||
|
|
|
@ -1,890 +0,0 @@
|
||||||
From 0b7311300b01d9975e9996327ee469e4f66fb2ec Mon Sep 17 00:00:00 2001
|
|
||||||
From: Hauke Mehrtens <hauke@hauke-m.de>
|
|
||||||
Date: Sat, 6 Nov 2021 19:29:39 +0000
|
|
||||||
Subject: [PATCH] kernel: bump 5.4 to 5.4.158
|
|
||||||
|
|
||||||
Removed upstreamed:
|
|
||||||
generic/backport-5.4/790-v5.7-net-switchdev-do-not-propagate-bridge-updates-across.patch
|
|
||||||
|
|
||||||
All others updated automatically.
|
|
||||||
|
|
||||||
Compile-tested on: lantiq/xrx200, armvirt/64
|
|
||||||
Runtime-tested on: lantiq/xrx200, armvirt/64
|
|
||||||
|
|
||||||
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|
||||||
---
|
|
||||||
include/kernel-version.mk | 4 +-
|
|
||||||
...mware-loader-for-uPD720201-and-uPD72.patch | 10 ++--
|
|
||||||
.../802-usb-xhci-force-msi-renesas-xhci.patch | 2 +-
|
|
||||||
...Show-that-the-VIA-VL805-supports-LPM.patch | 2 +-
|
|
||||||
...-for-updating-interrupt-endpoint-int.patch | 4 +-
|
|
||||||
...hci_fixup_endpoint-for-interval-adju.patch | 4 +-
|
|
||||||
...or-host-controllers-that-don-t-updat.patch | 6 +-
|
|
||||||
...-0504-mmc-sdhci-Silence-MMC-warnings.patch | 4 +-
|
|
||||||
...-quirks-add-link-TRB-quirk-for-VL805.patch | 4 +-
|
|
||||||
...ast-GRO-for-skbs-with-Ethernet-heade.patch | 2 +-
|
|
||||||
...-net-phy-add-core-phylib-sfp-support.patch | 4 +-
|
|
||||||
...-not-propagate-bridge-updates-across.patch | 60 -------------------
|
|
||||||
...sfs-attributes-for-VPD-pages-0h-and-.patch | 10 ++--
|
|
||||||
.../generic/hack-5.4/220-gc_sections.patch | 2 +-
|
|
||||||
.../generic/hack-5.4/721-phy_packets.patch | 2 +-
|
|
||||||
...ng-with-source-address-failed-policy.patch | 26 ++++----
|
|
||||||
...T-skip-GRO-for-foreign-MAC-addresses.patch | 10 ++--
|
|
||||||
...dd-support-for-threaded-NAPI-polling.patch | 14 ++---
|
|
||||||
.../811-pci_disable_usb_common_quirks.patch | 2 +-
|
|
||||||
...arch-arm-force-ZRELADDR-on-arch-qcom.patch | 2 +-
|
|
||||||
...Mangle-bootloader-s-kernel-arguments.patch | 2 +-
|
|
||||||
.../900-arm-add-cmdline-override.patch | 2 +-
|
|
||||||
...5-NET-MIPS-lantiq-adds-xrx200-legacy.patch | 2 +-
|
|
||||||
...move-EH-SINGLE_STEP_SET_FEATURE-impl.patch | 4 +-
|
|
||||||
...host-xhci-add-EH-SINGLE_STEP_SET_FEA.patch | 4 +-
|
|
||||||
...host-xhci-do-not-return-error-status.patch | 2 +-
|
|
||||||
...-host-xhci-add-.bus_suspend-override.patch | 2 +-
|
|
||||||
.../901-fix_irq_type_of_pca953x.patch | 2 +-
|
|
||||||
...Mangle-bootloader-s-kernel-arguments.patch | 2 +-
|
|
||||||
...Mangle-bootloader-s-kernel-arguments.patch | 2 +-
|
|
||||||
.../patches-5.4/200-add-ralink-eth.patch | 2 +-
|
|
||||||
.../990-NET-no-auto-carrier-off-support.patch | 4 +-
|
|
||||||
...net-add-support-for-rtl838x-ethernet.patch | 2 +-
|
|
||||||
33 files changed, 73 insertions(+), 133 deletions(-)
|
|
||||||
delete mode 100644 target/linux/generic/backport-5.4/790-v5.7-net-switchdev-do-not-propagate-bridge-updates-across.patch
|
|
||||||
|
|
||||||
diff --git a/include/kernel-version.mk b/include/kernel-version.mk
|
|
||||||
index 83bfcd8ff2..688660cbbd 100644
|
|
||||||
--- a/include/kernel-version.mk
|
|
||||||
+++ b/include/kernel-version.mk
|
|
||||||
@@ -6,9 +6,9 @@ ifdef CONFIG_TESTING_KERNEL
|
|
||||||
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
|
|
||||||
endif
|
|
||||||
|
|
||||||
-LINUX_VERSION-5.4 = .154
|
|
||||||
+LINUX_VERSION-5.4 = .158
|
|
||||||
|
|
||||||
-LINUX_KERNEL_HASH-5.4.154 = 058994f4666b6b0474a4d5228583e394594e406783b7e93d487c2a66c35f3c06
|
|
||||||
+LINUX_KERNEL_HASH-5.4.158 = 6e018fecdc8fc24553756e582d83b82d65b10a6b03ef36262a24911f839b8d59
|
|
||||||
|
|
||||||
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
|
||||||
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
|
|
||||||
diff --git a/target/linux/apm821xx/patches-5.4/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch b/target/linux/apm821xx/patches-5.4/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch
|
|
||||||
index 980a0407db..220e5da73b 100644
|
|
||||||
--- a/target/linux/apm821xx/patches-5.4/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch
|
|
||||||
+++ b/target/linux/apm821xx/patches-5.4/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch
|
|
||||||
@@ -48,7 +48,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
|
|
||||||
|
|
||||||
#include "xhci.h"
|
|
||||||
#include "xhci-trace.h"
|
|
||||||
-@@ -64,6 +66,44 @@
|
|
||||||
+@@ -65,6 +67,44 @@
|
|
||||||
#define PCI_DEVICE_ID_ASMEDIA_2142_XHCI 0x2142
|
|
||||||
#define PCI_DEVICE_ID_ASMEDIA_3242_XHCI 0x3242
|
|
||||||
|
|
||||||
@@ -93,7 +93,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
|
|
||||||
static const char hcd_name[] = "xhci_hcd";
|
|
||||||
|
|
||||||
static struct hc_driver __read_mostly xhci_pci_hc_driver;
|
|
||||||
-@@ -309,6 +349,873 @@ static void xhci_pme_acpi_rtd3_enable(st
|
|
||||||
+@@ -311,6 +351,873 @@ static void xhci_pme_acpi_rtd3_enable(st
|
|
||||||
static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) { }
|
|
||||||
#endif /* CONFIG_ACPI */
|
|
||||||
|
|
||||||
@@ -967,7 +967,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
|
|
||||||
/* called during probe() after chip reset completes */
|
|
||||||
static int xhci_pci_setup(struct usb_hcd *hcd)
|
|
||||||
{
|
|
||||||
-@@ -350,6 +1257,27 @@ static int xhci_pci_probe(struct pci_dev
|
|
||||||
+@@ -352,6 +1259,27 @@ static int xhci_pci_probe(struct pci_dev
|
|
||||||
struct hc_driver *driver;
|
|
||||||
struct usb_hcd *hcd;
|
|
||||||
|
|
||||||
@@ -995,7 +995,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
|
|
||||||
driver = (struct hc_driver *)id->driver_data;
|
|
||||||
|
|
||||||
/* Prevent runtime suspending between USB-2 and USB-3 initialization */
|
|
||||||
-@@ -411,6 +1339,16 @@ static void xhci_pci_remove(struct pci_d
|
|
||||||
+@@ -413,6 +1341,16 @@ static void xhci_pci_remove(struct pci_d
|
|
||||||
{
|
|
||||||
struct xhci_hcd *xhci;
|
|
||||||
|
|
||||||
@@ -1012,7 +1012,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
|
|
||||||
xhci = hcd_to_xhci(pci_get_drvdata(dev));
|
|
||||||
xhci->xhc_state |= XHCI_STATE_REMOVING;
|
|
||||||
|
|
||||||
-@@ -550,6 +1488,11 @@ static int xhci_pci_resume(struct usb_hc
|
|
||||||
+@@ -552,6 +1490,11 @@ static int xhci_pci_resume(struct usb_hc
|
|
||||||
if (pdev->vendor == PCI_VENDOR_ID_INTEL)
|
|
||||||
usb_enable_intel_xhci_ports(pdev);
|
|
||||||
|
|
||||||
diff --git a/target/linux/apm821xx/patches-5.4/802-usb-xhci-force-msi-renesas-xhci.patch b/target/linux/apm821xx/patches-5.4/802-usb-xhci-force-msi-renesas-xhci.patch
|
|
||||||
index 4217a1e949..6980ce80ee 100644
|
|
||||||
--- a/target/linux/apm821xx/patches-5.4/802-usb-xhci-force-msi-renesas-xhci.patch
|
|
||||||
+++ b/target/linux/apm821xx/patches-5.4/802-usb-xhci-force-msi-renesas-xhci.patch
|
|
||||||
@@ -13,7 +13,7 @@ produce a noisy warning.
|
|
||||||
|
|
||||||
--- a/drivers/usb/host/xhci-pci.c
|
|
||||||
+++ b/drivers/usb/host/xhci-pci.c
|
|
||||||
-@@ -288,6 +288,7 @@ static void xhci_pci_quirks(struct devic
|
|
||||||
+@@ -290,6 +290,7 @@ static void xhci_pci_quirks(struct devic
|
|
||||||
pdev->device == 0x0015) {
|
|
||||||
xhci->quirks |= XHCI_RESET_ON_RESUME;
|
|
||||||
xhci->quirks |= XHCI_ZERO_64B_REGS;
|
|
||||||
diff --git a/target/linux/bcm27xx/patches-5.4/950-0211-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch b/target/linux/bcm27xx/patches-5.4/950-0211-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch
|
|
||||||
index 5679126103..cf3cb58362 100644
|
|
||||||
--- a/target/linux/bcm27xx/patches-5.4/950-0211-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch
|
|
||||||
+++ b/target/linux/bcm27xx/patches-5.4/950-0211-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch
|
|
||||||
@@ -10,7 +10,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|
||||||
|
|
||||||
--- a/drivers/usb/host/xhci-pci.c
|
|
||||||
+++ b/drivers/usb/host/xhci-pci.c
|
|
||||||
-@@ -257,6 +257,10 @@ static void xhci_pci_quirks(struct devic
|
|
||||||
+@@ -259,6 +259,10 @@ static void xhci_pci_quirks(struct devic
|
|
||||||
pdev->device == 0x3432)
|
|
||||||
xhci->quirks |= XHCI_BROKEN_STREAMS;
|
|
||||||
|
|
||||||
diff --git a/target/linux/bcm27xx/patches-5.4/950-0218-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch b/target/linux/bcm27xx/patches-5.4/950-0218-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch
|
|
||||||
index 9e886ee2df..f654cd8a57 100644
|
|
||||||
--- a/target/linux/bcm27xx/patches-5.4/950-0218-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch
|
|
||||||
+++ b/target/linux/bcm27xx/patches-5.4/950-0218-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch
|
|
||||||
@@ -81,7 +81,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|
||||||
extern int usb_driver_set_configuration(struct usb_device *udev, int config);
|
|
||||||
--- a/include/linux/usb/hcd.h
|
|
||||||
+++ b/include/linux/usb/hcd.h
|
|
||||||
-@@ -384,6 +384,11 @@ struct hc_driver {
|
|
||||||
+@@ -382,6 +382,11 @@ struct hc_driver {
|
|
||||||
* or bandwidth constraints.
|
|
||||||
*/
|
|
||||||
void (*reset_bandwidth)(struct usb_hcd *, struct usb_device *);
|
|
||||||
@@ -93,7 +93,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|
||||||
/* Returns the hardware-chosen device address */
|
|
||||||
int (*address_device)(struct usb_hcd *, struct usb_device *udev);
|
|
||||||
/* prepares the hardware to send commands to the device */
|
|
||||||
-@@ -445,6 +450,8 @@ extern void usb_hcd_unmap_urb_setup_for_
|
|
||||||
+@@ -443,6 +448,8 @@ extern void usb_hcd_unmap_urb_setup_for_
|
|
||||||
extern void usb_hcd_unmap_urb_for_dma(struct usb_hcd *, struct urb *);
|
|
||||||
extern void usb_hcd_flush_endpoint(struct usb_device *udev,
|
|
||||||
struct usb_host_endpoint *ep);
|
|
||||||
diff --git a/target/linux/bcm27xx/patches-5.4/950-0219-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch b/target/linux/bcm27xx/patches-5.4/950-0219-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch
|
|
||||||
index 1016627521..b316ef8180 100644
|
|
||||||
--- a/target/linux/bcm27xx/patches-5.4/950-0219-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch
|
|
||||||
+++ b/target/linux/bcm27xx/patches-5.4/950-0219-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch
|
|
||||||
@@ -15,7 +15,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|
||||||
|
|
||||||
--- a/drivers/usb/host/xhci.c
|
|
||||||
+++ b/drivers/usb/host/xhci.c
|
|
||||||
-@@ -1469,6 +1469,103 @@ command_cleanup:
|
|
||||||
+@@ -1468,6 +1468,103 @@ command_cleanup:
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
@@ -119,7 +119,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|
||||||
* non-error returns are a promise to giveback() the urb later
|
|
||||||
* we drop ownership so next owner (or urb unlink) can get it
|
|
||||||
*/
|
|
||||||
-@@ -5358,6 +5455,7 @@ static const struct hc_driver xhci_hc_dr
|
|
||||||
+@@ -5362,6 +5459,7 @@ static const struct hc_driver xhci_hc_dr
|
|
||||||
.endpoint_reset = xhci_endpoint_reset,
|
|
||||||
.check_bandwidth = xhci_check_bandwidth,
|
|
||||||
.reset_bandwidth = xhci_reset_bandwidth,
|
|
||||||
diff --git a/target/linux/bcm27xx/patches-5.4/950-0264-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch b/target/linux/bcm27xx/patches-5.4/950-0264-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch
|
|
||||||
index 947b00b398..683f0905ef 100644
|
|
||||||
--- a/target/linux/bcm27xx/patches-5.4/950-0264-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch
|
|
||||||
+++ b/target/linux/bcm27xx/patches-5.4/950-0264-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch
|
|
||||||
@@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|
||||||
|
|
||||||
--- a/drivers/usb/host/xhci-pci.c
|
|
||||||
+++ b/drivers/usb/host/xhci-pci.c
|
|
||||||
-@@ -258,8 +258,10 @@ static void xhci_pci_quirks(struct devic
|
|
||||||
+@@ -260,8 +260,10 @@ static void xhci_pci_quirks(struct devic
|
|
||||||
xhci->quirks |= XHCI_BROKEN_STREAMS;
|
|
||||||
|
|
||||||
if (pdev->vendor == PCI_VENDOR_ID_VIA &&
|
|
||||||
@@ -37,7 +37,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|
||||||
pdev->device == PCI_DEVICE_ID_ASMEDIA_1042_XHCI)
|
|
||||||
--- a/drivers/usb/host/xhci-ring.c
|
|
||||||
+++ b/drivers/usb/host/xhci-ring.c
|
|
||||||
-@@ -550,7 +550,10 @@ void xhci_find_new_dequeue_state(struct
|
|
||||||
+@@ -556,7 +556,10 @@ void xhci_find_new_dequeue_state(struct
|
|
||||||
struct xhci_virt_ep *ep = &dev->eps[ep_index];
|
|
||||||
struct xhci_ring *ep_ring;
|
|
||||||
struct xhci_segment *new_seg;
|
|
||||||
@@ -48,7 +48,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
|
|
||||||
dma_addr_t addr;
|
|
||||||
u64 hw_dequeue;
|
|
||||||
bool cycle_found = false;
|
|
||||||
-@@ -588,7 +591,28 @@ void xhci_find_new_dequeue_state(struct
|
|
||||||
+@@ -594,7 +597,28 @@ void xhci_find_new_dequeue_state(struct
|
|
||||||
hw_dequeue = xhci_get_hw_deq(xhci, dev, ep_index, stream_id);
|
|
||||||
new_seg = ep_ring->deq_seg;
|
|
||||||
new_deq = ep_ring->dequeue;
|
|
||||||
diff --git a/target/linux/bcm27xx/patches-5.4/950-0504-mmc-sdhci-Silence-MMC-warnings.patch b/target/linux/bcm27xx/patches-5.4/950-0504-mmc-sdhci-Silence-MMC-warnings.patch
|
|
||||||
index 89fd58dca0..ba815eecfd 100644
|
|
||||||
--- a/target/linux/bcm27xx/patches-5.4/950-0504-mmc-sdhci-Silence-MMC-warnings.patch
|
|
||||||
+++ b/target/linux/bcm27xx/patches-5.4/950-0504-mmc-sdhci-Silence-MMC-warnings.patch
|
|
||||||
@@ -22,7 +22,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
||||||
|
|
||||||
#define MAX_TUNING_LOOP 40
|
|
||||||
|
|
||||||
-@@ -2762,7 +2762,7 @@ static void sdhci_timeout_timer(struct t
|
|
||||||
+@@ -2768,7 +2768,7 @@ static void sdhci_timeout_timer(struct t
|
|
||||||
spin_lock_irqsave(&host->lock, flags);
|
|
||||||
|
|
||||||
if (host->cmd && !sdhci_data_line_cmd(host->cmd)) {
|
|
||||||
@@ -31,7 +31,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
||||||
mmc_hostname(host->mmc));
|
|
||||||
sdhci_dumpregs(host);
|
|
||||||
|
|
||||||
-@@ -2784,7 +2784,7 @@ static void sdhci_timeout_data_timer(str
|
|
||||||
+@@ -2790,7 +2790,7 @@ static void sdhci_timeout_data_timer(str
|
|
||||||
|
|
||||||
if (host->data || host->data_cmd ||
|
|
||||||
(host->cmd && sdhci_data_line_cmd(host->cmd))) {
|
|
||||||
diff --git a/target/linux/bcm27xx/patches-5.4/950-0993-xhci-quirks-add-link-TRB-quirk-for-VL805.patch b/target/linux/bcm27xx/patches-5.4/950-0993-xhci-quirks-add-link-TRB-quirk-for-VL805.patch
|
|
||||||
index 627ec30f06..cc05573eb0 100644
|
|
||||||
--- a/target/linux/bcm27xx/patches-5.4/950-0993-xhci-quirks-add-link-TRB-quirk-for-VL805.patch
|
|
||||||
+++ b/target/linux/bcm27xx/patches-5.4/950-0993-xhci-quirks-add-link-TRB-quirk-for-VL805.patch
|
|
||||||
@@ -22,7 +22,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
|
|
||||||
|
|
||||||
--- a/drivers/usb/host/xhci-pci.c
|
|
||||||
+++ b/drivers/usb/host/xhci-pci.c
|
|
||||||
-@@ -261,6 +261,7 @@ static void xhci_pci_quirks(struct devic
|
|
||||||
+@@ -263,6 +263,7 @@ static void xhci_pci_quirks(struct devic
|
|
||||||
pdev->device == 0x3483) {
|
|
||||||
xhci->quirks |= XHCI_LPM_SUPPORT;
|
|
||||||
xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS;
|
|
||||||
@@ -32,7 +32,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
|
|
||||||
if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
|
|
||||||
--- a/drivers/usb/host/xhci-ring.c
|
|
||||||
+++ b/drivers/usb/host/xhci-ring.c
|
|
||||||
-@@ -647,6 +647,16 @@ void xhci_find_new_dequeue_state(struct
|
|
||||||
+@@ -653,6 +653,16 @@ void xhci_find_new_dequeue_state(struct
|
|
||||||
|
|
||||||
} while (!cycle_found || !td_last_trb_found);
|
|
||||||
|
|
||||||
diff --git a/target/linux/generic/backport-5.4/700-v5.5-net-core-allow-fast-GRO-for-skbs-with-Ethernet-heade.patch b/target/linux/generic/backport-5.4/700-v5.5-net-core-allow-fast-GRO-for-skbs-with-Ethernet-heade.patch
|
|
||||||
index eeea18bb9c..13f0d9d000 100644
|
|
||||||
--- a/target/linux/generic/backport-5.4/700-v5.5-net-core-allow-fast-GRO-for-skbs-with-Ethernet-heade.patch
|
|
||||||
+++ b/target/linux/generic/backport-5.4/700-v5.5-net-core-allow-fast-GRO-for-skbs-with-Ethernet-heade.patch
|
|
||||||
@@ -66,7 +66,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
||||||
|
|
||||||
--- a/net/core/dev.c
|
|
||||||
+++ b/net/core/dev.c
|
|
||||||
-@@ -5423,8 +5423,7 @@ static inline void skb_gro_reset_offset(
|
|
||||||
+@@ -5429,8 +5429,7 @@ static inline void skb_gro_reset_offset(
|
|
||||||
NAPI_GRO_CB(skb)->frag0 = NULL;
|
|
||||||
NAPI_GRO_CB(skb)->frag0_len = 0;
|
|
||||||
|
|
||||||
diff --git a/target/linux/generic/backport-5.4/737-v5.5-net-phy-add-core-phylib-sfp-support.patch b/target/linux/generic/backport-5.4/737-v5.5-net-phy-add-core-phylib-sfp-support.patch
|
|
||||||
index 11da9540e9..edfe151725 100644
|
|
||||||
--- a/target/linux/generic/backport-5.4/737-v5.5-net-phy-add-core-phylib-sfp-support.patch
|
|
||||||
+++ b/target/linux/generic/backport-5.4/737-v5.5-net-phy-add-core-phylib-sfp-support.patch
|
|
||||||
@@ -24,7 +24,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
|
|
||||||
#include <linux/workqueue.h>
|
|
||||||
#include <linux/mdio.h>
|
|
||||||
#include <linux/io.h>
|
|
||||||
-@@ -843,6 +844,9 @@ void phy_stop(struct phy_device *phydev)
|
|
||||||
+@@ -863,6 +864,9 @@ void phy_stop(struct phy_device *phydev)
|
|
||||||
|
|
||||||
mutex_lock(&phydev->lock);
|
|
||||||
|
|
||||||
@@ -34,7 +34,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
|
|
||||||
phydev->state = PHY_HALTED;
|
|
||||||
|
|
||||||
mutex_unlock(&phydev->lock);
|
|
||||||
-@@ -905,6 +909,9 @@ void phy_state_machine(struct work_struc
|
|
||||||
+@@ -925,6 +929,9 @@ void phy_state_machine(struct work_struc
|
|
||||||
|
|
||||||
old_state = phydev->state;
|
|
||||||
|
|
||||||
diff --git a/target/linux/generic/backport-5.4/790-v5.7-net-switchdev-do-not-propagate-bridge-updates-across.patch b/target/linux/generic/backport-5.4/790-v5.7-net-switchdev-do-not-propagate-bridge-updates-across.patch
|
|
||||||
deleted file mode 100644
|
|
||||||
index bc8014b772..0000000000
|
|
||||||
--- a/target/linux/generic/backport-5.4/790-v5.7-net-switchdev-do-not-propagate-bridge-updates-across.patch
|
|
||||||
+++ /dev/null
|
|
||||||
@@ -1,60 +0,0 @@
|
|
||||||
-From 07c6f9805f12f1bb538ef165a092b300350384aa Mon Sep 17 00:00:00 2001
|
|
||||||
-From: Russell King <rmk+kernel@armlinux.org.uk>
|
|
||||||
-Date: Wed, 26 Feb 2020 17:14:21 +0000
|
|
||||||
-Subject: [PATCH] net: switchdev: do not propagate bridge updates across
|
|
||||||
- bridges
|
|
||||||
-
|
|
||||||
-When configuring a tree of independent bridges, propagating changes
|
|
||||||
-from the upper bridge across a bridge master to the lower bridge
|
|
||||||
-ports brings surprises.
|
|
||||||
-
|
|
||||||
-For example, a lower bridge may have vlan filtering enabled. It
|
|
||||||
-may have a vlan interface attached to the bridge master, which may
|
|
||||||
-then be incorporated into another bridge. As soon as the lower
|
|
||||||
-bridge vlan interface is attached to the upper bridge, the lower
|
|
||||||
-bridge has vlan filtering disabled.
|
|
||||||
-
|
|
||||||
-This occurs because switchdev recursively applies its changes to
|
|
||||||
-all lower devices no matter what.
|
|
||||||
-
|
|
||||||
-Reviewed-by: Ido Schimmel <idosch@mellanox.com>
|
|
||||||
-Tested-by: Ido Schimmel <idosch@mellanox.com>
|
|
||||||
-Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
|
|
||||||
-Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
||||||
-Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
||||||
----
|
|
||||||
- net/switchdev/switchdev.c | 9 +++++++++
|
|
||||||
- 1 file changed, 9 insertions(+)
|
|
||||||
-
|
|
||||||
---- a/net/switchdev/switchdev.c
|
|
||||||
-+++ b/net/switchdev/switchdev.c
|
|
||||||
-@@ -476,6 +476,9 @@ static int __switchdev_handle_port_obj_a
|
|
||||||
- * necessary to go through this helper.
|
|
||||||
- */
|
|
||||||
- netdev_for_each_lower_dev(dev, lower_dev, iter) {
|
|
||||||
-+ if (netif_is_bridge_master(lower_dev))
|
|
||||||
-+ continue;
|
|
||||||
-+
|
|
||||||
- err = __switchdev_handle_port_obj_add(lower_dev, port_obj_info,
|
|
||||||
- check_cb, add_cb);
|
|
||||||
- if (err && err != -EOPNOTSUPP)
|
|
||||||
-@@ -528,6 +531,9 @@ static int __switchdev_handle_port_obj_d
|
|
||||||
- * necessary to go through this helper.
|
|
||||||
- */
|
|
||||||
- netdev_for_each_lower_dev(dev, lower_dev, iter) {
|
|
||||||
-+ if (netif_is_bridge_master(lower_dev))
|
|
||||||
-+ continue;
|
|
||||||
-+
|
|
||||||
- err = __switchdev_handle_port_obj_del(lower_dev, port_obj_info,
|
|
||||||
- check_cb, del_cb);
|
|
||||||
- if (err && err != -EOPNOTSUPP)
|
|
||||||
-@@ -579,6 +585,9 @@ static int __switchdev_handle_port_attr_
|
|
||||||
- * necessary to go through this helper.
|
|
||||||
- */
|
|
||||||
- netdev_for_each_lower_dev(dev, lower_dev, iter) {
|
|
||||||
-+ if (netif_is_bridge_master(lower_dev))
|
|
||||||
-+ continue;
|
|
||||||
-+
|
|
||||||
- err = __switchdev_handle_port_attr_set(lower_dev, port_attr_info,
|
|
||||||
- check_cb, set_cb);
|
|
||||||
- if (err && err != -EOPNOTSUPP)
|
|
||||||
diff --git a/target/linux/generic/backport-5.4/800-v5.5-scsi-core-Add-sysfs-attributes-for-VPD-pages-0h-and-.patch b/target/linux/generic/backport-5.4/800-v5.5-scsi-core-Add-sysfs-attributes-for-VPD-pages-0h-and-.patch
|
|
||||||
index 438588f9f4..8c18d5df6d 100644
|
|
||||||
--- a/target/linux/generic/backport-5.4/800-v5.5-scsi-core-Add-sysfs-attributes-for-VPD-pages-0h-and-.patch
|
|
||||||
+++ b/target/linux/generic/backport-5.4/800-v5.5-scsi-core-Add-sysfs-attributes-for-VPD-pages-0h-and-.patch
|
|
||||||
@@ -41,9 +41,9 @@ Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
|
||||||
struct scsi_vpd *vpd_pg80 = NULL, *vpd_pg83 = NULL;
|
|
||||||
+ struct scsi_vpd *vpd_pg0 = NULL, *vpd_pg89 = NULL;
|
|
||||||
unsigned long flags;
|
|
||||||
+ struct module *mod;
|
|
||||||
|
|
||||||
- sdev = container_of(work, struct scsi_device, ew.work);
|
|
||||||
-@@ -466,16 +467,24 @@ static void scsi_device_dev_release_user
|
|
||||||
+@@ -469,16 +470,24 @@ static void scsi_device_dev_release_user
|
|
||||||
sdev->request_queue = NULL;
|
|
||||||
|
|
||||||
mutex_lock(&sdev->inquiry_mutex);
|
|
||||||
@@ -68,7 +68,7 @@ Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
|
||||||
kfree(sdev->inquiry);
|
|
||||||
kfree(sdev);
|
|
||||||
|
|
||||||
-@@ -874,6 +883,8 @@ static struct bin_attribute dev_attr_vpd
|
|
||||||
+@@ -883,6 +892,8 @@ static struct bin_attribute dev_attr_vpd
|
|
||||||
|
|
||||||
sdev_vpd_pg_attr(pg83);
|
|
||||||
sdev_vpd_pg_attr(pg80);
|
|
||||||
@@ -77,7 +77,7 @@ Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
|
||||||
|
|
||||||
static ssize_t show_inquiry(struct file *filep, struct kobject *kobj,
|
|
||||||
struct bin_attribute *bin_attr,
|
|
||||||
-@@ -1206,12 +1217,18 @@ static umode_t scsi_sdev_bin_attr_is_vis
|
|
||||||
+@@ -1215,12 +1226,18 @@ static umode_t scsi_sdev_bin_attr_is_vis
|
|
||||||
struct scsi_device *sdev = to_scsi_device(dev);
|
|
||||||
|
|
||||||
|
|
||||||
@@ -96,7 +96,7 @@ Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
|
||||||
return S_IRUGO;
|
|
||||||
}
|
|
||||||
|
|
||||||
-@@ -1254,8 +1271,10 @@ static struct attribute *scsi_sdev_attrs
|
|
||||||
+@@ -1263,8 +1280,10 @@ static struct attribute *scsi_sdev_attrs
|
|
||||||
};
|
|
||||||
|
|
||||||
static struct bin_attribute *scsi_sdev_bin_attrs[] = {
|
|
||||||
diff --git a/target/linux/generic/hack-5.4/220-gc_sections.patch b/target/linux/generic/hack-5.4/220-gc_sections.patch
|
|
||||||
index 6207eb0ec9..fdfaf51406 100644
|
|
||||||
--- a/target/linux/generic/hack-5.4/220-gc_sections.patch
|
|
||||||
+++ b/target/linux/generic/hack-5.4/220-gc_sections.patch
|
|
||||||
@@ -21,7 +21,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|
||||||
|
|
||||||
--- a/arch/arm/Kconfig
|
|
||||||
+++ b/arch/arm/Kconfig
|
|
||||||
-@@ -111,6 +111,7 @@ config ARM
|
|
||||||
+@@ -112,6 +112,7 @@ config ARM
|
|
||||||
select HAVE_UID16
|
|
||||||
select HAVE_VIRT_CPU_ACCOUNTING_GEN
|
|
||||||
select IRQ_FORCED_THREADING
|
|
||||||
diff --git a/target/linux/generic/hack-5.4/721-phy_packets.patch b/target/linux/generic/hack-5.4/721-phy_packets.patch
|
|
||||||
index 836fc54ba2..bc9b3a4783 100644
|
|
||||||
--- a/target/linux/generic/hack-5.4/721-phy_packets.patch
|
|
||||||
+++ b/target/linux/generic/hack-5.4/721-phy_packets.patch
|
|
||||||
@@ -101,7 +101,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
||||||
help
|
|
||||||
--- a/net/core/dev.c
|
|
||||||
+++ b/net/core/dev.c
|
|
||||||
-@@ -3192,10 +3192,20 @@ static int xmit_one(struct sk_buff *skb,
|
|
||||||
+@@ -3198,10 +3198,20 @@ static int xmit_one(struct sk_buff *skb,
|
|
||||||
if (dev_nit_active(dev))
|
|
||||||
dev_queue_xmit_nit(skb, dev);
|
|
||||||
|
|
||||||
diff --git a/target/linux/generic/pending-5.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/target/linux/generic/pending-5.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
|
|
||||||
index 0b95eee494..06227cfafe 100644
|
|
||||||
--- a/target/linux/generic/pending-5.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
|
|
||||||
+++ b/target/linux/generic/pending-5.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
|
|
||||||
@@ -110,7 +110,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|
||||||
return -EINVAL;
|
|
||||||
--- a/net/ipv6/route.c
|
|
||||||
+++ b/net/ipv6/route.c
|
|
||||||
-@@ -93,6 +93,8 @@ static int ip6_pkt_discard(struct sk_bu
|
|
||||||
+@@ -94,6 +94,8 @@ static int ip6_pkt_discard(struct sk_bu
|
|
||||||
static int ip6_pkt_discard_out(struct net *net, struct sock *sk, struct sk_buff *skb);
|
|
||||||
static int ip6_pkt_prohibit(struct sk_buff *skb);
|
|
||||||
static int ip6_pkt_prohibit_out(struct net *net, struct sock *sk, struct sk_buff *skb);
|
|
||||||
@@ -119,7 +119,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|
||||||
static void ip6_link_failure(struct sk_buff *skb);
|
|
||||||
static void ip6_rt_update_pmtu(struct dst_entry *dst, struct sock *sk,
|
|
||||||
struct sk_buff *skb, u32 mtu,
|
|
||||||
-@@ -326,6 +328,18 @@ static const struct rt6_info ip6_prohibi
|
|
||||||
+@@ -327,6 +329,18 @@ static const struct rt6_info ip6_prohibi
|
|
||||||
.rt6i_flags = (RTF_REJECT | RTF_NONEXTHOP),
|
|
||||||
};
|
|
||||||
|
|
||||||
@@ -138,7 +138,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|
||||||
static const struct rt6_info ip6_blk_hole_entry_template = {
|
|
||||||
.dst = {
|
|
||||||
.__refcnt = ATOMIC_INIT(1),
|
|
||||||
-@@ -1047,6 +1061,7 @@ static const int fib6_prop[RTN_MAX + 1]
|
|
||||||
+@@ -1048,6 +1062,7 @@ static const int fib6_prop[RTN_MAX + 1]
|
|
||||||
[RTN_BLACKHOLE] = -EINVAL,
|
|
||||||
[RTN_UNREACHABLE] = -EHOSTUNREACH,
|
|
||||||
[RTN_PROHIBIT] = -EACCES,
|
|
||||||
@@ -146,7 +146,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|
||||||
[RTN_THROW] = -EAGAIN,
|
|
||||||
[RTN_NAT] = -EINVAL,
|
|
||||||
[RTN_XRESOLVE] = -EINVAL,
|
|
||||||
-@@ -1084,6 +1099,10 @@ static void ip6_rt_init_dst_reject(struc
|
|
||||||
+@@ -1085,6 +1100,10 @@ static void ip6_rt_init_dst_reject(struc
|
|
||||||
rt->dst.output = ip6_pkt_prohibit_out;
|
|
||||||
rt->dst.input = ip6_pkt_prohibit;
|
|
||||||
break;
|
|
||||||
@@ -157,7 +157,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|
||||||
case RTN_THROW:
|
|
||||||
case RTN_UNREACHABLE:
|
|
||||||
default:
|
|
||||||
-@@ -4426,6 +4445,17 @@ static int ip6_pkt_prohibit_out(struct n
|
|
||||||
+@@ -4434,6 +4453,17 @@ static int ip6_pkt_prohibit_out(struct n
|
|
||||||
return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -175,7 +175,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|
||||||
/*
|
|
||||||
* Allocate a dst for local (unicast / anycast) address.
|
|
||||||
*/
|
|
||||||
-@@ -4906,7 +4936,8 @@ static int rtm_to_fib6_config(struct sk_
|
|
||||||
+@@ -4914,7 +4944,8 @@ static int rtm_to_fib6_config(struct sk_
|
|
||||||
if (rtm->rtm_type == RTN_UNREACHABLE ||
|
|
||||||
rtm->rtm_type == RTN_BLACKHOLE ||
|
|
||||||
rtm->rtm_type == RTN_PROHIBIT ||
|
|
||||||
@@ -185,7 +185,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|
||||||
cfg->fc_flags |= RTF_REJECT;
|
|
||||||
|
|
||||||
if (rtm->rtm_type == RTN_LOCAL)
|
|
||||||
-@@ -6029,6 +6060,8 @@ static int ip6_route_dev_notify(struct n
|
|
||||||
+@@ -6037,6 +6068,8 @@ static int ip6_route_dev_notify(struct n
|
|
||||||
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
||||||
net->ipv6.ip6_prohibit_entry->dst.dev = dev;
|
|
||||||
net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
|
|
||||||
@@ -194,7 +194,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|
||||||
net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
|
|
||||||
net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
|
|
||||||
#endif
|
|
||||||
-@@ -6040,6 +6073,7 @@ static int ip6_route_dev_notify(struct n
|
|
||||||
+@@ -6048,6 +6081,7 @@ static int ip6_route_dev_notify(struct n
|
|
||||||
in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev);
|
|
||||||
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
||||||
in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev);
|
|
||||||
@@ -202,7 +202,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|
||||||
in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
-@@ -6232,6 +6266,8 @@ static int __net_init ip6_route_net_init
|
|
||||||
+@@ -6240,6 +6274,8 @@ static int __net_init ip6_route_net_init
|
|
||||||
|
|
||||||
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
||||||
net->ipv6.fib6_has_custom_rules = false;
|
|
||||||
@@ -211,7 +211,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|
||||||
net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template,
|
|
||||||
sizeof(*net->ipv6.ip6_prohibit_entry),
|
|
||||||
GFP_KERNEL);
|
|
||||||
-@@ -6242,11 +6278,21 @@ static int __net_init ip6_route_net_init
|
|
||||||
+@@ -6250,11 +6286,21 @@ static int __net_init ip6_route_net_init
|
|
||||||
ip6_template_metrics, true);
|
|
||||||
INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->rt6i_uncached);
|
|
||||||
|
|
||||||
@@ -234,7 +234,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|
||||||
net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
|
|
||||||
dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
|
|
||||||
ip6_template_metrics, true);
|
|
||||||
-@@ -6270,6 +6316,8 @@ out:
|
|
||||||
+@@ -6278,6 +6324,8 @@ out:
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
||||||
@@ -243,7 +243,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|
||||||
out_ip6_prohibit_entry:
|
|
||||||
kfree(net->ipv6.ip6_prohibit_entry);
|
|
||||||
out_ip6_null_entry:
|
|
||||||
-@@ -6289,6 +6337,7 @@ static void __net_exit ip6_route_net_exi
|
|
||||||
+@@ -6297,6 +6345,7 @@ static void __net_exit ip6_route_net_exi
|
|
||||||
kfree(net->ipv6.ip6_null_entry);
|
|
||||||
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
|
|
||||||
kfree(net->ipv6.ip6_prohibit_entry);
|
|
||||||
@@ -251,7 +251,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|
||||||
kfree(net->ipv6.ip6_blk_hole_entry);
|
|
||||||
#endif
|
|
||||||
dst_entries_destroy(&net->ipv6.ip6_dst_ops);
|
|
||||||
-@@ -6366,6 +6415,9 @@ void __init ip6_route_init_special_entri
|
|
||||||
+@@ -6374,6 +6423,9 @@ void __init ip6_route_init_special_entri
|
|
||||||
init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
|
|
||||||
init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
|
|
||||||
init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
|
|
||||||
diff --git a/target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
|
|
||||||
index 4839ac5e70..e0540866c6 100644
|
|
||||||
--- a/target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
|
|
||||||
+++ b/target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
|
|
||||||
@@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
||||||
__u16 tc_index; /* traffic control index */
|
|
||||||
--- a/net/core/dev.c
|
|
||||||
+++ b/net/core/dev.c
|
|
||||||
-@@ -5489,6 +5489,9 @@ static enum gro_result dev_gro_receive(s
|
|
||||||
+@@ -5495,6 +5495,9 @@ static enum gro_result dev_gro_receive(s
|
|
||||||
int same_flow;
|
|
||||||
int grow;
|
|
||||||
|
|
||||||
@@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
||||||
if (netif_elide_gro(skb->dev))
|
|
||||||
goto normal;
|
|
||||||
|
|
||||||
-@@ -7291,6 +7294,48 @@ static void __netdev_adjacent_dev_unlink
|
|
||||||
+@@ -7297,6 +7300,48 @@ static void __netdev_adjacent_dev_unlink
|
|
||||||
&upper_dev->adj_list.lower);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
||||||
static int __netdev_upper_dev_link(struct net_device *dev,
|
|
||||||
struct net_device *upper_dev, bool master,
|
|
||||||
void *upper_priv, void *upper_info,
|
|
||||||
-@@ -7341,6 +7386,7 @@ static int __netdev_upper_dev_link(struc
|
|
||||||
+@@ -7347,6 +7392,7 @@ static int __netdev_upper_dev_link(struc
|
|
||||||
if (ret)
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
@@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
||||||
ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
|
|
||||||
&changeupper_info.info);
|
|
||||||
ret = notifier_to_errno(ret);
|
|
||||||
-@@ -7434,6 +7480,7 @@ void netdev_upper_dev_unlink(struct net_
|
|
||||||
+@@ -7440,6 +7486,7 @@ void netdev_upper_dev_unlink(struct net_
|
|
||||||
|
|
||||||
__netdev_adjacent_dev_unlink_neighbour(dev, upper_dev);
|
|
||||||
|
|
||||||
@@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
||||||
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
|
|
||||||
&changeupper_info.info);
|
|
||||||
|
|
||||||
-@@ -8164,6 +8211,7 @@ int dev_set_mac_address(struct net_devic
|
|
||||||
+@@ -8170,6 +8217,7 @@ int dev_set_mac_address(struct net_devic
|
|
||||||
if (err)
|
|
||||||
return err;
|
|
||||||
dev->addr_assign_type = NET_ADDR_SET;
|
|
||||||
diff --git a/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch b/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
|
|
||||||
index f45efdf12b..febec868f4 100644
|
|
||||||
--- a/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
|
|
||||||
+++ b/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
|
|
||||||
@@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
||||||
|
|
||||||
static int netif_rx_internal(struct sk_buff *skb);
|
|
||||||
static int call_netdevice_notifiers_info(unsigned long val,
|
|
||||||
-@@ -5931,6 +5932,11 @@ void __napi_schedule(struct napi_struct
|
|
||||||
+@@ -5937,6 +5938,11 @@ void __napi_schedule(struct napi_struct
|
|
||||||
{
|
|
||||||
unsigned long flags;
|
|
||||||
|
|
||||||
@@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
||||||
local_irq_save(flags);
|
|
||||||
____napi_schedule(this_cpu_ptr(&softnet_data), n);
|
|
||||||
local_irq_restore(flags);
|
|
||||||
-@@ -5982,6 +5988,11 @@ EXPORT_SYMBOL(napi_schedule_prep);
|
|
||||||
+@@ -5988,6 +5994,11 @@ EXPORT_SYMBOL(napi_schedule_prep);
|
|
||||||
*/
|
|
||||||
void __napi_schedule_irqoff(struct napi_struct *n)
|
|
||||||
{
|
|
||||||
@@ -119,7 +119,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
||||||
if (!IS_ENABLED(CONFIG_PREEMPT_RT))
|
|
||||||
____napi_schedule(this_cpu_ptr(&softnet_data), n);
|
|
||||||
else
|
|
||||||
-@@ -6246,9 +6257,89 @@ static void init_gro_hash(struct napi_st
|
|
||||||
+@@ -6252,9 +6263,89 @@ static void init_gro_hash(struct napi_st
|
|
||||||
napi->gro_bitmask = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -209,7 +209,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
||||||
INIT_LIST_HEAD(&napi->poll_list);
|
|
||||||
hrtimer_init(&napi->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_PINNED);
|
|
||||||
napi->timer.function = napi_watchdog;
|
|
||||||
-@@ -6265,6 +6356,7 @@ void netif_napi_add(struct net_device *d
|
|
||||||
+@@ -6271,6 +6362,7 @@ void netif_napi_add(struct net_device *d
|
|
||||||
#ifdef CONFIG_NETPOLL
|
|
||||||
napi->poll_owner = -1;
|
|
||||||
#endif
|
|
||||||
@@ -217,7 +217,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
||||||
set_bit(NAPI_STATE_SCHED, &napi->state);
|
|
||||||
set_bit(NAPI_STATE_NPSVC, &napi->state);
|
|
||||||
list_add_rcu(&napi->dev_list, &dev->napi_list);
|
|
||||||
-@@ -6305,6 +6397,7 @@ static void flush_gro_hash(struct napi_s
|
|
||||||
+@@ -6311,6 +6403,7 @@ static void flush_gro_hash(struct napi_s
|
|
||||||
void netif_napi_del(struct napi_struct *napi)
|
|
||||||
{
|
|
||||||
might_sleep();
|
|
||||||
@@ -225,7 +225,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
||||||
if (napi_hash_del(napi))
|
|
||||||
synchronize_net();
|
|
||||||
list_del_init(&napi->dev_list);
|
|
||||||
-@@ -6317,50 +6410,18 @@ EXPORT_SYMBOL(netif_napi_del);
|
|
||||||
+@@ -6323,50 +6416,18 @@ EXPORT_SYMBOL(netif_napi_del);
|
|
||||||
|
|
||||||
static int napi_poll(struct napi_struct *n, struct list_head *repoll)
|
|
||||||
{
|
|
||||||
@@ -280,7 +280,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
||||||
|
|
||||||
/* Some drivers may have called napi_schedule
|
|
||||||
* prior to exhausting their budget.
|
|
||||||
-@@ -10340,6 +10401,10 @@ static int __init net_dev_init(void)
|
|
||||||
+@@ -10346,6 +10407,10 @@ static int __init net_dev_init(void)
|
|
||||||
sd->backlog.weight = weight_p;
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/target/linux/generic/pending-5.4/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/pending-5.4/811-pci_disable_usb_common_quirks.patch
|
|
||||||
index 86f8a416e9..6e4584c8a1 100644
|
|
||||||
--- a/target/linux/generic/pending-5.4/811-pci_disable_usb_common_quirks.patch
|
|
||||||
+++ b/target/linux/generic/pending-5.4/811-pci_disable_usb_common_quirks.patch
|
|
||||||
@@ -98,7 +98,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
||||||
#endif /* __LINUX_USB_PCI_QUIRKS_H */
|
|
||||||
--- a/include/linux/usb/hcd.h
|
|
||||||
+++ b/include/linux/usb/hcd.h
|
|
||||||
-@@ -485,7 +485,14 @@ extern int usb_hcd_pci_probe(struct pci_
|
|
||||||
+@@ -483,7 +483,14 @@ extern int usb_hcd_pci_probe(struct pci_
|
|
||||||
extern void usb_hcd_pci_remove(struct pci_dev *dev);
|
|
||||||
extern void usb_hcd_pci_shutdown(struct pci_dev *dev);
|
|
||||||
|
|
||||||
diff --git a/target/linux/ipq806x/patches-5.4/0060-HACK-arch-arm-force-ZRELADDR-on-arch-qcom.patch b/target/linux/ipq806x/patches-5.4/0060-HACK-arch-arm-force-ZRELADDR-on-arch-qcom.patch
|
|
||||||
index d3b39ac3e3..6d3e7d9ee0 100644
|
|
||||||
--- a/target/linux/ipq806x/patches-5.4/0060-HACK-arch-arm-force-ZRELADDR-on-arch-qcom.patch
|
|
||||||
+++ b/target/linux/ipq806x/patches-5.4/0060-HACK-arch-arm-force-ZRELADDR-on-arch-qcom.patch
|
|
||||||
@@ -33,7 +33,7 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
|
|
||||||
|
|
||||||
--- a/arch/arm/Kconfig
|
|
||||||
+++ b/arch/arm/Kconfig
|
|
||||||
-@@ -318,7 +318,7 @@ config ARCH_MULTIPLATFORM
|
|
||||||
+@@ -319,7 +319,7 @@ config ARCH_MULTIPLATFORM
|
|
||||||
depends on MMU
|
|
||||||
select ARM_HAS_SG_CHAIN
|
|
||||||
select ARM_PATCH_PHYS_VIRT
|
|
||||||
diff --git a/target/linux/ipq806x/patches-5.4/0067-generic-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/ipq806x/patches-5.4/0067-generic-Mangle-bootloader-s-kernel-arguments.patch
|
|
||||||
index 751ac10a19..33c77fb729 100644
|
|
||||||
--- a/target/linux/ipq806x/patches-5.4/0067-generic-Mangle-bootloader-s-kernel-arguments.patch
|
|
||||||
+++ b/target/linux/ipq806x/patches-5.4/0067-generic-Mangle-bootloader-s-kernel-arguments.patch
|
|
||||||
@@ -22,7 +22,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
|
|
||||||
|
|
||||||
--- a/arch/arm/Kconfig
|
|
||||||
+++ b/arch/arm/Kconfig
|
|
||||||
-@@ -1827,6 +1827,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
|
|
||||||
+@@ -1828,6 +1828,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
|
|
||||||
The command-line arguments provided by the boot loader will be
|
|
||||||
appended to the the device tree bootargs property.
|
|
||||||
|
|
||||||
diff --git a/target/linux/ipq806x/patches-5.4/900-arm-add-cmdline-override.patch b/target/linux/ipq806x/patches-5.4/900-arm-add-cmdline-override.patch
|
|
||||||
index 49cd68b68d..17f20f068c 100644
|
|
||||||
--- a/target/linux/ipq806x/patches-5.4/900-arm-add-cmdline-override.patch
|
|
||||||
+++ b/target/linux/ipq806x/patches-5.4/900-arm-add-cmdline-override.patch
|
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
--- a/arch/arm/Kconfig
|
|
||||||
+++ b/arch/arm/Kconfig
|
|
||||||
-@@ -1840,6 +1840,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGL
|
|
||||||
+@@ -1841,6 +1841,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGL
|
|
||||||
|
|
||||||
endchoice
|
|
||||||
|
|
||||||
diff --git a/target/linux/lantiq/patches-5.4/0025-NET-MIPS-lantiq-adds-xrx200-legacy.patch b/target/linux/lantiq/patches-5.4/0025-NET-MIPS-lantiq-adds-xrx200-legacy.patch
|
|
||||||
index 6a2143e17e..a43982f9e1 100644
|
|
||||||
--- a/target/linux/lantiq/patches-5.4/0025-NET-MIPS-lantiq-adds-xrx200-legacy.patch
|
|
||||||
+++ b/target/linux/lantiq/patches-5.4/0025-NET-MIPS-lantiq-adds-xrx200-legacy.patch
|
|
||||||
@@ -16,7 +16,7 @@ Subject: NET: MIPS: lantiq: adds xrx200 ethernet and switch driver
|
|
||||||
|
|
||||||
--- a/drivers/net/ethernet/Kconfig
|
|
||||||
+++ b/drivers/net/ethernet/Kconfig
|
|
||||||
-@@ -108,7 +108,13 @@ config LANTIQ_ETOP
|
|
||||||
+@@ -109,7 +109,13 @@ config LANTIQ_ETOP
|
|
||||||
tristate "Lantiq SoC ETOP driver"
|
|
||||||
depends on SOC_TYPE_XWAY
|
|
||||||
---help---
|
|
||||||
diff --git a/target/linux/layerscape/patches-5.4/820-usb-0014-MLK-17380-3-usb-move-EH-SINGLE_STEP_SET_FEATURE-impl.patch b/target/linux/layerscape/patches-5.4/820-usb-0014-MLK-17380-3-usb-move-EH-SINGLE_STEP_SET_FEATURE-impl.patch
|
|
||||||
index 3c05330b1a..d43626577b 100644
|
|
||||||
--- a/target/linux/layerscape/patches-5.4/820-usb-0014-MLK-17380-3-usb-move-EH-SINGLE_STEP_SET_FEATURE-impl.patch
|
|
||||||
+++ b/target/linux/layerscape/patches-5.4/820-usb-0014-MLK-17380-3-usb-move-EH-SINGLE_STEP_SET_FEATURE-impl.patch
|
|
||||||
@@ -335,7 +335,7 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com>
|
|
||||||
int is_setup
|
|
||||||
--- a/include/linux/usb/hcd.h
|
|
||||||
+++ b/include/linux/usb/hcd.h
|
|
||||||
-@@ -411,7 +411,10 @@ struct hc_driver {
|
|
||||||
+@@ -409,7 +409,10 @@ struct hc_driver {
|
|
||||||
int (*find_raw_port_number)(struct usb_hcd *, int);
|
|
||||||
/* Call for power on/off the port if necessary */
|
|
||||||
int (*port_power)(struct usb_hcd *hcd, int portnum, bool enable);
|
|
||||||
@@ -347,7 +347,7 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com>
|
|
||||||
};
|
|
||||||
|
|
||||||
static inline int hcd_giveback_urb_in_bh(struct usb_hcd *hcd)
|
|
||||||
-@@ -476,6 +479,14 @@ int usb_hcd_setup_local_mem(struct usb_h
|
|
||||||
+@@ -474,6 +477,14 @@ int usb_hcd_setup_local_mem(struct usb_h
|
|
||||||
|
|
||||||
struct platform_device;
|
|
||||||
extern void usb_hcd_platform_shutdown(struct platform_device *dev);
|
|
||||||
diff --git a/target/linux/layerscape/patches-5.4/820-usb-0015-MLK-17380-4-usb-host-xhci-add-EH-SINGLE_STEP_SET_FEA.patch b/target/linux/layerscape/patches-5.4/820-usb-0015-MLK-17380-4-usb-host-xhci-add-EH-SINGLE_STEP_SET_FEA.patch
|
|
||||||
index fcad77c1eb..361328cf05 100644
|
|
||||||
--- a/target/linux/layerscape/patches-5.4/820-usb-0015-MLK-17380-4-usb-host-xhci-add-EH-SINGLE_STEP_SET_FEA.patch
|
|
||||||
+++ b/target/linux/layerscape/patches-5.4/820-usb-0015-MLK-17380-4-usb-host-xhci-add-EH-SINGLE_STEP_SET_FEA.patch
|
|
||||||
@@ -42,7 +42,7 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com>
|
|
||||||
retval = xhci_enter_test_mode(xhci, test_mode, wIndex,
|
|
||||||
--- a/drivers/usb/host/xhci-ring.c
|
|
||||||
+++ b/drivers/usb/host/xhci-ring.c
|
|
||||||
-@@ -3624,6 +3624,129 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *
|
|
||||||
+@@ -3630,6 +3630,129 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -174,7 +174,7 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com>
|
|
||||||
* bursts that are required to move all packets in this TD. Only SuperSpeed
|
|
||||||
--- a/drivers/usb/host/xhci.c
|
|
||||||
+++ b/drivers/usb/host/xhci.c
|
|
||||||
-@@ -5385,6 +5385,7 @@ static const struct hc_driver xhci_hc_dr
|
|
||||||
+@@ -5389,6 +5389,7 @@ static const struct hc_driver xhci_hc_dr
|
|
||||||
.disable_usb3_lpm_timeout = xhci_disable_usb3_lpm_timeout,
|
|
||||||
.find_raw_port_number = xhci_find_raw_port_number,
|
|
||||||
.clear_tt_buffer_complete = xhci_clear_tt_buffer_complete,
|
|
||||||
diff --git a/target/linux/layerscape/patches-5.4/820-usb-0017-MLK-19153-2-usb-host-xhci-do-not-return-error-status.patch b/target/linux/layerscape/patches-5.4/820-usb-0017-MLK-19153-2-usb-host-xhci-do-not-return-error-status.patch
|
|
||||||
index 637d514d76..e5394cc6d8 100644
|
|
||||||
--- a/target/linux/layerscape/patches-5.4/820-usb-0017-MLK-19153-2-usb-host-xhci-do-not-return-error-status.patch
|
|
||||||
+++ b/target/linux/layerscape/patches-5.4/820-usb-0017-MLK-19153-2-usb-host-xhci-do-not-return-error-status.patch
|
|
||||||
@@ -22,7 +22,7 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com>
|
|
||||||
|
|
||||||
--- a/drivers/usb/host/xhci-ring.c
|
|
||||||
+++ b/drivers/usb/host/xhci-ring.c
|
|
||||||
-@@ -2091,12 +2091,9 @@ static int process_ctrl_td(struct xhci_h
|
|
||||||
+@@ -2097,12 +2097,9 @@ static int process_ctrl_td(struct xhci_h
|
|
||||||
|
|
||||||
switch (trb_comp_code) {
|
|
||||||
case COMP_SUCCESS:
|
|
||||||
diff --git a/target/linux/layerscape/patches-5.4/820-usb-0018-MLK-18794-1-usb-host-xhci-add-.bus_suspend-override.patch b/target/linux/layerscape/patches-5.4/820-usb-0018-MLK-18794-1-usb-host-xhci-add-.bus_suspend-override.patch
|
|
||||||
index 060a809f5b..f808b5b556 100644
|
|
||||||
--- a/target/linux/layerscape/patches-5.4/820-usb-0018-MLK-18794-1-usb-host-xhci-add-.bus_suspend-override.patch
|
|
||||||
+++ b/target/linux/layerscape/patches-5.4/820-usb-0018-MLK-18794-1-usb-host-xhci-add-.bus_suspend-override.patch
|
|
||||||
@@ -24,7 +24,7 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com>
|
|
||||||
|
|
||||||
--- a/drivers/usb/host/xhci.c
|
|
||||||
+++ b/drivers/usb/host/xhci.c
|
|
||||||
-@@ -5406,6 +5406,8 @@ void xhci_init_driver(struct hc_driver *
|
|
||||||
+@@ -5410,6 +5410,8 @@ void xhci_init_driver(struct hc_driver *
|
|
||||||
drv->check_bandwidth = over->check_bandwidth;
|
|
||||||
if (over->reset_bandwidth)
|
|
||||||
drv->reset_bandwidth = over->reset_bandwidth;
|
|
||||||
diff --git a/target/linux/layerscape/patches-5.4/901-fix_irq_type_of_pca953x.patch b/target/linux/layerscape/patches-5.4/901-fix_irq_type_of_pca953x.patch
|
|
||||||
index a00a240135..5f022ac27f 100644
|
|
||||||
--- a/target/linux/layerscape/patches-5.4/901-fix_irq_type_of_pca953x.patch
|
|
||||||
+++ b/target/linux/layerscape/patches-5.4/901-fix_irq_type_of_pca953x.patch
|
|
||||||
@@ -11,7 +11,7 @@ Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
|
|
||||||
|
|
||||||
--- a/drivers/gpio/gpio-pca953x.c
|
|
||||||
+++ b/drivers/gpio/gpio-pca953x.c
|
|
||||||
-@@ -879,10 +879,12 @@ static int pca953x_irq_setup(struct pca9
|
|
||||||
+@@ -881,10 +881,12 @@ static int pca953x_irq_setup(struct pca9
|
|
||||||
for (i = 0; i < NBANK(chip); i++)
|
|
||||||
chip->irq_stat[i] &= reg_direction[i];
|
|
||||||
mutex_init(&chip->irq_lock);
|
|
||||||
diff --git a/target/linux/mvebu/patches-5.4/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/mvebu/patches-5.4/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch
|
|
||||||
index fd60cdb322..b6b3247c9d 100644
|
|
||||||
--- a/target/linux/mvebu/patches-5.4/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch
|
|
||||||
+++ b/target/linux/mvebu/patches-5.4/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch
|
|
||||||
@@ -28,7 +28,7 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com>
|
|
||||||
|
|
||||||
--- a/arch/arm/Kconfig
|
|
||||||
+++ b/arch/arm/Kconfig
|
|
||||||
-@@ -1827,6 +1827,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
|
|
||||||
+@@ -1828,6 +1828,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
|
|
||||||
The command-line arguments provided by the boot loader will be
|
|
||||||
appended to the the device tree bootargs property.
|
|
||||||
|
|
||||||
diff --git a/target/linux/oxnas/patches-5.4/996-generic-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/oxnas/patches-5.4/996-generic-Mangle-bootloader-s-kernel-arguments.patch
|
|
||||||
index 8c83d55b6c..bc46f308d3 100644
|
|
||||||
--- a/target/linux/oxnas/patches-5.4/996-generic-Mangle-bootloader-s-kernel-arguments.patch
|
|
||||||
+++ b/target/linux/oxnas/patches-5.4/996-generic-Mangle-bootloader-s-kernel-arguments.patch
|
|
||||||
@@ -22,7 +22,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
|
|
||||||
|
|
||||||
--- a/arch/arm/Kconfig
|
|
||||||
+++ b/arch/arm/Kconfig
|
|
||||||
-@@ -1827,6 +1827,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
|
|
||||||
+@@ -1828,6 +1828,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
|
|
||||||
The command-line arguments provided by the boot loader will be
|
|
||||||
appended to the the device tree bootargs property.
|
|
||||||
|
|
||||||
diff --git a/target/linux/ramips/patches-5.4/200-add-ralink-eth.patch b/target/linux/ramips/patches-5.4/200-add-ralink-eth.patch
|
|
||||||
index b8fd8e511d..79e7c2309b 100644
|
|
||||||
--- a/target/linux/ramips/patches-5.4/200-add-ralink-eth.patch
|
|
||||||
+++ b/target/linux/ramips/patches-5.4/200-add-ralink-eth.patch
|
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
--- a/drivers/net/ethernet/Kconfig
|
|
||||||
+++ b/drivers/net/ethernet/Kconfig
|
|
||||||
-@@ -159,6 +159,7 @@ source "drivers/net/ethernet/pasemi/Kcon
|
|
||||||
+@@ -160,6 +160,7 @@ source "drivers/net/ethernet/pasemi/Kcon
|
|
||||||
source "drivers/net/ethernet/pensando/Kconfig"
|
|
||||||
source "drivers/net/ethernet/qlogic/Kconfig"
|
|
||||||
source "drivers/net/ethernet/qualcomm/Kconfig"
|
|
||||||
diff --git a/target/linux/ramips/patches-5.4/990-NET-no-auto-carrier-off-support.patch b/target/linux/ramips/patches-5.4/990-NET-no-auto-carrier-off-support.patch
|
|
||||||
index c19cfd322d..b53108ec3c 100644
|
|
||||||
--- a/target/linux/ramips/patches-5.4/990-NET-no-auto-carrier-off-support.patch
|
|
||||||
+++ b/target/linux/ramips/patches-5.4/990-NET-no-auto-carrier-off-support.patch
|
|
||||||
@@ -11,7 +11,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
|
||||||
|
|
||||||
--- a/drivers/net/phy/phy.c
|
|
||||||
+++ b/drivers/net/phy/phy.c
|
|
||||||
-@@ -547,7 +547,10 @@ static int phy_check_link_status(struct
|
|
||||||
+@@ -549,7 +549,10 @@ static int phy_check_link_status(struct
|
|
||||||
phy_link_up(phydev);
|
|
||||||
} else if (!phydev->link && phydev->state != PHY_NOLINK) {
|
|
||||||
phydev->state = PHY_NOLINK;
|
|
||||||
@@ -23,7 +23,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
-@@ -927,7 +930,10 @@ void phy_state_machine(struct work_struc
|
|
||||||
+@@ -947,7 +950,10 @@ void phy_state_machine(struct work_struc
|
|
||||||
case PHY_HALTED:
|
|
||||||
if (phydev->link) {
|
|
||||||
phydev->link = 0;
|
|
||||||
diff --git a/target/linux/realtek/patches-5.4/702-net-ethernet-add-support-for-rtl838x-ethernet.patch b/target/linux/realtek/patches-5.4/702-net-ethernet-add-support-for-rtl838x-ethernet.patch
|
|
||||||
index 11e62450d5..952384ac89 100644
|
|
||||||
--- a/target/linux/realtek/patches-5.4/702-net-ethernet-add-support-for-rtl838x-ethernet.patch
|
|
||||||
+++ b/target/linux/realtek/patches-5.4/702-net-ethernet-add-support-for-rtl838x-ethernet.patch
|
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
--- a/drivers/net/ethernet/Kconfig
|
|
||||||
+++ b/drivers/net/ethernet/Kconfig
|
|
||||||
-@@ -163,6 +163,13 @@ source "drivers/net/ethernet/rdc/Kconfig
|
|
||||||
+@@ -164,6 +164,13 @@ source "drivers/net/ethernet/rdc/Kconfig
|
|
||||||
source "drivers/net/ethernet/realtek/Kconfig"
|
|
||||||
source "drivers/net/ethernet/renesas/Kconfig"
|
|
||||||
source "drivers/net/ethernet/rocker/Kconfig"
|
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -6,23 +6,18 @@ This disables all OpenWrt config migration mechanisms except for
|
||||||
files listed in /etc/sysupgrade.conf
|
files listed in /etc/sysupgrade.conf
|
||||||
|
|
||||||
diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
|
diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
|
||||||
index 7e0a00e13b8ee4be7163936fd01a7beff0ce5c99..97f50dc83088e29fba651741fff28c70f7585b3f 100755
|
index 6c518b780eddd973966537b50d8f7c82539bb1e1..49d4514b988e827098450d57da0ae50a37506d3a 100755
|
||||||
--- a/package/base-files/files/sbin/sysupgrade
|
--- a/package/base-files/files/sbin/sysupgrade
|
||||||
+++ b/package/base-files/files/sbin/sysupgrade
|
+++ b/package/base-files/files/sbin/sysupgrade
|
||||||
@@ -135,14 +135,14 @@ list_static_conffiles() {
|
@@ -134,9 +134,9 @@ list_changed_conffiles() {
|
||||||
local filter=$1
|
|
||||||
|
|
||||||
find $(sed -ne '/^[[:space:]]*$/d; /^#/d; p' \
|
|
||||||
- /etc/sysupgrade.conf /lib/upgrade/keep.d/* 2>/dev/null) \
|
|
||||||
+ /etc/sysupgrade.conf 2>/dev/null) \
|
|
||||||
\( -type f -o -type l \) $filter 2>/dev/null
|
|
||||||
}
|
|
||||||
|
|
||||||
add_conffiles() {
|
add_conffiles() {
|
||||||
local file="$1"
|
local file="$1"
|
||||||
|
( find $(sed -ne '/^[[:space:]]*$/d; /^#/d; p' \
|
||||||
- ( list_static_conffiles "$find_filter"; list_changed_conffiles ) |
|
- /etc/sysupgrade.conf /lib/upgrade/keep.d/* 2>/dev/null) \
|
||||||
+ ( list_static_conffiles "$find_filter" ) |
|
+ /etc/sysupgrade.conf 2>/dev/null) \
|
||||||
sort -u > "$file"
|
\( -type f -o -type l \) $find_filter 2>/dev/null;
|
||||||
|
- list_changed_conffiles ) | sort -u > "$file"
|
||||||
|
+ ) | sort -u > "$file"
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3,15 +3,15 @@ Date: Sat, 8 Jul 2017 10:47:56 +0200
|
||||||
Subject: ntpd host as string
|
Subject: ntpd host as string
|
||||||
|
|
||||||
diff --git a/package/utils/busybox/files/sysntpd b/package/utils/busybox/files/sysntpd
|
diff --git a/package/utils/busybox/files/sysntpd b/package/utils/busybox/files/sysntpd
|
||||||
index 074f14b8f8..a05d1789ff 100755
|
index 52866ba32acd26a490f9c9024fc3e43e0f757496..b6b28cd02527b89c0a4cc2f9adef52bb4c8427b0 100755
|
||||||
--- a/package/utils/busybox/files/sysntpd
|
--- a/package/utils/busybox/files/sysntpd
|
||||||
+++ b/package/utils/busybox/files/sysntpd
|
+++ b/package/utils/busybox/files/sysntpd
|
||||||
@@ -34,7 +34,7 @@ validate_ntp_section() {
|
@@ -30,7 +30,7 @@ get_dhcp_ntp_servers() {
|
||||||
'enable_server:bool:0' \
|
|
||||||
'enabled:bool:1' \
|
validate_ntp_section() {
|
||||||
'interface:string' \
|
uci_load_validate system timeserver "$1" "$2" \
|
||||||
- 'server:list(host)' \
|
- 'server:list(host)' 'enabled:bool:1' 'enable_server:bool:0' 'use_dhcp:bool:1' 'dhcp_interface:list(string)'
|
||||||
+ 'server:list(string)' \
|
+ 'server:list(string)' 'enabled:bool:1' 'enable_server:bool:0' 'use_dhcp:bool:1' 'dhcp_interface:list(string)'
|
||||||
'use_dhcp:bool:1'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
start_ntpd_instance() {
|
||||||
|
|
|
@ -1,29 +0,0 @@
|
||||||
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
|
|
||||||
Date: Wed, 10 Feb 2021 19:12:59 +0100
|
|
||||||
Subject: build: remove libustream and certs from default packages
|
|
||||||
|
|
||||||
This effectively reverts upstream commit e79df3516d3e ("build: add
|
|
||||||
libustream and certs to default pkgs").
|
|
||||||
|
|
||||||
The libustream-wolfssl library conflicts with the libustream-mbedtls
|
|
||||||
we are selecting in fff-web-ui and is probably much bigger.
|
|
||||||
|
|
||||||
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
|
|
||||||
|
|
||||||
diff --git a/include/target.mk b/include/target.mk
|
|
||||||
index 7526224972e18148fec8a12318ca7f90a382475f..338e97f836759fc454986210e5818ad390ba6efb 100644
|
|
||||||
--- a/include/target.mk
|
|
||||||
+++ b/include/target.mk
|
|
||||||
@@ -12,12 +12,10 @@ DEVICE_TYPE?=router
|
|
||||||
# Default packages - the really basic set
|
|
||||||
DEFAULT_PACKAGES:=\
|
|
||||||
base-files \
|
|
||||||
- ca-bundle \
|
|
||||||
dropbear \
|
|
||||||
fstools \
|
|
||||||
libc \
|
|
||||||
libgcc \
|
|
||||||
- libustream-wolfssl \
|
|
||||||
logd \
|
|
||||||
mtd \
|
|
||||||
netifd \
|
|
|
@ -0,0 +1,43 @@
|
||||||
|
From: Johannes Kimmel <fff@bareminimum.eu>
|
||||||
|
Date: Mon, 20 Jul 2020 08:05:09 +0200
|
||||||
|
Subject: vxlan: remove mandatory peeraddr
|
||||||
|
|
||||||
|
vxlan can be configured without a peer address. This is used to prepare
|
||||||
|
an interface and add peers later.
|
||||||
|
|
||||||
|
Fixes: FS#2743
|
||||||
|
|
||||||
|
Signed-off-by: Johannes Kimmel <fff@bareminimum.eu>
|
||||||
|
Acked-by: Matthias Schiffer <mschiffer@universe-factory.net>
|
||||||
|
(cherry picked from commit 5222aadbf353b7cc030c39aa816f33951b104552)
|
||||||
|
|
||||||
|
diff --git a/package/network/config/vxlan/files/vxlan.sh b/package/network/config/vxlan/files/vxlan.sh
|
||||||
|
index 7b1c7039551b7781f5f7a8e73b964db698f3697b..bdcaa628c4416cc83258dd38a6fc0978ea55a3bb 100755
|
||||||
|
--- a/package/network/config/vxlan/files/vxlan.sh
|
||||||
|
+++ b/package/network/config/vxlan/files/vxlan.sh
|
||||||
|
@@ -55,12 +55,6 @@ proto_vxlan_setup() {
|
||||||
|
local ipaddr peeraddr
|
||||||
|
json_get_vars ipaddr peeraddr tunlink
|
||||||
|
|
||||||
|
- [ -z "$peeraddr" ] && {
|
||||||
|
- proto_notify_error "$cfg" "MISSING_ADDRESS"
|
||||||
|
- proto_block_restart "$cfg"
|
||||||
|
- exit
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
( proto_add_host_dependency "$cfg" '' "$tunlink" )
|
||||||
|
|
||||||
|
[ -z "$ipaddr" ] && {
|
||||||
|
@@ -85,12 +79,6 @@ proto_vxlan6_setup() {
|
||||||
|
local ip6addr peer6addr
|
||||||
|
json_get_vars ip6addr peer6addr tunlink
|
||||||
|
|
||||||
|
- [ -z "$peer6addr" ] && {
|
||||||
|
- proto_notify_error "$cfg" "MISSING_ADDRESS"
|
||||||
|
- proto_block_restart "$cfg"
|
||||||
|
- exit
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
( proto_add_host_dependency "$cfg" '' "$tunlink" )
|
||||||
|
|
||||||
|
[ -z "$ip6addr" ] && {
|
|
@ -1,72 +0,0 @@
|
||||||
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
|
|
||||||
Date: Wed, 10 Feb 2021 22:53:00 +0100
|
|
||||||
Subject: mac80211: add back ath10k_pci memory hacks
|
|
||||||
|
|
||||||
These hacks have been removed in commit 1e27befe63ff ("mac80211: remove
|
|
||||||
ath10k_pci memory hacks").
|
|
||||||
|
|
||||||
However, since we still use mainline ath10k, we will need them.
|
|
||||||
|
|
||||||
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
|
|
||||||
|
|
||||||
diff --git a/package/kernel/mac80211/patches/ath/960-ath10k-limit-htt-rx-ring-size.patch b/package/kernel/mac80211/patches/ath/960-ath10k-limit-htt-rx-ring-size.patch
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000000000000000000000000000000000000..e907c7ab73677a3db928ef3620d77bf22a4d752a
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/package/kernel/mac80211/patches/ath/960-ath10k-limit-htt-rx-ring-size.patch
|
|
||||||
@@ -0,0 +1,11 @@
|
|
||||||
+--- a/drivers/net/wireless/ath/ath10k/htt.h
|
|
||||||
++++ b/drivers/net/wireless/ath/ath10k/htt.h
|
|
||||||
+@@ -236,7 +236,7 @@ enum htt_rx_ring_flags {
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ #define HTT_RX_RING_SIZE_MIN 128
|
|
||||||
+-#define HTT_RX_RING_SIZE_MAX 2048
|
|
||||||
++#define HTT_RX_RING_SIZE_MAX 512
|
|
||||||
+ #define HTT_RX_RING_SIZE HTT_RX_RING_SIZE_MAX
|
|
||||||
+ #define HTT_RX_RING_FILL_LEVEL (((HTT_RX_RING_SIZE) / 2) - 1)
|
|
||||||
+ #define HTT_RX_RING_FILL_LEVEL_DUAL_MAC (HTT_RX_RING_SIZE - 1)
|
|
||||||
diff --git a/package/kernel/mac80211/patches/ath/961-ath10k-limit-pci-buffer-size.patch b/package/kernel/mac80211/patches/ath/961-ath10k-limit-pci-buffer-size.patch
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000000000000000000000000000000000000..b5e5c3a9bb00a407096936ece1916e331e0164f5
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/package/kernel/mac80211/patches/ath/961-ath10k-limit-pci-buffer-size.patch
|
|
||||||
@@ -0,0 +1,38 @@
|
|
||||||
+--- a/drivers/net/wireless/ath/ath10k/pci.c
|
|
||||||
++++ b/drivers/net/wireless/ath/ath10k/pci.c
|
|
||||||
+@@ -131,7 +131,7 @@ static const struct ce_attr pci_host_ce_
|
|
||||||
+ .flags = CE_ATTR_FLAGS,
|
|
||||||
+ .src_nentries = 0,
|
|
||||||
+ .src_sz_max = 2048,
|
|
||||||
+- .dest_nentries = 512,
|
|
||||||
++ .dest_nentries = 128,
|
|
||||||
+ .recv_cb = ath10k_pci_htt_htc_rx_cb,
|
|
||||||
+ },
|
|
||||||
+
|
|
||||||
+@@ -140,7 +140,7 @@ static const struct ce_attr pci_host_ce_
|
|
||||||
+ .flags = CE_ATTR_FLAGS,
|
|
||||||
+ .src_nentries = 0,
|
|
||||||
+ .src_sz_max = 2048,
|
|
||||||
+- .dest_nentries = 128,
|
|
||||||
++ .dest_nentries = 64,
|
|
||||||
+ .recv_cb = ath10k_pci_htc_rx_cb,
|
|
||||||
+ },
|
|
||||||
+
|
|
||||||
+@@ -167,7 +167,7 @@ static const struct ce_attr pci_host_ce_
|
|
||||||
+ .flags = CE_ATTR_FLAGS,
|
|
||||||
+ .src_nentries = 0,
|
|
||||||
+ .src_sz_max = 512,
|
|
||||||
+- .dest_nentries = 512,
|
|
||||||
++ .dest_nentries = 128,
|
|
||||||
+ .recv_cb = ath10k_pci_htt_rx_cb,
|
|
||||||
+ },
|
|
||||||
+
|
|
||||||
+@@ -192,7 +192,7 @@ static const struct ce_attr pci_host_ce_
|
|
||||||
+ .flags = CE_ATTR_FLAGS,
|
|
||||||
+ .src_nentries = 0,
|
|
||||||
+ .src_sz_max = 2048,
|
|
||||||
+- .dest_nentries = 128,
|
|
||||||
++ .dest_nentries = 96,
|
|
||||||
+ .recv_cb = ath10k_pci_pktlog_rx_cb,
|
|
||||||
+ },
|
|
||||||
+
|
|
|
@ -0,0 +1,159 @@
|
||||||
|
From: Johannes Kimmel <fff@bareminimum.eu>
|
||||||
|
Date: Mon, 20 Jul 2020 08:05:10 +0200
|
||||||
|
Subject: vxlan: add capability for multiple fdb entries
|
||||||
|
|
||||||
|
Similar to wireguard, vxlan can configure multiple peers or add specific
|
||||||
|
entries to the fdb for a single mac address.
|
||||||
|
|
||||||
|
While you can still use peeraddr/peer6addr option within the proto
|
||||||
|
vxlan/vxlan6 section to not break existing configurations, this patch
|
||||||
|
allows to add multiple sections that conigure fdb entries via the bridge
|
||||||
|
command. As such, the bridge command is now a dependency of the vxlan
|
||||||
|
package. (To be honest without the bridge command available, vxlan isn't
|
||||||
|
very much fun to use or debug at all)
|
||||||
|
|
||||||
|
Field names are taken direclty from the bridge command.
|
||||||
|
|
||||||
|
Example with all supported parameters, since this hasn't been documented so
|
||||||
|
far:
|
||||||
|
|
||||||
|
config interface 'vx0'
|
||||||
|
option proto 'vxlan6' # use vxlan over ipv6
|
||||||
|
|
||||||
|
# main options
|
||||||
|
option ip6addr '2001:db8::1' # listen address
|
||||||
|
option tunlink 'wan6' # optional if listen address given
|
||||||
|
option peer6addr '2001:db8::2' # now optional
|
||||||
|
option port '8472' # this is the standard port under linux
|
||||||
|
option vid '42' # VXLAN Network Identifier to use
|
||||||
|
option mtu '1430' # vxlan6 has 70 bytes overhead
|
||||||
|
|
||||||
|
# extra options
|
||||||
|
option rxcsum '0' # allow receiving packets without checksum
|
||||||
|
option txcsum '0' # send packets without checksum
|
||||||
|
option ttl '16' # specifies the TTL value for outgoing packets
|
||||||
|
option tos '0' # specifies the TOS value for outgoing packets
|
||||||
|
option macaddr '11:22:33:44:55:66' # optional, manually specify mac
|
||||||
|
# default is a random address
|
||||||
|
|
||||||
|
Single peer with head-end replication. Corresponds to the following call
|
||||||
|
to bridge:
|
||||||
|
|
||||||
|
$ bridge fdb append 00:00:00:00:00:00 dev vx0 dst 2001:db8::3
|
||||||
|
|
||||||
|
config vxlan_peer
|
||||||
|
option vxlan 'vx0'
|
||||||
|
option dst '2001:db8::3' # always required
|
||||||
|
|
||||||
|
For multiple peers, this section can be repeated for each dst address.
|
||||||
|
|
||||||
|
It's possible to specify a multicast address as destination. Useful when
|
||||||
|
multicast routing is available or within one lan segment:
|
||||||
|
|
||||||
|
config vxlan_peer
|
||||||
|
option vxlan 'vx0'
|
||||||
|
option dst 'ff02::1337' # multicast group to join.
|
||||||
|
# all bum traffic will be send there
|
||||||
|
option via 'eth1' # for multicast, an outgoing interface needs
|
||||||
|
# to be specified
|
||||||
|
|
||||||
|
All available peer options for completeness:
|
||||||
|
|
||||||
|
config vxlan_peer
|
||||||
|
option vxlan 'vx0' # the interface to configure
|
||||||
|
option lladdr 'aa:bb:cc:dd:ee:ff' # specific mac,
|
||||||
|
option dst '2001:db8::4' # connected to this peer
|
||||||
|
option via 'eth0.1' # use this interface only
|
||||||
|
option port '4789' # use different port for this peer
|
||||||
|
option vni '23' # override vni for this peer
|
||||||
|
option src_vni '123' # see man 3 bridge
|
||||||
|
|
||||||
|
Signed-off-by: Johannes Kimmel <fff@bareminimum.eu>
|
||||||
|
(cherry picked from commit 65e9de3c333bae1ccef1dfb0cc008ad6f13958e4)
|
||||||
|
|
||||||
|
diff --git a/package/network/config/vxlan/Makefile b/package/network/config/vxlan/Makefile
|
||||||
|
index 13fcf0c55d07d97f5dcc3cbfcf2478020e7107cc..7232f71b45e6f72f2c62a245ad44cb9ade144f52 100644
|
||||||
|
--- a/package/network/config/vxlan/Makefile
|
||||||
|
+++ b/package/network/config/vxlan/Makefile
|
||||||
|
@@ -1,7 +1,7 @@
|
||||||
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
|
PKG_NAME:=vxlan
|
||||||
|
-PKG_RELEASE:=3
|
||||||
|
+PKG_RELEASE:=4
|
||||||
|
PKG_LICENSE:=GPL-2.0
|
||||||
|
|
||||||
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
diff --git a/package/network/config/vxlan/files/vxlan.sh b/package/network/config/vxlan/files/vxlan.sh
|
||||||
|
index bdcaa628c4416cc83258dd38a6fc0978ea55a3bb..d063c47d47d0f4e339b21e97f4e25f55a33c0497 100755
|
||||||
|
--- a/package/network/config/vxlan/files/vxlan.sh
|
||||||
|
+++ b/package/network/config/vxlan/files/vxlan.sh
|
||||||
|
@@ -7,6 +7,50 @@
|
||||||
|
init_proto "$@"
|
||||||
|
}
|
||||||
|
|
||||||
|
+proto_vxlan_setup_peer() {
|
||||||
|
+ type bridge &> /dev/null || {
|
||||||
|
+ proto_notify_error "$cfg" "MISSING_BRIDGE_COMMAND"
|
||||||
|
+ exit
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ local peer_config="$1"
|
||||||
|
+
|
||||||
|
+ local vxlan
|
||||||
|
+ local lladdr
|
||||||
|
+ local dst
|
||||||
|
+ local src_vni
|
||||||
|
+ local vni
|
||||||
|
+ local port
|
||||||
|
+ local via
|
||||||
|
+
|
||||||
|
+ config_get vxlan "${peer_config}" "vxlan"
|
||||||
|
+ config_get lladdr "${peer_config}" "lladdr"
|
||||||
|
+ config_get dst "${peer_config}" "dst"
|
||||||
|
+ config_get src_vni "${peer_config}" "src_vni"
|
||||||
|
+ config_get vni "${peer_config}" "vni"
|
||||||
|
+ config_get port "${peer_config}" "port"
|
||||||
|
+ config_get via "${peer_config}" "via"
|
||||||
|
+
|
||||||
|
+ [ "$cfg" = "$vxlan" ] || {
|
||||||
|
+ # This peer section belongs to another device
|
||||||
|
+ return
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ [ -n "${dst}" ] || {
|
||||||
|
+ proto_notify_error "$cfg" "MISSING_PEER_ADDRESS"
|
||||||
|
+ exit
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ bridge fdb append \
|
||||||
|
+ ${lladdr:-00:00:00:00:00:00} \
|
||||||
|
+ dev ${cfg} \
|
||||||
|
+ dst ${dst} \
|
||||||
|
+ ${src_vni:+src_vni $src_vni} \
|
||||||
|
+ ${vni:+vni $vni} \
|
||||||
|
+ ${port:+port $port} \
|
||||||
|
+ ${via:+via $via}
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
vxlan_generic_setup() {
|
||||||
|
local cfg="$1"
|
||||||
|
local mode="$2"
|
||||||
|
@@ -18,7 +62,6 @@ vxlan_generic_setup() {
|
||||||
|
local port vid ttl tos mtu macaddr zone rxcsum txcsum
|
||||||
|
json_get_vars port vid ttl tos mtu macaddr zone rxcsum txcsum
|
||||||
|
|
||||||
|
-
|
||||||
|
proto_init_update "$link" 1
|
||||||
|
|
||||||
|
proto_add_tunnel
|
||||||
|
@@ -47,6 +90,9 @@ vxlan_generic_setup() {
|
||||||
|
proto_close_data
|
||||||
|
|
||||||
|
proto_send_update "$cfg"
|
||||||
|
+
|
||||||
|
+ config_load network
|
||||||
|
+ config_foreach proto_vxlan_setup_peer "vxlan_peer"
|
||||||
|
}
|
||||||
|
|
||||||
|
proto_vxlan_setup() {
|
|
@ -0,0 +1,90 @@
|
||||||
|
From: Hans Dedecker <dedeckeh@gmail.com>
|
||||||
|
Date: Mon, 14 Sep 2020 21:55:01 +0200
|
||||||
|
Subject: vxlan: add extra config options
|
||||||
|
|
||||||
|
Add config options:
|
||||||
|
srcportmin/srcportmax : range of port numbers to use as UDP source ports
|
||||||
|
to communicate to the remote VXLAN tunnel endpoint
|
||||||
|
ageing : lifetime in seconds of FDB entries learnt by the kernel
|
||||||
|
maxaddress : maximum number of FDB entries
|
||||||
|
learning : enable/disable entering unknown source link layer addresses
|
||||||
|
and IP addresses into the VXLAN device FDB.
|
||||||
|
rsc : enable/disable route short circuit
|
||||||
|
proxy : enable/disable ARP proxy
|
||||||
|
l2miss : enable/disable netlink LLADDR miss notifications
|
||||||
|
l3miss : enable/disable netlink IP ADDR miss notifications
|
||||||
|
gbp : enable/disable the Group Policy extension
|
||||||
|
|
||||||
|
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
|
||||||
|
(cherry picked from commit 036221ce5a899eb99ef1c1623fc9460af00a69e7)
|
||||||
|
|
||||||
|
diff --git a/package/network/config/vxlan/Makefile b/package/network/config/vxlan/Makefile
|
||||||
|
index 7232f71b45e6f72f2c62a245ad44cb9ade144f52..eb053bf1118dd300db549906bfd474a19f5e3752 100644
|
||||||
|
--- a/package/network/config/vxlan/Makefile
|
||||||
|
+++ b/package/network/config/vxlan/Makefile
|
||||||
|
@@ -1,7 +1,7 @@
|
||||||
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
|
PKG_NAME:=vxlan
|
||||||
|
-PKG_RELEASE:=4
|
||||||
|
+PKG_RELEASE:=5
|
||||||
|
PKG_LICENSE:=GPL-2.0
|
||||||
|
|
||||||
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
diff --git a/package/network/config/vxlan/files/vxlan.sh b/package/network/config/vxlan/files/vxlan.sh
|
||||||
|
index d063c47d47d0f4e339b21e97f4e25f55a33c0497..8b3a0a53d47c675fcf89981061a250b5f526df3e 100755
|
||||||
|
--- a/package/network/config/vxlan/files/vxlan.sh
|
||||||
|
+++ b/package/network/config/vxlan/files/vxlan.sh
|
||||||
|
@@ -59,8 +59,8 @@ vxlan_generic_setup() {
|
||||||
|
|
||||||
|
local link="$cfg"
|
||||||
|
|
||||||
|
- local port vid ttl tos mtu macaddr zone rxcsum txcsum
|
||||||
|
- json_get_vars port vid ttl tos mtu macaddr zone rxcsum txcsum
|
||||||
|
+ local port vid ttl tos mtu macaddr zone rxcsum txcsum srcportmin srcportmax ageing maxaddress learning proxy l2miss l3miss gbp
|
||||||
|
+ json_get_vars port vid ttl tos mtu macaddr zone rxcsum txcsum srcportmin srcportmax ageing maxaddress learning proxy l2miss l3miss gbp
|
||||||
|
|
||||||
|
proto_init_update "$link" 1
|
||||||
|
|
||||||
|
@@ -78,9 +78,20 @@ vxlan_generic_setup() {
|
||||||
|
json_add_object 'data'
|
||||||
|
[ -n "$port" ] && json_add_int port "$port"
|
||||||
|
[ -n "$vid" ] && json_add_int id "$vid"
|
||||||
|
+ [ -n "$srcportmin" ] && json_add_int srcportmin "$srcportmin"
|
||||||
|
+ [ -n "$srcportmax" ] && json_add_int srcportmax "$srcportmax"
|
||||||
|
+ [ -n "$ageing" ] && json_add_int ageing "$ageing"
|
||||||
|
+ [ -n "$maxaddress" ] && json_add_int maxaddress "$maxaddress"
|
||||||
|
[ -n "$macaddr" ] && json_add_string macaddr "$macaddr"
|
||||||
|
[ -n "$rxcsum" ] && json_add_boolean rxcsum "$rxcsum"
|
||||||
|
[ -n "$txcsum" ] && json_add_boolean txcsum "$txcsum"
|
||||||
|
+ [ -n "$learning" ] && json_add_boolean learning "$learning"
|
||||||
|
+ [ -n "$rsc" ] && json_add_boolean rsc "$rsc"
|
||||||
|
+ [ -n "$proxy" ] && json_add_boolean proxy "$proxy"
|
||||||
|
+ [ -n "$l2miss" ] && json_add_boolean l2miss "$l2miss"
|
||||||
|
+ [ -n "$l3miss" ] && json_add_boolean l3miss "$l3miss"
|
||||||
|
+ [ -n "$gbp" ] && json_add_boolean gbp "$gbp"
|
||||||
|
+
|
||||||
|
json_close_object
|
||||||
|
|
||||||
|
proto_close_tunnel
|
||||||
|
@@ -163,9 +174,20 @@ vxlan_generic_init_config() {
|
||||||
|
proto_config_add_int "ttl"
|
||||||
|
proto_config_add_int "tos"
|
||||||
|
proto_config_add_int "mtu"
|
||||||
|
+ proto_config_add_int "srcportmin"
|
||||||
|
+ proto_config_add_int "srcportmax"
|
||||||
|
+ proto_config_add_int "ageing"
|
||||||
|
+ proto_config_add_int "maxaddress"
|
||||||
|
proto_config_add_boolean "rxcsum"
|
||||||
|
proto_config_add_boolean "txcsum"
|
||||||
|
+ proto_config_add_boolean "learning"
|
||||||
|
+ proto_config_add_boolean "rsc"
|
||||||
|
+ proto_config_add_boolean "proxy"
|
||||||
|
+ proto_config_add_boolean "l2miss"
|
||||||
|
+ proto_config_add_boolean "l3miss"
|
||||||
|
+ proto_config_add_boolean "gbp"
|
||||||
|
proto_config_add_string "macaddr"
|
||||||
|
+
|
||||||
|
}
|
||||||
|
|
||||||
|
proto_vxlan_init_config() {
|
|
@ -0,0 +1,37 @@
|
||||||
|
From: Hans Dedecker <dedeckeh@gmail.com>
|
||||||
|
Date: Thu, 24 Sep 2020 22:04:39 +0200
|
||||||
|
Subject: vxlan: fix rsc config option
|
||||||
|
|
||||||
|
Fix route short circuit config option; fixes commit 036221ce5a899eb99ef1c1623fc9460af00a69e7
|
||||||
|
|
||||||
|
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
|
||||||
|
(cherry picked from commit ad3044c424510668dd318c6a48c0b56bfba3c2da)
|
||||||
|
|
||||||
|
diff --git a/package/network/config/vxlan/Makefile b/package/network/config/vxlan/Makefile
|
||||||
|
index eb053bf1118dd300db549906bfd474a19f5e3752..0b4d6713f9e1cfcad9f4c94272f8dc9192b7f3b4 100644
|
||||||
|
--- a/package/network/config/vxlan/Makefile
|
||||||
|
+++ b/package/network/config/vxlan/Makefile
|
||||||
|
@@ -1,7 +1,7 @@
|
||||||
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
|
PKG_NAME:=vxlan
|
||||||
|
-PKG_RELEASE:=5
|
||||||
|
+PKG_RELEASE:=6
|
||||||
|
PKG_LICENSE:=GPL-2.0
|
||||||
|
|
||||||
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
diff --git a/package/network/config/vxlan/files/vxlan.sh b/package/network/config/vxlan/files/vxlan.sh
|
||||||
|
index 8b3a0a53d47c675fcf89981061a250b5f526df3e..5c1c484c47f7fb48f1cb705b200d589df77a60f6 100755
|
||||||
|
--- a/package/network/config/vxlan/files/vxlan.sh
|
||||||
|
+++ b/package/network/config/vxlan/files/vxlan.sh
|
||||||
|
@@ -59,8 +59,8 @@ vxlan_generic_setup() {
|
||||||
|
|
||||||
|
local link="$cfg"
|
||||||
|
|
||||||
|
- local port vid ttl tos mtu macaddr zone rxcsum txcsum srcportmin srcportmax ageing maxaddress learning proxy l2miss l3miss gbp
|
||||||
|
- json_get_vars port vid ttl tos mtu macaddr zone rxcsum txcsum srcportmin srcportmax ageing maxaddress learning proxy l2miss l3miss gbp
|
||||||
|
+ local port vid ttl tos mtu macaddr zone rxcsum txcsum srcportmin srcportmax ageing maxaddress learning rsc proxy l2miss l3miss gbp
|
||||||
|
+ json_get_vars port vid ttl tos mtu macaddr zone rxcsum txcsum srcportmin srcportmax ageing maxaddress learning rsc proxy l2miss l3miss gbp
|
||||||
|
|
||||||
|
proto_init_update "$link" 1
|
||||||
|
|
|
@ -0,0 +1,101 @@
|
||||||
|
From: Johannes Kimmel <fff@bareminimum.eu>
|
||||||
|
Date: Tue, 15 Dec 2020 00:31:52 +0100
|
||||||
|
Subject: vxlan: allow for dynamic source ip selection (FS#3426)
|
||||||
|
|
||||||
|
By setting 'auto', the zero address or the empty string as source
|
||||||
|
address (option ipaddr, option ip6addr), vxlan will choose one
|
||||||
|
dynamically. This helps in setups where a wan ip or prefix changes.
|
||||||
|
|
||||||
|
This corresponse to setting up an vxlan tunnel with:
|
||||||
|
|
||||||
|
proto vxlan6:
|
||||||
|
# ip link add vx0 type vxlan id ID local :: ...
|
||||||
|
proto vxlan:
|
||||||
|
# ip link add vx0 type vxlan id ID local 0.0.0.0 ...
|
||||||
|
|
||||||
|
While it is possible to not specify a source ip at all, the kernel will
|
||||||
|
default to setting up a ipv4 tunnel. The kernel will take any hint from
|
||||||
|
source and peer ips to figure out, what tunnel type to use. To make sure
|
||||||
|
we setup an ipv6 tunnel for proto vxlan6, this workaround is needed.
|
||||||
|
|
||||||
|
This will not change the behaviour of currently working configurations.
|
||||||
|
However this will allow former broken configurations, namely those not
|
||||||
|
specifying both a source address and tunnel interface, to setup a
|
||||||
|
tunnel interface. Previously those configurations weren't reporting an
|
||||||
|
error and were stueck in a setup loop like in Bug FS#3426.
|
||||||
|
|
||||||
|
This change lifts the currently very strict behaviour and should fix the
|
||||||
|
following bug:
|
||||||
|
|
||||||
|
Fixes: FS#3426
|
||||||
|
Ref: https://bugs.openwrt.org/index.php?do=details&task_id=3426
|
||||||
|
|
||||||
|
Signed-off-by: Johannes Kimmel <fff@bareminimum.eu>
|
||||||
|
(cherry picked from commit 3f5619f259de42af4404e0e36d11df4adcef9f5e)
|
||||||
|
|
||||||
|
diff --git a/package/network/config/vxlan/Makefile b/package/network/config/vxlan/Makefile
|
||||||
|
index 0b4d6713f9e1cfcad9f4c94272f8dc9192b7f3b4..97972d6d85bddc56d1575088d3966ae6899f06da 100644
|
||||||
|
--- a/package/network/config/vxlan/Makefile
|
||||||
|
+++ b/package/network/config/vxlan/Makefile
|
||||||
|
@@ -1,7 +1,7 @@
|
||||||
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
|
PKG_NAME:=vxlan
|
||||||
|
-PKG_RELEASE:=6
|
||||||
|
+PKG_RELEASE:=7
|
||||||
|
PKG_LICENSE:=GPL-2.0
|
||||||
|
|
||||||
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
diff --git a/package/network/config/vxlan/files/vxlan.sh b/package/network/config/vxlan/files/vxlan.sh
|
||||||
|
index 5c1c484c47f7fb48f1cb705b200d589df77a60f6..a087c4a3ce2ca42a6b8d43b2254d0ea7379c0936 100755
|
||||||
|
--- a/package/network/config/vxlan/files/vxlan.sh
|
||||||
|
+++ b/package/network/config/vxlan/files/vxlan.sh
|
||||||
|
@@ -114,18 +114,11 @@ proto_vxlan_setup() {
|
||||||
|
|
||||||
|
( proto_add_host_dependency "$cfg" '' "$tunlink" )
|
||||||
|
|
||||||
|
- [ -z "$ipaddr" ] && {
|
||||||
|
- local wanif="$tunlink"
|
||||||
|
- if [ -z "$wanif" ] && ! network_find_wan wanif; then
|
||||||
|
- proto_notify_error "$cfg" "NO_WAN_LINK"
|
||||||
|
- exit
|
||||||
|
- fi
|
||||||
|
-
|
||||||
|
- if ! network_get_ipaddr ipaddr "$wanif"; then
|
||||||
|
- proto_notify_error "$cfg" "NO_WAN_LINK"
|
||||||
|
- exit
|
||||||
|
- fi
|
||||||
|
- }
|
||||||
|
+ case "$ipaddr" in
|
||||||
|
+ "auto"|"")
|
||||||
|
+ ipaddr="0.0.0.0"
|
||||||
|
+ ;;
|
||||||
|
+ esac
|
||||||
|
|
||||||
|
vxlan_generic_setup "$cfg" 'vxlan' "$ipaddr" "$peeraddr"
|
||||||
|
}
|
||||||
|
@@ -138,18 +131,12 @@ proto_vxlan6_setup() {
|
||||||
|
|
||||||
|
( proto_add_host_dependency "$cfg" '' "$tunlink" )
|
||||||
|
|
||||||
|
- [ -z "$ip6addr" ] && {
|
||||||
|
- local wanif="$tunlink"
|
||||||
|
- if [ -z "$wanif" ] && ! network_find_wan6 wanif; then
|
||||||
|
- proto_notify_error "$cfg" "NO_WAN_LINK"
|
||||||
|
- exit
|
||||||
|
- fi
|
||||||
|
-
|
||||||
|
- if ! network_get_ipaddr6 ip6addr "$wanif"; then
|
||||||
|
- proto_notify_error "$cfg" "NO_WAN_LINK"
|
||||||
|
- exit
|
||||||
|
- fi
|
||||||
|
- }
|
||||||
|
+ case "$ip6addr" in
|
||||||
|
+ "auto"|"")
|
||||||
|
+ # ensure tunnel via ipv6
|
||||||
|
+ ip6addr="::"
|
||||||
|
+ ;;
|
||||||
|
+ esac
|
||||||
|
|
||||||
|
vxlan_generic_setup "$cfg" 'vxlan6' "$ip6addr" "$peer6addr"
|
||||||
|
}
|
|
@ -0,0 +1,324 @@
|
||||||
|
From: Johannes Kimmel <fff@bareminimum.eu>
|
||||||
|
Date: Fri, 1 Jan 2021 09:55:25 +0100
|
||||||
|
Subject: netifd: backport vxlan patches
|
||||||
|
|
||||||
|
Signed-off-by: Johannes Kimmel <fff@bareminimum.eu>
|
||||||
|
[refresh patches]
|
||||||
|
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
|
||||||
|
|
||||||
|
diff --git a/package/network/config/netifd/patches/0001-netifd-vxlan-handle-srcport-range.patch b/package/network/config/netifd/patches/0001-netifd-vxlan-handle-srcport-range.patch
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000000000000000000000000000000000..0b803aca8bebe33ad47f7e441bc9aa36d42b0aea
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/package/network/config/netifd/patches/0001-netifd-vxlan-handle-srcport-range.patch
|
||||||
|
@@ -0,0 +1,89 @@
|
||||||
|
+From a3c033e2afc289672e0ed4b8d8a835d509715af8 Mon Sep 17 00:00:00 2001
|
||||||
|
+From: Johannes Kimmel <fff@bareminimum.eu>
|
||||||
|
+Date: Fri, 4 Sep 2020 04:59:40 +0200
|
||||||
|
+Subject: [PATCH 1/4] netifd: vxlan: handle srcport range
|
||||||
|
+
|
||||||
|
+This adds adds the ability to set the source port range for vxlan
|
||||||
|
+interfaces.
|
||||||
|
+
|
||||||
|
+By default vxlans will use a random port within the ephermal range as
|
||||||
|
+source ports for packets. This is done to aid scaleability within a
|
||||||
|
+datacenter.
|
||||||
|
+
|
||||||
|
+But with these defaults it's impossible to punch through NATs or
|
||||||
|
+traverese most stateful firewalls easily. One solution is to fix the
|
||||||
|
+srcport to the same as dstport.
|
||||||
|
+
|
||||||
|
+If only srcportmin is specified, then srcportmax is set in a way that
|
||||||
|
+outgoing packets will only use srcportmin.
|
||||||
|
+
|
||||||
|
+If a range is to be specified, srcportmin and srcportmax have to be
|
||||||
|
+specified. srcportmax is exclusive.
|
||||||
|
+
|
||||||
|
+If only srcportmax is specified, the value is ignored and defaults are
|
||||||
|
+used.
|
||||||
|
+
|
||||||
|
+Signed-off-by: Johannes Kimmel <fff@bareminimum.eu>
|
||||||
|
+---
|
||||||
|
+ system-linux.c | 26 ++++++++++++++++++++++++++
|
||||||
|
+ system.c | 2 ++
|
||||||
|
+ system.h | 2 ++
|
||||||
|
+ 3 files changed, 30 insertions(+)
|
||||||
|
+
|
||||||
|
+--- a/system-linux.c
|
||||||
|
++++ b/system-linux.c
|
||||||
|
+@@ -3062,6 +3062,32 @@ static int system_add_vxlan(const char *
|
||||||
|
+ }
|
||||||
|
+ nla_put_u16(msg, IFLA_VXLAN_PORT, htons(port));
|
||||||
|
+
|
||||||
|
++ if ((cur = tb_data[VXLAN_DATA_ATTR_SRCPORTMIN])) {
|
||||||
|
++ struct ifla_vxlan_port_range srcports = {0,0};
|
||||||
|
++
|
||||||
|
++ uint32_t low = blobmsg_get_u32(cur);
|
||||||
|
++ if (low < 1 || low > 65535 - 1) {
|
||||||
|
++ ret = -EINVAL;
|
||||||
|
++ goto failure;
|
||||||
|
++ }
|
||||||
|
++
|
||||||
|
++ srcports.low = htons((uint16_t) low);
|
||||||
|
++ srcports.high = htons((uint16_t) (low+1));
|
||||||
|
++
|
||||||
|
++ if ((cur = tb_data[VXLAN_DATA_ATTR_SRCPORTMAX])) {
|
||||||
|
++ uint32_t high = blobmsg_get_u32(cur);
|
||||||
|
++ if (high < 1 || high > 65535) {
|
||||||
|
++ ret = -EINVAL;
|
||||||
|
++ goto failure;
|
||||||
|
++ }
|
||||||
|
++
|
||||||
|
++ if (high > low)
|
||||||
|
++ srcports.high = htons((uint16_t) high);
|
||||||
|
++ }
|
||||||
|
++
|
||||||
|
++ nla_put(msg, IFLA_VXLAN_PORT_RANGE, sizeof(srcports), &srcports);
|
||||||
|
++ }
|
||||||
|
++
|
||||||
|
+ if ((cur = tb_data[VXLAN_DATA_ATTR_RXCSUM])) {
|
||||||
|
+ bool rxcsum = blobmsg_get_bool(cur);
|
||||||
|
+ nla_put_u8(msg, IFLA_VXLAN_UDP_ZERO_CSUM6_RX, !rxcsum);
|
||||||
|
+--- a/system.c
|
||||||
|
++++ b/system.c
|
||||||
|
+@@ -38,6 +38,8 @@ static const struct blobmsg_policy vxlan
|
||||||
|
+ [VXLAN_DATA_ATTR_MACADDR] = { .name = "macaddr", .type = BLOBMSG_TYPE_STRING },
|
||||||
|
+ [VXLAN_DATA_ATTR_RXCSUM] = { .name = "rxcsum", .type = BLOBMSG_TYPE_BOOL },
|
||||||
|
+ [VXLAN_DATA_ATTR_TXCSUM] = { .name = "txcsum", .type = BLOBMSG_TYPE_BOOL },
|
||||||
|
++ [VXLAN_DATA_ATTR_SRCPORTMIN] = { .name = "srcportmin", .type = BLOBMSG_TYPE_INT32 },
|
||||||
|
++ [VXLAN_DATA_ATTR_SRCPORTMAX] = { .name = "srcportmax", .type = BLOBMSG_TYPE_INT32 },
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ const struct uci_blob_param_list vxlan_data_attr_list = {
|
||||||
|
+--- a/system.h
|
||||||
|
++++ b/system.h
|
||||||
|
+@@ -43,6 +43,8 @@ enum vxlan_data {
|
||||||
|
+ VXLAN_DATA_ATTR_MACADDR,
|
||||||
|
+ VXLAN_DATA_ATTR_RXCSUM,
|
||||||
|
+ VXLAN_DATA_ATTR_TXCSUM,
|
||||||
|
++ VXLAN_DATA_ATTR_SRCPORTMIN,
|
||||||
|
++ VXLAN_DATA_ATTR_SRCPORTMAX,
|
||||||
|
+ __VXLAN_DATA_ATTR_MAX
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
diff --git a/package/network/config/netifd/patches/0002-netifd-vxlan-refactor-mapping-of-boolean-attrs.patch b/package/network/config/netifd/patches/0002-netifd-vxlan-refactor-mapping-of-boolean-attrs.patch
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000000000000000000000000000000000..3c60665354a52159566826bbedf59964077205d5
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/package/network/config/netifd/patches/0002-netifd-vxlan-refactor-mapping-of-boolean-attrs.patch
|
||||||
|
@@ -0,0 +1,54 @@
|
||||||
|
+From 226566b967dc4ef4d83ed7844b8ad746f4306f8d Mon Sep 17 00:00:00 2001
|
||||||
|
+From: Johannes Kimmel <fff@bareminimum.eu>
|
||||||
|
+Date: Fri, 4 Sep 2020 04:59:41 +0200
|
||||||
|
+Subject: [PATCH 2/4] netifd: vxlan: refactor mapping of boolean attrs
|
||||||
|
+
|
||||||
|
+Add a small function to handle boolean options and make use of it to handle:
|
||||||
|
+ - rxcsum
|
||||||
|
+ - txcsum
|
||||||
|
+
|
||||||
|
+Signed-off-by: Johannes Kimmel <fff@bareminimum.eu>
|
||||||
|
+---
|
||||||
|
+ system-linux.c | 24 ++++++++++++++----------
|
||||||
|
+ 1 file changed, 14 insertions(+), 10 deletions(-)
|
||||||
|
+
|
||||||
|
+--- a/system-linux.c
|
||||||
|
++++ b/system-linux.c
|
||||||
|
+@@ -2951,6 +2951,17 @@ failure:
|
||||||
|
+ #endif
|
||||||
|
+
|
||||||
|
+ #ifdef IFLA_VXLAN_MAX
|
||||||
|
++static void system_vxlan_map_bool_attr(struct nl_msg *msg, struct blob_attr **tb_data, int attrtype, int vxlandatatype, bool invert) {
|
||||||
|
++ struct blob_attr *cur;
|
||||||
|
++ if ((cur = tb_data[vxlandatatype])) {
|
||||||
|
++ bool val = blobmsg_get_bool(cur);
|
||||||
|
++ if (invert) {
|
||||||
|
++ val = !val;
|
||||||
|
++ }
|
||||||
|
++ nla_put_u8(msg, attrtype, val);
|
||||||
|
++ }
|
||||||
|
++}
|
||||||
|
++
|
||||||
|
+ static int system_add_vxlan(const char *name, const unsigned int link, struct blob_attr **tb, bool v6)
|
||||||
|
+ {
|
||||||
|
+ struct blob_attr *tb_data[__VXLAN_DATA_ATTR_MAX];
|
||||||
|
+@@ -3088,16 +3099,9 @@ static int system_add_vxlan(const char *
|
||||||
|
+ nla_put(msg, IFLA_VXLAN_PORT_RANGE, sizeof(srcports), &srcports);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+- if ((cur = tb_data[VXLAN_DATA_ATTR_RXCSUM])) {
|
||||||
|
+- bool rxcsum = blobmsg_get_bool(cur);
|
||||||
|
+- nla_put_u8(msg, IFLA_VXLAN_UDP_ZERO_CSUM6_RX, !rxcsum);
|
||||||
|
+- }
|
||||||
|
+-
|
||||||
|
+- if ((cur = tb_data[VXLAN_DATA_ATTR_TXCSUM])) {
|
||||||
|
+- bool txcsum = blobmsg_get_bool(cur);
|
||||||
|
+- nla_put_u8(msg, IFLA_VXLAN_UDP_CSUM, txcsum);
|
||||||
|
+- nla_put_u8(msg, IFLA_VXLAN_UDP_ZERO_CSUM6_TX, !txcsum);
|
||||||
|
+- }
|
||||||
|
++ system_vxlan_map_bool_attr(msg, tb_data, IFLA_VXLAN_UDP_CSUM, VXLAN_DATA_ATTR_TXCSUM, false);
|
||||||
|
++ system_vxlan_map_bool_attr(msg, tb_data, IFLA_VXLAN_UDP_ZERO_CSUM6_RX, VXLAN_DATA_ATTR_RXCSUM, true);
|
||||||
|
++ system_vxlan_map_bool_attr(msg, tb_data, IFLA_VXLAN_UDP_ZERO_CSUM6_TX, VXLAN_DATA_ATTR_TXCSUM, true);
|
||||||
|
+
|
||||||
|
+ if ((cur = tb[TUNNEL_ATTR_TOS])) {
|
||||||
|
+ char *str = blobmsg_get_string(cur);
|
||||||
|
diff --git a/package/network/config/netifd/patches/0003-netifd-vxlan-add-most-missing-boolean-options.patch b/package/network/config/netifd/patches/0003-netifd-vxlan-add-most-missing-boolean-options.patch
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000000000000000000000000000000000..693e92b9f6b50f20d8fd220c196440d7bf894eb9
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/package/network/config/netifd/patches/0003-netifd-vxlan-add-most-missing-boolean-options.patch
|
||||||
|
@@ -0,0 +1,93 @@
|
||||||
|
+From 11223f5550f7dd8faefb85441065b682be16e61f Mon Sep 17 00:00:00 2001
|
||||||
|
+From: Johannes Kimmel <fff@bareminimum.eu>
|
||||||
|
+Date: Fri, 4 Sep 2020 04:59:42 +0200
|
||||||
|
+Subject: [PATCH 3/4] netifd: vxlan: add most missing boolean options
|
||||||
|
+
|
||||||
|
+adds the folloing missing options:
|
||||||
|
+ - learning
|
||||||
|
+ - rsc
|
||||||
|
+ - proxy
|
||||||
|
+ - l2miss
|
||||||
|
+ - l3miss
|
||||||
|
+ - gbp
|
||||||
|
+
|
||||||
|
+See ip-link(3) for their meaning.
|
||||||
|
+
|
||||||
|
+still missing:
|
||||||
|
+ - external
|
||||||
|
+ - gpe
|
||||||
|
+
|
||||||
|
+I'm not sure how to handle them at the moment. It's unclear to me what
|
||||||
|
+IFLA_VXLAN_* value corresponds to the 'external' option and according to
|
||||||
|
+the manpage, gpe depends on it.
|
||||||
|
+
|
||||||
|
+Signed-off-by: Johannes Kimmel <fff@bareminimum.eu>
|
||||||
|
+---
|
||||||
|
+ system-linux.c | 16 +++++++++++++---
|
||||||
|
+ system.c | 6 ++++++
|
||||||
|
+ system.h | 6 ++++++
|
||||||
|
+ 3 files changed, 25 insertions(+), 3 deletions(-)
|
||||||
|
+
|
||||||
|
+--- a/system-linux.c
|
||||||
|
++++ b/system-linux.c
|
||||||
|
+@@ -2955,10 +2955,14 @@ static void system_vxlan_map_bool_attr(s
|
||||||
|
+ struct blob_attr *cur;
|
||||||
|
+ if ((cur = tb_data[vxlandatatype])) {
|
||||||
|
+ bool val = blobmsg_get_bool(cur);
|
||||||
|
+- if (invert) {
|
||||||
|
++ if (invert)
|
||||||
|
+ val = !val;
|
||||||
|
+- }
|
||||||
|
+- nla_put_u8(msg, attrtype, val);
|
||||||
|
++
|
||||||
|
++ if ((attrtype == IFLA_VXLAN_GBP) && val)
|
||||||
|
++ nla_put_flag(msg, attrtype);
|
||||||
|
++ else
|
||||||
|
++ nla_put_u8(msg, attrtype, val);
|
||||||
|
++
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+@@ -3102,6 +3106,12 @@ static int system_add_vxlan(const char *
|
||||||
|
+ system_vxlan_map_bool_attr(msg, tb_data, IFLA_VXLAN_UDP_CSUM, VXLAN_DATA_ATTR_TXCSUM, false);
|
||||||
|
+ system_vxlan_map_bool_attr(msg, tb_data, IFLA_VXLAN_UDP_ZERO_CSUM6_RX, VXLAN_DATA_ATTR_RXCSUM, true);
|
||||||
|
+ system_vxlan_map_bool_attr(msg, tb_data, IFLA_VXLAN_UDP_ZERO_CSUM6_TX, VXLAN_DATA_ATTR_TXCSUM, true);
|
||||||
|
++ system_vxlan_map_bool_attr(msg, tb_data, IFLA_VXLAN_LEARNING, VXLAN_DATA_ATTR_LEARNING, false);
|
||||||
|
++ system_vxlan_map_bool_attr(msg, tb_data, IFLA_VXLAN_RSC , VXLAN_DATA_ATTR_RSC, false);
|
||||||
|
++ system_vxlan_map_bool_attr(msg, tb_data, IFLA_VXLAN_PROXY , VXLAN_DATA_ATTR_PROXY, false);
|
||||||
|
++ system_vxlan_map_bool_attr(msg, tb_data, IFLA_VXLAN_L2MISS , VXLAN_DATA_ATTR_L2MISS, false);
|
||||||
|
++ system_vxlan_map_bool_attr(msg, tb_data, IFLA_VXLAN_L3MISS , VXLAN_DATA_ATTR_L3MISS, false);
|
||||||
|
++ system_vxlan_map_bool_attr(msg, tb_data, IFLA_VXLAN_GBP , VXLAN_DATA_ATTR_GBP, false);
|
||||||
|
+
|
||||||
|
+ if ((cur = tb[TUNNEL_ATTR_TOS])) {
|
||||||
|
+ char *str = blobmsg_get_string(cur);
|
||||||
|
+--- a/system.c
|
||||||
|
++++ b/system.c
|
||||||
|
+@@ -40,6 +40,12 @@ static const struct blobmsg_policy vxlan
|
||||||
|
+ [VXLAN_DATA_ATTR_TXCSUM] = { .name = "txcsum", .type = BLOBMSG_TYPE_BOOL },
|
||||||
|
+ [VXLAN_DATA_ATTR_SRCPORTMIN] = { .name = "srcportmin", .type = BLOBMSG_TYPE_INT32 },
|
||||||
|
+ [VXLAN_DATA_ATTR_SRCPORTMAX] = { .name = "srcportmax", .type = BLOBMSG_TYPE_INT32 },
|
||||||
|
++ [VXLAN_DATA_ATTR_LEARNING] = { .name = "learning", .type = BLOBMSG_TYPE_BOOL },
|
||||||
|
++ [VXLAN_DATA_ATTR_RSC] = { .name = "rsc", .type = BLOBMSG_TYPE_BOOL },
|
||||||
|
++ [VXLAN_DATA_ATTR_PROXY] = { .name = "proxy", .type = BLOBMSG_TYPE_BOOL },
|
||||||
|
++ [VXLAN_DATA_ATTR_L2MISS] = { .name = "l2miss", .type = BLOBMSG_TYPE_BOOL },
|
||||||
|
++ [VXLAN_DATA_ATTR_L3MISS] = { .name = "l3miss", .type = BLOBMSG_TYPE_BOOL },
|
||||||
|
++ [VXLAN_DATA_ATTR_GBP] = { .name = "gbp", .type = BLOBMSG_TYPE_BOOL },
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ const struct uci_blob_param_list vxlan_data_attr_list = {
|
||||||
|
+--- a/system.h
|
||||||
|
++++ b/system.h
|
||||||
|
+@@ -45,6 +45,12 @@ enum vxlan_data {
|
||||||
|
+ VXLAN_DATA_ATTR_TXCSUM,
|
||||||
|
+ VXLAN_DATA_ATTR_SRCPORTMIN,
|
||||||
|
+ VXLAN_DATA_ATTR_SRCPORTMAX,
|
||||||
|
++ VXLAN_DATA_ATTR_LEARNING,
|
||||||
|
++ VXLAN_DATA_ATTR_RSC,
|
||||||
|
++ VXLAN_DATA_ATTR_PROXY,
|
||||||
|
++ VXLAN_DATA_ATTR_L2MISS,
|
||||||
|
++ VXLAN_DATA_ATTR_L3MISS,
|
||||||
|
++ VXLAN_DATA_ATTR_GBP,
|
||||||
|
+ __VXLAN_DATA_ATTR_MAX
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
diff --git a/package/network/config/netifd/patches/0004-netifd-vxlan-add-aging-and-maxaddress-options.patch b/package/network/config/netifd/patches/0004-netifd-vxlan-add-aging-and-maxaddress-options.patch
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000000000000000000000000000000000..8a2b4424fe282492ecf64522ecf3d1b3ba106bbb
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/package/network/config/netifd/patches/0004-netifd-vxlan-add-aging-and-maxaddress-options.patch
|
||||||
|
@@ -0,0 +1,56 @@
|
||||||
|
+From 55a7b6b7f2f773c06a79cb7359ffdab54ba32450 Mon Sep 17 00:00:00 2001
|
||||||
|
+From: Johannes Kimmel <fff@bareminimum.eu>
|
||||||
|
+Date: Fri, 4 Sep 2020 04:59:43 +0200
|
||||||
|
+Subject: [PATCH 4/4] netifd: vxlan: add aging and maxaddress options
|
||||||
|
+
|
||||||
|
+For both options the values can just be passed to the kernel. All
|
||||||
|
+unsigned values are accepted, thus no range checking required.
|
||||||
|
+
|
||||||
|
+Signed-off-by: Johannes Kimmel <fff@bareminimum.eu>
|
||||||
|
+---
|
||||||
|
+ system-linux.c | 10 ++++++++++
|
||||||
|
+ system.c | 2 ++
|
||||||
|
+ system.h | 2 ++
|
||||||
|
+ 3 files changed, 14 insertions(+)
|
||||||
|
+
|
||||||
|
+--- a/system-linux.c
|
||||||
|
++++ b/system-linux.c
|
||||||
|
+@@ -3113,6 +3113,16 @@ static int system_add_vxlan(const char *
|
||||||
|
+ system_vxlan_map_bool_attr(msg, tb_data, IFLA_VXLAN_L3MISS , VXLAN_DATA_ATTR_L3MISS, false);
|
||||||
|
+ system_vxlan_map_bool_attr(msg, tb_data, IFLA_VXLAN_GBP , VXLAN_DATA_ATTR_GBP, false);
|
||||||
|
+
|
||||||
|
++ if ((cur = tb_data[VXLAN_DATA_ATTR_AGEING])) {
|
||||||
|
++ uint32_t ageing = blobmsg_get_u32(cur);
|
||||||
|
++ nla_put_u32(msg, IFLA_VXLAN_AGEING, ageing);
|
||||||
|
++ }
|
||||||
|
++
|
||||||
|
++ if ((cur = tb_data[VXLAN_DATA_ATTR_LIMIT])) {
|
||||||
|
++ uint32_t maxaddress = blobmsg_get_u32(cur);
|
||||||
|
++ nla_put_u32(msg, IFLA_VXLAN_LIMIT, maxaddress);
|
||||||
|
++ }
|
||||||
|
++
|
||||||
|
+ if ((cur = tb[TUNNEL_ATTR_TOS])) {
|
||||||
|
+ char *str = blobmsg_get_string(cur);
|
||||||
|
+ unsigned tos = 1;
|
||||||
|
+--- a/system.c
|
||||||
|
++++ b/system.c
|
||||||
|
+@@ -46,6 +46,8 @@ static const struct blobmsg_policy vxlan
|
||||||
|
+ [VXLAN_DATA_ATTR_L2MISS] = { .name = "l2miss", .type = BLOBMSG_TYPE_BOOL },
|
||||||
|
+ [VXLAN_DATA_ATTR_L3MISS] = { .name = "l3miss", .type = BLOBMSG_TYPE_BOOL },
|
||||||
|
+ [VXLAN_DATA_ATTR_GBP] = { .name = "gbp", .type = BLOBMSG_TYPE_BOOL },
|
||||||
|
++ [VXLAN_DATA_ATTR_AGEING] = { .name = "ageing", .type = BLOBMSG_TYPE_INT32 },
|
||||||
|
++ [VXLAN_DATA_ATTR_LIMIT] = { .name = "maxaddress", .type = BLOBMSG_TYPE_INT32 },
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ const struct uci_blob_param_list vxlan_data_attr_list = {
|
||||||
|
+--- a/system.h
|
||||||
|
++++ b/system.h
|
||||||
|
+@@ -51,6 +51,8 @@ enum vxlan_data {
|
||||||
|
+ VXLAN_DATA_ATTR_L2MISS,
|
||||||
|
+ VXLAN_DATA_ATTR_L3MISS,
|
||||||
|
+ VXLAN_DATA_ATTR_GBP,
|
||||||
|
++ VXLAN_DATA_ATTR_AGEING,
|
||||||
|
++ VXLAN_DATA_ATTR_LIMIT,
|
||||||
|
+ __VXLAN_DATA_ATTR_MAX
|
||||||
|
+ };
|
||||||
|
+
|
|
@ -1,25 +0,0 @@
|
||||||
From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian@blaese.de>
|
|
||||||
Date: Mon, 19 Jul 2021 21:54:29 +0200
|
|
||||||
Subject: [PATCH] ramips: add missing label-mac-device for Xiaomi Mi Router 4A
|
|
||||||
(100M)
|
|
||||||
|
|
||||||
As both the Mi Router 4A (100M) and the Mi Router 4C use the same
|
|
||||||
label-mac-device, the alias can be moved to the shared dtsi.
|
|
||||||
|
|
||||||
Signed-off-by: Fabian Bläse <fabian@blaese.de>
|
|
||||||
---
|
|
||||||
target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi
|
|
||||||
index 0f5897f5c593..d3f5e33be732 100644
|
|
||||||
--- a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi
|
|
||||||
+++ b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi
|
|
||||||
@@ -11,6 +11,7 @@
|
|
||||||
led-failsafe = &led_power_yellow;
|
|
||||||
led-running = &led_power_blue;
|
|
||||||
led-upgrade = &led_power_yellow;
|
|
||||||
+ label-mac-device = ðernet;
|
|
||||||
};
|
|
||||||
|
|
||||||
chosen {
|
|
|
@ -1,19 +0,0 @@
|
||||||
From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian@blaese.de>
|
|
||||||
Date: Sat, 23 Oct 2021 23:34:07 +0200
|
|
||||||
Subject: [PATCH] mt7621: retain old compat_version
|
|
||||||
|
|
||||||
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
|
|
||||||
index a3bc14d59d..99887e8192 100644
|
|
||||||
--- a/target/linux/ramips/image/mt7621.mk
|
|
||||||
+++ b/target/linux/ramips/image/mt7621.mk
|
|
||||||
@@ -91,8 +91,7 @@ define Build/zytrx-header
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Device/dsa-migration
|
|
||||||
- DEVICE_COMPAT_VERSION := 1.1
|
|
||||||
- DEVICE_COMPAT_MESSAGE := Config cannot be migrated from swconfig to DSA
|
|
||||||
+ DEVICE_COMPAT_VERSION := 1.0
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Device/adslr_g7
|
|
||||||
|
|
|
@ -0,0 +1,50 @@
|
||||||
|
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
|
||||||
|
Date: Fri, 16 Oct 2020 13:36:02 +0200
|
||||||
|
Subject: mt76: mt7603: allow eeprom sections starting with 7600
|
||||||
|
|
||||||
|
Fixes low signal issue for 2.4 GHz for the TP-Link Archer C50 v4.
|
||||||
|
The first two bytes in the eeprom are the chip id. The working
|
||||||
|
devices have 0x7628 there, whereas the non-working devices have
|
||||||
|
0x7600 there. This chip id gets checked by the function
|
||||||
|
mt7603_check_eeprom() which leads the driver to ignore the
|
||||||
|
contents of the eeprom partition and load default values from otp.
|
||||||
|
|
||||||
|
The has been manually added based on mt76 PR:
|
||||||
|
https://github.com/openwrt/mt76/pull/442/
|
||||||
|
|
||||||
|
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
|
||||||
|
|
||||||
|
diff --git a/package/kernel/mt76/patches/0001-fix-archer-c50-v4.patch b/package/kernel/mt76/patches/0001-fix-archer-c50-v4.patch
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000000000000000000000000000000000..29e422dc0c7f3046be0aa761bcfe8db1e298ed88
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/package/kernel/mt76/patches/0001-fix-archer-c50-v4.patch
|
||||||
|
@@ -0,0 +1,28 @@
|
||||||
|
+From b0c7f88d900d2986cd2061113201825eda6a6482 Mon Sep 17 00:00:00 2001
|
||||||
|
+From: Ron Asimi <ron.asimi@gmail.com>
|
||||||
|
+Date: Wed, 2 Sep 2020 23:18:23 -0400
|
||||||
|
+Subject: [PATCH] mt7603: allow eeprom sections starting with 7600
|
||||||
|
+
|
||||||
|
+Fixes low signal issue for 2.4 GHz for the TP-Link Archer C50 v4.
|
||||||
|
+The first two bytes in the eeprom are the chip id. The working
|
||||||
|
+devices have 0x7628 there, whereas the non-working devices have
|
||||||
|
+0x7600 there. This chip id gets checked by the function
|
||||||
|
+mt7603_check_eeprom() which leads the driver to ignore the contents
|
||||||
|
+of the eeprom partition and load default values from otp.
|
||||||
|
+
|
||||||
|
+---
|
||||||
|
+ mt7603/eeprom.c | 1 +
|
||||||
|
+ 1 file changed, 1 insertion(+)
|
||||||
|
+
|
||||||
|
+diff --git a/mt7603/eeprom.c b/mt7603/eeprom.c
|
||||||
|
+index 01f1e0da..9d5042af 100644
|
||||||
|
+--- a/mt7603/eeprom.c
|
||||||
|
++++ b/mt7603/eeprom.c
|
||||||
|
+@@ -136,6 +136,7 @@ static int mt7603_check_eeprom(struct mt76_dev *dev)
|
||||||
|
+ switch (val) {
|
||||||
|
+ case 0x7628:
|
||||||
|
+ case 0x7603:
|
||||||
|
++ case 0x7600:
|
||||||
|
+ return 0;
|
||||||
|
+ default:
|
||||||
|
+ return -EINVAL;
|
|
@ -1,132 +0,0 @@
|
||||||
From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian@blaese.de>
|
|
||||||
Date: Sat, 7 Aug 2021 00:40:34 +0200
|
|
||||||
Subject: [PATCH] Disable ipq40xx lan/wan separation
|
|
||||||
|
|
||||||
While the ipq40xx only has a single MDIO connection to the switch chip,
|
|
||||||
the ipq40xx essedma ethernet driver configures two gmac interfaces,
|
|
||||||
which are seperated into WAN and LAN ports using vlan cid at driver
|
|
||||||
level. Linux is not aware of these vlan tags.
|
|
||||||
|
|
||||||
However, this configuration does interfere with the vlan ids we use in
|
|
||||||
our firmware. Therefore, this feature is disabled by setting the default
|
|
||||||
vlan id for all gmacs to 0, changing the port mask so all physical ports
|
|
||||||
are connected to the first gmac, and reducing the amount of configured
|
|
||||||
gmacs to one. The definition of the second gmac is kept, because it is
|
|
||||||
referenced by some devices. The default configuration of the switch chip
|
|
||||||
is removed accordingly.
|
|
||||||
|
|
||||||
These changes are currently only done with the FritzBox 4040 in mind.
|
|
||||||
---
|
|
||||||
.../linux/ipq40xx/base-files/etc/board.d/01_leds | 2 +-
|
|
||||||
.../ipq40xx/base-files/etc/board.d/02_network | 3 +--
|
|
||||||
.../drivers/net/ethernet/qualcomm/essedma/edma.h | 16 ++++++++--------
|
|
||||||
.../linux/ipq40xx/files/drivers/net/phy/ar40xx.c | 2 ++
|
|
||||||
...1-dts-ipq4019-add-ethernet-essedma-node.patch | 6 +++---
|
|
||||||
5 files changed, 15 insertions(+), 14 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/target/linux/ipq40xx/base-files/etc/board.d/01_leds b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
|
|
||||||
index ac11655904..147e159ea1 100755
|
|
||||||
--- a/target/linux/ipq40xx/base-files/etc/board.d/01_leds
|
|
||||||
+++ b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
|
|
||||||
@@ -19,7 +19,7 @@ asus,rt-ac58u)
|
|
||||||
;;
|
|
||||||
avm,fritzbox-4040)
|
|
||||||
ucidef_set_led_wlan "wlan" "WLAN" "green:wlan" "phy0tpt" "phy1tpt"
|
|
||||||
- ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth1"
|
|
||||||
+ ucidef_set_led_switch "wan" "WAN" "green:wan" "switch0" "0x20"
|
|
||||||
ucidef_set_led_switch "lan" "LAN" "green:lan" "switch0" "0x1e"
|
|
||||||
;;
|
|
||||||
avm,fritzbox-7530 |\
|
|
||||||
diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
|
|
||||||
index 1d4c78833a..ea2cc60186 100755
|
|
||||||
--- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
|
|
||||||
+++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
|
|
||||||
@@ -59,9 +59,8 @@ ipq40xx_setup_interfaces()
|
|
||||||
linksys,ea6350v3|\
|
|
||||||
linksys,ea8300|\
|
|
||||||
linksys,mr8300)
|
|
||||||
- ucidef_set_interfaces_lan_wan "eth0" "eth1"
|
|
||||||
ucidef_add_switch "switch0" \
|
|
||||||
- "0u@eth0" "1:lan" "2:lan" "3:lan" "4:lan"
|
|
||||||
+ "0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
|
|
||||||
;;
|
|
||||||
avm,fritzbox-7530)
|
|
||||||
ucidef_add_switch "switch0" \
|
|
||||||
diff --git a/target/linux/ipq40xx/files/drivers/net/ethernet/qualcomm/essedma/edma.h b/target/linux/ipq40xx/files/drivers/net/ethernet/qualcomm/essedma/edma.h
|
|
||||||
index 015e5f5026..daa60639d1 100644
|
|
||||||
--- a/target/linux/ipq40xx/files/drivers/net/ethernet/qualcomm/essedma/edma.h
|
|
||||||
+++ b/target/linux/ipq40xx/files/drivers/net/ethernet/qualcomm/essedma/edma.h
|
|
||||||
@@ -57,14 +57,14 @@
|
|
||||||
#define EDMA_LAN 1
|
|
||||||
|
|
||||||
/* VLAN tag */
|
|
||||||
-#define EDMA_LAN_DEFAULT_VLAN 1
|
|
||||||
-#define EDMA_WAN_DEFAULT_VLAN 2
|
|
||||||
-
|
|
||||||
-#define EDMA_DEFAULT_GROUP1_VLAN 1
|
|
||||||
-#define EDMA_DEFAULT_GROUP2_VLAN 2
|
|
||||||
-#define EDMA_DEFAULT_GROUP3_VLAN 3
|
|
||||||
-#define EDMA_DEFAULT_GROUP4_VLAN 4
|
|
||||||
-#define EDMA_DEFAULT_GROUP5_VLAN 5
|
|
||||||
+#define EDMA_LAN_DEFAULT_VLAN 0
|
|
||||||
+#define EDMA_WAN_DEFAULT_VLAN 0
|
|
||||||
+
|
|
||||||
+#define EDMA_DEFAULT_GROUP1_VLAN 0
|
|
||||||
+#define EDMA_DEFAULT_GROUP2_VLAN 0
|
|
||||||
+#define EDMA_DEFAULT_GROUP3_VLAN 0
|
|
||||||
+#define EDMA_DEFAULT_GROUP4_VLAN 0
|
|
||||||
+#define EDMA_DEFAULT_GROUP5_VLAN 0
|
|
||||||
|
|
||||||
/* Queues exposed to linux kernel */
|
|
||||||
#define EDMA_NETDEV_TX_QUEUE 4
|
|
||||||
diff --git a/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c b/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c
|
|
||||||
index c35ba2799f..0517e4f29e 100644
|
|
||||||
--- a/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c
|
|
||||||
+++ b/target/linux/ipq40xx/files/drivers/net/phy/ar40xx.c
|
|
||||||
@@ -1481,6 +1481,7 @@ ar40xx_vlan_init(struct ar40xx_priv *priv)
|
|
||||||
unsigned long bmp;
|
|
||||||
|
|
||||||
/* By default Enable VLAN */
|
|
||||||
+ /*
|
|
||||||
priv->vlan = 1;
|
|
||||||
priv->vlan_table[AR40XX_LAN_VLAN] = priv->cpu_bmp | priv->lan_bmp;
|
|
||||||
priv->vlan_table[AR40XX_WAN_VLAN] = priv->cpu_bmp | priv->wan_bmp;
|
|
||||||
@@ -1492,6 +1493,7 @@ ar40xx_vlan_init(struct ar40xx_priv *priv)
|
|
||||||
bmp = priv->wan_bmp;
|
|
||||||
for_each_set_bit(port, &bmp, AR40XX_NUM_PORTS)
|
|
||||||
priv->pvid[port] = AR40XX_WAN_VLAN;
|
|
||||||
+ */
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
diff --git a/target/linux/ipq40xx/patches-5.4/711-dts-ipq4019-add-ethernet-essedma-node.patch b/target/linux/ipq40xx/patches-5.4/711-dts-ipq4019-add-ethernet-essedma-node.patch
|
|
||||||
index 7b2ddfe00d..1a01b08e41 100644
|
|
||||||
--- a/target/linux/ipq40xx/patches-5.4/711-dts-ipq4019-add-ethernet-essedma-node.patch
|
|
||||||
+++ b/target/linux/ipq40xx/patches-5.4/711-dts-ipq4019-add-ethernet-essedma-node.patch
|
|
||||||
@@ -36,7 +36,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
|
|
||||||
+ qcom,rx_head_buf_size = <1540>;
|
|
||||||
+ qcom,mdio_supported;
|
|
||||||
+ qcom,poll_required = <1>;
|
|
||||||
-+ qcom,num_gmac = <2>;
|
|
||||||
++ qcom,num_gmac = <1>;
|
|
||||||
+ interrupts = <0 65 IRQ_TYPE_EDGE_RISING
|
|
||||||
+ 0 66 IRQ_TYPE_EDGE_RISING
|
|
||||||
+ 0 67 IRQ_TYPE_EDGE_RISING
|
|
||||||
@@ -74,7 +74,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
|
|
||||||
+
|
|
||||||
+ gmac0: gmac0 {
|
|
||||||
+ local-mac-address = [00 00 00 00 00 00];
|
|
||||||
-+ vlan_tag = <1 0x1f>;
|
|
||||||
++ vlan_tag = <0 0x3f>;
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ gmac1: gmac1 {
|
|
||||||
@@ -83,7 +83,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
|
|
||||||
+ qcom,poll_required = <1>;
|
|
||||||
+ qcom,forced_speed = <1000>;
|
|
||||||
+ qcom,forced_duplex = <1>;
|
|
||||||
-+ vlan_tag = <2 0x20>;
|
|
||||||
++ vlan_tag = <0 0x00>;
|
|
||||||
+ };
|
|
||||||
+ };
|
|
||||||
+
|
|
76
buildscript
76
buildscript
|
@ -1,15 +1,22 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
|
|
||||||
set -e
|
# This program is free software; you can redistribute it and/or modify
|
||||||
set -o pipefail
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation; either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
|
||||||
builddir=./build
|
builddir=./build
|
||||||
|
|
||||||
# OpenWrt: package hashes correspond to core repo version
|
# OpenWrt: openwrt-19.07.5
|
||||||
OPENWRTREV="v21.02.1"
|
OPENWRTREV="v19.07.6"
|
||||||
PACKAGEREV="ded142471e36831d2af63c7fe5062c4367f8ccd2"
|
PACKAGEREV="ce5a4eaea218111350e05ea86de8171344a70ce4"
|
||||||
ROUTINGREV="9e7698f20d1edf8f912fbce2f21400f3cc772b31"
|
ROUTINGREV="02b4dbfcb7b8f8b566940847d22d5a6f229d2e66"
|
||||||
|
|
||||||
# Gluon packages: master from 2020-02-04
|
# Gluon packages: master from 2020-02-04
|
||||||
GLUONREV="12e41d0ff07ec54bbd67a31ab50d12ca04f2238c"
|
GLUONREV="12e41d0ff07ec54bbd67a31ab50d12ca04f2238c"
|
||||||
|
@ -18,15 +25,13 @@ OPENWRT_PKGS="gpioctl-sysfs libugpio fastd haserl micrond mtr bmon"
|
||||||
ROUTING_PKGS="kmod-batman-adv batctl alfred babeld"
|
ROUTING_PKGS="kmod-batman-adv batctl alfred babeld"
|
||||||
GLUON_PKGS="simple-tc uradvd"
|
GLUON_PKGS="simple-tc uradvd"
|
||||||
|
|
||||||
FFF_VARIANTS="node layer3"
|
OPENWRTURL="https://git.openwrt.org/openwrt/openwrt.git"
|
||||||
|
|
||||||
OPENWRTURL="https://git.freifunk-franken.de/mirror/openwrt.git"
|
|
||||||
|
|
||||||
## Feed definition [0]: name aka directory, [1]: url, [2]: revision
|
## Feed definition [0]: name aka directory, [1]: url, [2]: revision
|
||||||
|
|
||||||
#official openwrt packages
|
#official openwrt packages
|
||||||
OPENWRT=(openwrt
|
OPENWRT=(openwrt
|
||||||
https://git.freifunk-franken.de/mirror/openwrt-packages.git
|
https://git.openwrt.org/feed/packages.git
|
||||||
$PACKAGEREV)
|
$PACKAGEREV)
|
||||||
|
|
||||||
#gluon packages
|
#gluon packages
|
||||||
|
@ -36,7 +41,7 @@ GLUON=(gluon
|
||||||
|
|
||||||
#official openwrt routing packages
|
#official openwrt routing packages
|
||||||
ROUTING=(routing
|
ROUTING=(routing
|
||||||
https://git.freifunk-franken.de/mirror/openwrt-routing.git
|
https://git.openwrt.org/feed/routing.git
|
||||||
$ROUTINGREV)
|
$ROUTINGREV)
|
||||||
|
|
||||||
FFF=(fff)
|
FFF=(fff)
|
||||||
|
@ -57,12 +62,9 @@ checkout_git(){
|
||||||
if [ -d "$DIRECTORY" ]; then
|
if [ -d "$DIRECTORY" ]; then
|
||||||
if $MYGIT remote -v | grep -q "$REPO_URL" ; then
|
if $MYGIT remote -v | grep -q "$REPO_URL" ; then
|
||||||
echo "Right remote detected"
|
echo "Right remote detected"
|
||||||
# Remove untracked files
|
if ! $MYGIT checkout "$COMMITID" ; then
|
||||||
$MYGIT clean -f -d
|
|
||||||
# Select desired commit and remove local changes (-f)
|
|
||||||
if ! $MYGIT checkout -f "$COMMITID" ; then
|
|
||||||
echo "commitid not found trying to fetch new commits"
|
echo "commitid not found trying to fetch new commits"
|
||||||
$MYGIT fetch --all && $MYGIT checkout "$COMMITID"
|
$MYGIT pull && $MYGIT checkout "$COMMITID"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "wrong remote or not an git repo at all -> deleting whole directory"
|
echo "wrong remote or not an git repo at all -> deleting whole directory"
|
||||||
|
@ -80,11 +82,14 @@ checkout_git(){
|
||||||
}
|
}
|
||||||
|
|
||||||
get_source() {
|
get_source() {
|
||||||
#Get the OpenWrt main repo
|
test -d src || mkdir src
|
||||||
checkout_git $builddir $OPENWRTURL $OPENWRTREV
|
cd src
|
||||||
|
|
||||||
test -d src/packages || mkdir -p src/packages
|
#Get the OpenWrt Core Source for Firmware
|
||||||
cd src/packages
|
checkout_git openwrt $OPENWRTURL $OPENWRTREV
|
||||||
|
|
||||||
|
test -d packages || mkdir packages
|
||||||
|
cd packages
|
||||||
|
|
||||||
#checkout needed package feeds
|
#checkout needed package feeds
|
||||||
for FEEDVAR in "${FEEDS[@]}" ; do
|
for FEEDVAR in "${FEEDS[@]}" ; do
|
||||||
|
@ -124,18 +129,27 @@ patch_target() {
|
||||||
prepare() {
|
prepare() {
|
||||||
get_source
|
get_source
|
||||||
|
|
||||||
|
test -d $builddir || mkdir $builddir
|
||||||
|
|
||||||
|
/bin/rm -rf "$builddir"
|
||||||
|
cp -a src/openwrt "$builddir"
|
||||||
|
|
||||||
patch_target
|
patch_target
|
||||||
|
|
||||||
# apply variant to ensure the included file "variant.mk"
|
# apply variant to ensure the included file "variant.mk"
|
||||||
# exists in builddir.
|
# exists in builddir.
|
||||||
apply_variant
|
apply_variant
|
||||||
|
|
||||||
|
#saves ~200MB for each build
|
||||||
|
test -d ./src/dl || mkdir ./src/dl
|
||||||
|
ln -s ../src/dl "$builddir"/dl
|
||||||
|
|
||||||
update_feeds
|
update_feeds
|
||||||
}
|
}
|
||||||
|
|
||||||
apply_variant() {
|
apply_variant() {
|
||||||
# set the variant for this build
|
# set the variant for this build
|
||||||
export FFF_VARIANT=$(cat selected_variant)
|
cp "./src/packages/fff/fff/variant-$(cat selected_variant).mk" "$builddir"/variant.mk
|
||||||
# force the reevaluation of this Makefile to make note of the new variant
|
# force the reevaluation of this Makefile to make note of the new variant
|
||||||
touch ./src/packages/fff/fff/Makefile
|
touch ./src/packages/fff/fff/Makefile
|
||||||
}
|
}
|
||||||
|
@ -183,6 +197,13 @@ prebuild() {
|
||||||
cp -r ./bsp/default/root_file_system/* "$builddir"/files/
|
cp -r ./bsp/default/root_file_system/* "$builddir"/files/
|
||||||
cp ./bsp/"$machine"/.config "$builddir"/.config
|
cp ./bsp/"$machine"/.config "$builddir"/.config
|
||||||
|
|
||||||
|
while IFS= read -r -d '' template
|
||||||
|
do
|
||||||
|
echo "Translating $template .."
|
||||||
|
$tpl_translate "$template" > "$(dirname "$template")"/"$(basename "$template" .tpl)"
|
||||||
|
/bin/rm "$template"
|
||||||
|
done < <(find "${builddir}/files" -name '*.tpl' -print0)
|
||||||
|
|
||||||
#insert actual firware version informations into release file
|
#insert actual firware version informations into release file
|
||||||
variant=$(cat selected_variant)
|
variant=$(cat selected_variant)
|
||||||
version=$(git describe --tags --dirty)
|
version=$(git describe --tags --dirty)
|
||||||
|
@ -316,7 +337,7 @@ buildrelease() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cd bin/$variant
|
cd bin/$variant
|
||||||
for binary in *.bin *.img *.tar; do
|
for binary in *.bin; do
|
||||||
md5sum "$binary" > ./"$binary".md5
|
md5sum "$binary" > ./"$binary".md5
|
||||||
sha256sum "$binary" > ./"$binary".sha256
|
sha256sum "$binary" > ./"$binary".sha256
|
||||||
done
|
done
|
||||||
|
@ -325,7 +346,7 @@ buildrelease() {
|
||||||
}
|
}
|
||||||
|
|
||||||
clean() {
|
clean() {
|
||||||
/bin/rm -rf bin $builddir
|
/bin/rm -rf bin $builddir src/openwrt
|
||||||
|
|
||||||
# remove downloaded package feeds
|
# remove downloaded package feeds
|
||||||
for FEEDVAR in "${FEEDS[@]}" ; do
|
for FEEDVAR in "${FEEDS[@]}" ; do
|
||||||
|
@ -420,13 +441,14 @@ case "$1" in
|
||||||
;;
|
;;
|
||||||
"selectvariant")
|
"selectvariant")
|
||||||
if [ "$2" = "help" ] || [ "$2" = "" ]; then
|
if [ "$2" = "help" ] || [ "$2" = "" ]; then
|
||||||
echo "Select a build variant:"
|
echo "Select a build varaint:"
|
||||||
echo
|
echo
|
||||||
echo "Usage: $0 $1 <name of variant>"
|
echo "Usage: $0 $1 <name of variant>"
|
||||||
echo "available variants: $FFF_VARIANTS"
|
echo "available variants: "
|
||||||
|
/bin/ls src/packages/fff/fff/variant-*.mk | sed 's#.*/variant-\(.*\)\.mk#\1#g'
|
||||||
echo
|
echo
|
||||||
else
|
else
|
||||||
if ! echo "$FFF_VARIANTS" | grep -q "\b$2\b"; then
|
if [ ! -f "src/packages/fff/fff/variant-$2.mk" ]; then
|
||||||
echo "Could not find variant $2"
|
echo "Could not find variant $2"
|
||||||
else
|
else
|
||||||
setVariant $2
|
setVariant $2
|
||||||
|
|
|
@ -1,10 +1,16 @@
|
||||||
|
From 8e7de199282ba76a94a1b4370ac7712325b81fc2 Mon Sep 17 00:00:00 2001
|
||||||
From: Robert Langhammer <rlanghammer@web.de>
|
From: Robert Langhammer <rlanghammer@web.de>
|
||||||
Date: Mon, 13 Nov 2017 21:04:55 +0100
|
Date: Mon, 13 Nov 2017 21:04:55 +0100
|
||||||
Subject: fastd_generate_key_from_urandom
|
Subject: [PATCH] fastd_generate_key_from_urandom
|
||||||
|
|
||||||
|
---
|
||||||
|
net/fastd/patches/001-generate_key_from_urandom.patch | 14 ++++++++++++++
|
||||||
|
1 file changed, 14 insertions(+)
|
||||||
|
create mode 100644 net/fastd/patches/001-generate_key_from_urandom.patch
|
||||||
|
|
||||||
diff --git a/net/fastd/patches/001-generate_key_from_urandom.patch b/net/fastd/patches/001-generate_key_from_urandom.patch
|
diff --git a/net/fastd/patches/001-generate_key_from_urandom.patch b/net/fastd/patches/001-generate_key_from_urandom.patch
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000000000000000000000000000000000000..e06739a1e715ab310d9b30ae704f615572d6b4b9
|
index 000000000..e06739a1e
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/net/fastd/patches/001-generate_key_from_urandom.patch
|
+++ b/net/fastd/patches/001-generate_key_from_urandom.patch
|
||||||
@@ -0,0 +1,14 @@
|
@@ -0,0 +1,14 @@
|
||||||
|
@ -22,3 +28,6 @@ index 0000000000000000000000000000000000000000..e06739a1e715ab310d9b30ae704f6155
|
||||||
+ ecc_25519_gf_sanitize_secret(&secret_key, &secret_key);
|
+ ecc_25519_gf_sanitize_secret(&secret_key, &secret_key);
|
||||||
+
|
+
|
||||||
+ ecc_25519_work_t work;
|
+ ecc_25519_work_t work;
|
||||||
|
--
|
||||||
|
2.25.1
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,44 @@
|
||||||
|
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
|
||||||
|
Date: Wed, 22 Apr 2020 16:57:34 +0200
|
||||||
|
Subject: micrond: show stdout and stderr in log
|
||||||
|
|
||||||
|
So far, all output created by scripts run with micrond has been
|
||||||
|
discarded. Since there is no reason for that and it also does not
|
||||||
|
match the expected behavior, this enables both stdout and stderr
|
||||||
|
output for the service.
|
||||||
|
|
||||||
|
If not desired, a user can still use >/dev/null or similar in his/her
|
||||||
|
micrond jobs to disable output easily and similar to what it would be
|
||||||
|
on other systems.
|
||||||
|
|
||||||
|
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
|
||||||
|
---
|
||||||
|
utils/micrond/Makefile | 2 +-
|
||||||
|
utils/micrond/files/etc/init.d/micrond | 2 ++
|
||||||
|
2 files changed, 3 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/utils/micrond/Makefile b/utils/micrond/Makefile
|
||||||
|
index ba063b674..c979025bb 100644
|
||||||
|
--- a/utils/micrond/Makefile
|
||||||
|
+++ b/utils/micrond/Makefile
|
||||||
|
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
|
PKG_NAME:=micrond
|
||||||
|
PKG_VERSION:=1
|
||||||
|
-PKG_RELEASE:=1
|
||||||
|
+PKG_RELEASE:=2
|
||||||
|
PKG_LICENSE:=BSD-2-clause
|
||||||
|
|
||||||
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
diff --git a/utils/micrond/files/etc/init.d/micrond b/utils/micrond/files/etc/init.d/micrond
|
||||||
|
index 1eef2ef52..35a3b9e70 100755
|
||||||
|
--- a/utils/micrond/files/etc/init.d/micrond
|
||||||
|
+++ b/utils/micrond/files/etc/init.d/micrond
|
||||||
|
@@ -9,5 +9,7 @@ start_service() {
|
||||||
|
procd_open_instance
|
||||||
|
procd_set_param command /usr/sbin/micrond "$CRONDIR"
|
||||||
|
procd_set_param respawn
|
||||||
|
+ procd_set_param stdout 1
|
||||||
|
+ procd_set_param stderr 1
|
||||||
|
procd_close_instance
|
||||||
|
}
|
|
@ -0,0 +1,46 @@
|
||||||
|
From f8c90adf89a45d9cfd5e189f28d0250e06710764 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian@blaese.de>
|
||||||
|
Date: Wed, 11 Jul 2018 13:39:06 +0200
|
||||||
|
Subject: [PATCH] Add batman-adv patch to remove gw mode switch message
|
||||||
|
|
||||||
|
Signed-off-by: Fabian Bläse <fabian@blaese.de>
|
||||||
|
---
|
||||||
|
.../0000-Remove-gw-mode-switch-message.patch | 26 +++++++++++++++++++
|
||||||
|
1 file changed, 26 insertions(+)
|
||||||
|
create mode 100644 batman-adv/patches/0000-Remove-gw-mode-switch-message.patch
|
||||||
|
|
||||||
|
diff --git a/batman-adv/patches/0000-Remove-gw-mode-switch-message.patch b/batman-adv/patches/0000-Remove-gw-mode-switch-message.patch
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..fb49d6c
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/batman-adv/patches/0000-Remove-gw-mode-switch-message.patch
|
||||||
|
@@ -0,0 +1,26 @@
|
||||||
|
+From 5a99aa98460605dcc649c43b85ae87e36d326cdf Mon Sep 17 00:00:00 2001
|
||||||
|
+From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian@blaese.de>
|
||||||
|
+Date: Wed, 11 Jul 2018 13:37:08 +0200
|
||||||
|
+Subject: [PATCH] Remove gw mode switch message
|
||||||
|
+
|
||||||
|
+Signed-off-by: Fabian Bläse <fabian@blaese.de>
|
||||||
|
+---
|
||||||
|
+ net/batman-adv/sysfs.c | 3 ---
|
||||||
|
+ 1 file changed, 3 deletions(-)
|
||||||
|
+
|
||||||
|
+diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c
|
||||||
|
+index f2eef43b..dc529d50 100644
|
||||||
|
+--- a/net/batman-adv/sysfs.c
|
||||||
|
++++ b/net/batman-adv/sysfs.c
|
||||||
|
+@@ -508,9 +508,6 @@ static ssize_t batadv_store_gw_mode(struct kobject *kobj,
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+- batadv_info(net_dev, "Changing gw mode from: %s to: %s\n",
|
||||||
|
+- curr_gw_mode_str, buff);
|
||||||
|
+-
|
||||||
|
+ /* Invoking batadv_gw_reselect() is not enough to really de-select the
|
||||||
|
+ * current GW. It will only instruct the gateway client code to perform
|
||||||
|
+ * a re-election the next time that this is needed.
|
||||||
|
+--
|
||||||
|
+2.18.0
|
||||||
|
--
|
||||||
|
2.25.1
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
|
From f114914490740247f2b6ca705f0f7055db9681ab Mon Sep 17 00:00:00 2001
|
||||||
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
|
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
|
||||||
Date: Mon, 30 Sep 2019 17:09:10 +0200
|
Date: Mon, 30 Sep 2019 17:09:10 +0200
|
||||||
Subject: babeld: Include PKG_RELEASE in babeld version
|
Subject: [PATCH 1/2] babeld: Include PKG_RELEASE in babeld version
|
||||||
|
|
||||||
This will account for custom patches added, as otherwise version
|
This will account for custom patches added, as otherwise version
|
||||||
would stay the same.
|
would stay the same.
|
||||||
|
@ -8,14 +9,17 @@ would stay the same.
|
||||||
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
|
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
|
||||||
[fabian@blaese.de: revise version string]
|
[fabian@blaese.de: revise version string]
|
||||||
Signed-off-by: Fabian Bläse <fabian@blaese.de>
|
Signed-off-by: Fabian Bläse <fabian@blaese.de>
|
||||||
|
---
|
||||||
|
babeld/Makefile | 5 +++++
|
||||||
|
1 file changed, 5 insertions(+)
|
||||||
|
|
||||||
diff --git a/babeld/Makefile b/babeld/Makefile
|
diff --git a/babeld/Makefile b/babeld/Makefile
|
||||||
index 056ce43d5ddb461ba94e51a5b18ffac0ef971468..16cc86fe5c2ae8731b0d7d2f64517e9b92d029f9 100644
|
index 022d0b8..78fdf83 100644
|
||||||
--- a/babeld/Makefile
|
--- a/babeld/Makefile
|
||||||
+++ b/babeld/Makefile
|
+++ b/babeld/Makefile
|
||||||
@@ -50,6 +50,11 @@ MAKE_FLAGS+= \
|
@@ -48,6 +48,11 @@ MAKE_FLAGS+= \
|
||||||
|
CFLAGS="$(TARGET_CFLAGS)" \
|
||||||
LDLIBS="" \
|
LDLIBS="" \
|
||||||
LDLIBS+="-lubus -lubox"
|
|
||||||
|
|
||||||
+define Build/Configure
|
+define Build/Configure
|
||||||
+ echo "babeld-$(PKG_VERSION)+fff$(PKG_RELEASE)" > $(PKG_BUILD_DIR)/version
|
+ echo "babeld-$(PKG_VERSION)+fff$(PKG_RELEASE)" > $(PKG_BUILD_DIR)/version
|
||||||
|
@ -25,3 +29,6 @@ index 056ce43d5ddb461ba94e51a5b18ffac0ef971468..16cc86fe5c2ae8731b0d7d2f64517e9b
|
||||||
define Package/babeld/install
|
define Package/babeld/install
|
||||||
$(INSTALL_DIR) $(1)/usr/sbin
|
$(INSTALL_DIR) $(1)/usr/sbin
|
||||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/babeld $(1)/usr/sbin/
|
$(INSTALL_BIN) $(PKG_BUILD_DIR)/babeld $(1)/usr/sbin/
|
||||||
|
--
|
||||||
|
2.25.1
|
||||||
|
|
|
@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk
|
||||||
PKG_NAME:=alfred-json
|
PKG_NAME:=alfred-json
|
||||||
PKG_VERSION:=0.3.1
|
PKG_VERSION:=0.3.1
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
PKG_LICENSE:=GPL-2.0-only
|
PKG_LICENSE:=GPL-2.0
|
||||||
PKG_SOURCE_PROTO:=git
|
PKG_SOURCE_PROTO:=git
|
||||||
PKG_SOURCE_VERSION:=e4cacfc791092389f63c36a435d3f1d069f8a13e
|
PKG_SOURCE_VERSION:=e4cacfc791092389f63c36a435d3f1d069f8a13e
|
||||||
PKG_SOURCE_URL:=https://github.com/FreifunkFranken/alfred-json.git
|
PKG_SOURCE_URL:=https://github.com/FreifunkFranken/alfred-json.git
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=fff-alfred-monitoring-proxy
|
PKG_NAME:=fff-alfred-monitoring-proxy
|
||||||
PKG_RELEASE:=5
|
PKG_RELEASE:=4
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@ define Package/fff-alfred-monitoring-proxy
|
||||||
SECTION:=base
|
SECTION:=base
|
||||||
CATEGORY:=Freifunk
|
CATEGORY:=Freifunk
|
||||||
TITLE:=Freifunk-Franken Alfred-Monitoring-Proxy
|
TITLE:=Freifunk-Franken Alfred-Monitoring-Proxy
|
||||||
URL:=https://www.freifunk-franken.de
|
URL:=https://www.freifunk-franken.de/
|
||||||
DEPENDS:=+curl +micrond +alfred-json +fff-alfred +fff-random
|
DEPENDS:=+curl +micrond +alfred-json +fff-alfred +fff-random
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
ebtables -P MULTICAST_OUT RETURN
|
|
@ -9,7 +9,7 @@ define Package/$(PKG_NAME)
|
||||||
SECTION:=base
|
SECTION:=base
|
||||||
CATEGORY:=Freifunk
|
CATEGORY:=Freifunk
|
||||||
TITLE:=Freifunk-Franken Alfred
|
TITLE:=Freifunk-Franken Alfred
|
||||||
URL:=https://www.freifunk-franken.de
|
URL:=http://www.freifunk-franken.de
|
||||||
DEPENDS:=+alfred
|
DEPENDS:=+alfred
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=fff-babeld
|
PKG_NAME:=fff-babeld
|
||||||
PKG_RELEASE:=8
|
PKG_RELEASE:=6
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@ define Package/fff-babeld
|
||||||
SECTION:=base
|
SECTION:=base
|
||||||
CATEGORY:=Freifunk
|
CATEGORY:=Freifunk
|
||||||
TITLE:=Freifunk-Franken babeld configuration example
|
TITLE:=Freifunk-Franken babeld configuration example
|
||||||
URL:=https://www.freifunk-franken.de
|
URL:=http://www.freifunk-franken.de
|
||||||
DEPENDS:=+babeld
|
DEPENDS:=+babeld
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
config general
|
config general
|
||||||
option export_table '10'
|
option export_table '10'
|
||||||
option import_table '10'
|
option import_table '10'
|
||||||
|
option first_table_number '100'
|
||||||
option local_port '33123'
|
option local_port '33123'
|
||||||
|
|
||||||
config interface
|
config interface
|
||||||
|
@ -21,11 +22,6 @@ config filter
|
||||||
option local 'true'
|
option local 'true'
|
||||||
option ip 'fd43:5602:29bd::/48'
|
option ip 'fd43:5602:29bd::/48'
|
||||||
|
|
||||||
config filter
|
|
||||||
option type 'redistribute'
|
|
||||||
option local 'true'
|
|
||||||
option if 'lo'
|
|
||||||
|
|
||||||
config filter
|
config filter
|
||||||
option type 'redistribute'
|
option type 'redistribute'
|
||||||
option local 'true'
|
option local 'true'
|
||||||
|
|
|
@ -37,6 +37,11 @@ uci batch <<EOF
|
||||||
set network.@rule6[2].in='client'
|
set network.@rule6[2].in='client'
|
||||||
set network.@rule6[2].lookup='10'
|
set network.@rule6[2].lookup='10'
|
||||||
set network.@rule6[2].priority='31'
|
set network.@rule6[2].priority='31'
|
||||||
|
add network rule6
|
||||||
|
set network.@rule6[3]=rule6
|
||||||
|
set network.@rule6[3].src='::/0'
|
||||||
|
set network.@rule6[3].lookup='10'
|
||||||
|
set network.@rule6[3].priority='32000'
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
uci commit network
|
uci commit network
|
||||||
|
|
|
@ -36,14 +36,11 @@ babel_add_peeraddr() {
|
||||||
|
|
||||||
if peer_ip=$(uci -q get gateway.@gateway[0].peer_ip); then
|
if peer_ip=$(uci -q get gateway.@gateway[0].peer_ip); then
|
||||||
uci add_list "$option"="$peer_ip"
|
uci add_list "$option"="$peer_ip"
|
||||||
elif router_ip=$(uci -q get gateway.meta.router_ip); then
|
|
||||||
# use router_ip if no peer_ip is set
|
|
||||||
uci add_list "$option"="$router_ip"
|
|
||||||
elif ipaddr=$(uci -q get gateway.@client[0].ipaddr); then
|
elif ipaddr=$(uci -q get gateway.@client[0].ipaddr); then
|
||||||
# use client interface address (without subnet) if no router_ip is set
|
# use ipaddr (without subnet) if no peer_ip set
|
||||||
uci add_list "$option"=$(echo $ipaddr | cut -d / -f1)
|
uci add_list "$option"=$(echo $ipaddr | cut -d / -f1)
|
||||||
else
|
else
|
||||||
echo "WARNING: No peer_ip, router_ip or client interface ipaddr set! IPv4 routing is not possible."
|
echo "WARNING: Neither peer_ip nor ipaddr set! IPv4 routing is not possible."
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ define Package/$(PKG_NAME)
|
||||||
SECTION:=base
|
SECTION:=base
|
||||||
CATEGORY:=Freifunk
|
CATEGORY:=Freifunk
|
||||||
TITLE:=Freifunk-Franken batman-adv
|
TITLE:=Freifunk-Franken batman-adv
|
||||||
URL:=https://www.freifunk-franken.de
|
URL:=http://www.freifunk-franken.de
|
||||||
DEPENDS:=+kmod-batman-adv \
|
DEPENDS:=+kmod-batman-adv \
|
||||||
+@BATMAN_ADV_BATMAN_V \
|
+@BATMAN_ADV_BATMAN_V \
|
||||||
+@BATMAN_ADV_NC \
|
+@BATMAN_ADV_NC \
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# SPDX-License-Identifier: GPL-3.0-only
|
|
||||||
#
|
|
||||||
# Netmon Nodewatcher (C) 2010-2012 Freifunk Oldenburg
|
# Netmon Nodewatcher (C) 2010-2012 Freifunk Oldenburg
|
||||||
|
# License; GPL v3
|
||||||
|
|
||||||
debug() {
|
debug() {
|
||||||
(>&2 echo "nodewatcher: $1")
|
(>&2 echo "nodewatcher: $1")
|
||||||
|
|
|
@ -9,7 +9,7 @@ define Package/$(PKG_NAME)
|
||||||
SECTION:=base
|
SECTION:=base
|
||||||
CATEGORY:=Freifunk
|
CATEGORY:=Freifunk
|
||||||
TITLE:=Freifunk-Franken boardname
|
TITLE:=Freifunk-Franken boardname
|
||||||
URL:=https://www.freifunk-franken.de
|
URL:=http://www.freifunk-franken.de
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/$(PKG_NAME)/description
|
define Package/$(PKG_NAME)/description
|
||||||
|
|
|
@ -9,7 +9,7 @@ define Package/$(PKG_NAME)
|
||||||
SECTION:=base
|
SECTION:=base
|
||||||
CATEGORY:=Freifunk
|
CATEGORY:=Freifunk
|
||||||
TITLE:=Freifunk-Franken Config
|
TITLE:=Freifunk-Franken Config
|
||||||
URL:=https://www.freifunk-franken.de
|
URL:=http://www.freifunk-franken.de
|
||||||
DEPENDS:=+fff-boardname
|
DEPENDS:=+fff-boardname
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
# SPDX-License-Identifier: GPL-3.0-only
|
|
||||||
#
|
|
||||||
# Copyright 2017 Adrian Schmutzler
|
# Copyright 2017 Adrian Schmutzler
|
||||||
|
# License GPLv3
|
||||||
|
|
||||||
touch /etc/config/fff
|
touch /etc/config/fff
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=fff-dhcp
|
PKG_NAME:=fff-dhcp
|
||||||
PKG_RELEASE:=6
|
PKG_RELEASE:=4
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@ define Package/fff-dhcp
|
||||||
SECTION:=base
|
SECTION:=base
|
||||||
CATEGORY:=Freifunk
|
CATEGORY:=Freifunk
|
||||||
TITLE:=Freifunk-Franken dhcp
|
TITLE:=Freifunk-Franken dhcp
|
||||||
URL:=https://www.freifunk-franken.de
|
URL:=http://www.freifunk-franken.de
|
||||||
DEPENDS:=+dnsmasq
|
DEPENDS:=+dnsmasq
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
|
|
@ -8,10 +8,7 @@ configure() {
|
||||||
uci add_list dhcp.@dnsmasq[0].server="/ip6.arpa/$f"
|
uci add_list dhcp.@dnsmasq[0].server="/ip6.arpa/$f"
|
||||||
done
|
done
|
||||||
else
|
else
|
||||||
echo "WARNING: No DNS servers set! Using default server fd43:5602:29bd:ffff:1:1:1:1"
|
echo "WARNING: No DNS servers set!"
|
||||||
uci add_list dhcp.@dnsmasq[0].server="fd43:5602:29bd:ffff:1:1:1:1"
|
|
||||||
uci add_list dhcp.@dnsmasq[0].server="/in-addr.arpa/fd43:5602:29bd:ffff:1:1:1:1"
|
|
||||||
uci add_list dhcp.@dnsmasq[0].server="/ip6.arpa/fd43:5602:29bd:ffff:1:1:1:1"
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,22 +1,28 @@
|
||||||
uci batch >/dev/null <<EOF
|
uci batch <<EOF
|
||||||
delete dhcp.@dnsmasq[0]
|
delete dhcp.@dnsmasq[0]
|
||||||
delete dhcp.lan
|
delete dhcp.lan
|
||||||
delete dhcp.wan
|
delete dhcp.wan
|
||||||
add dhcp dnsmasq
|
add dhcp dnsmasq
|
||||||
set dhcp.@dnsmasq[-1].domainneeded='0'
|
set dhcp.@dnsmasq[0].domainneeded='0'
|
||||||
set dhcp.@dnsmasq[-1].boguspriv='0'
|
set dhcp.@dnsmasq[0].boguspriv='0'
|
||||||
set dhcp.@dnsmasq[-1].filterwin2k='0'
|
set dhcp.@dnsmasq[0].filterwin2k='0'
|
||||||
set dhcp.@dnsmasq[-1].localise_queries='0'
|
set dhcp.@dnsmasq[0].localise_queries='0'
|
||||||
set dhcp.@dnsmasq[-1].rebind_protection='0'
|
set dhcp.@dnsmasq[0].rebind_protection='0'
|
||||||
set dhcp.@dnsmasq[-1].rebind_localhost='1'
|
set dhcp.@dnsmasq[0].rebind_localhost='1'
|
||||||
set dhcp.@dnsmasq[-1].domain='fff.community'
|
set dhcp.@dnsmasq[0].domain='fff.community'
|
||||||
set dhcp.@dnsmasq[-1].expandhosts='0'
|
set dhcp.@dnsmasq[0].expandhosts='0'
|
||||||
set dhcp.@dnsmasq[-1].nonegcache='0'
|
set dhcp.@dnsmasq[0].nonegcache='0'
|
||||||
set dhcp.@dnsmasq[-1].authoritative='1'
|
set dhcp.@dnsmasq[0].authoritative='1'
|
||||||
set dhcp.@dnsmasq[-1].readethers='1'
|
set dhcp.@dnsmasq[0].readethers='1'
|
||||||
set dhcp.@dnsmasq[-1].leasefile='/tmp/dhcp.leases'
|
set dhcp.@dnsmasq[0].leasefile='/tmp/dhcp.leases'
|
||||||
set dhcp.@dnsmasq[-1].noresolv='1'
|
set dhcp.@dnsmasq[0].noresolv='1'
|
||||||
set dhcp.@dnsmasq[-1].localservice='1'
|
set dhcp.@dnsmasq[0].localservice='1'
|
||||||
|
add_list dhcp.@dnsmasq[0].server='10.50.252.11'
|
||||||
|
add_list dhcp.@dnsmasq[0].server='10.50.252.0'
|
||||||
|
add_list dhcp.@dnsmasq[0].server='/in-addr.arpa/10.50.252.11'
|
||||||
|
add_list dhcp.@dnsmasq[0].server='/in-addr.arpa/10.50.252.0'
|
||||||
|
add_list dhcp.@dnsmasq[0].server='/ip6.arpa/10.50.252.11'
|
||||||
|
add_list dhcp.@dnsmasq[0].server='/ip6.arpa/10.50.252.0'
|
||||||
|
|
||||||
set dhcp.client=dhcp
|
set dhcp.client=dhcp
|
||||||
set dhcp.client.interface='client'
|
set dhcp.client.interface='client'
|
||||||
|
|
|
@ -9,7 +9,7 @@ define Package/$(PKG_NAME)
|
||||||
SECTION:=base
|
SECTION:=base
|
||||||
CATEGORY:=Freifunk
|
CATEGORY:=Freifunk
|
||||||
TITLE:=Freifunk-Franken fastd configuration script
|
TITLE:=Freifunk-Franken fastd configuration script
|
||||||
URL:=https://www.freifunk-franken.de
|
URL:=http://www.freifunk-franken.de
|
||||||
DEPENDS:=+@BUSYBOX_CUSTOM \
|
DEPENDS:=+@BUSYBOX_CUSTOM \
|
||||||
+@FASTD_ENABLE_METHOD_NULL \
|
+@FASTD_ENABLE_METHOD_NULL \
|
||||||
+@FASTD_ENABLE_CIPHER_NULL \
|
+@FASTD_ENABLE_CIPHER_NULL \
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=fff-firewall
|
PKG_NAME:=fff-firewall
|
||||||
PKG_RELEASE:=8
|
PKG_RELEASE:=6
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@ define Package/$(PKG_NAME)
|
||||||
SECTION:=base
|
SECTION:=base
|
||||||
CATEGORY:=Freifunk
|
CATEGORY:=Freifunk
|
||||||
TITLE:=Freifunk-Franken firewall
|
TITLE:=Freifunk-Franken firewall
|
||||||
URL:=https://www.freifunk-franken.de
|
URL:=http://www.freifunk-franken.de
|
||||||
DEPENDS:=+arptables \
|
DEPENDS:=+arptables \
|
||||||
+ebtables +ebtables-utils \
|
+ebtables +ebtables-utils \
|
||||||
+kmod-ebtables-ipv4 +kmod-ebtables-ipv6 \
|
+kmod-ebtables-ipv4 +kmod-ebtables-ipv6 \
|
||||||
|
|
|
@ -2,5 +2,10 @@
|
||||||
ebtables -F
|
ebtables -F
|
||||||
ebtables -X
|
ebtables -X
|
||||||
|
|
||||||
iptables-save | awk '/^[*]/ { print $1 } /^:[A-Z]+ [^-]/ { print $1 " ACCEPT" ; } /COMMIT/ { print $0; }' | iptables-restore
|
iptables -F
|
||||||
ip6tables-save | awk '/^[*]/ { print $1 } /^:[A-Z]+ [^-]/ { print $1 " ACCEPT" ; } /COMMIT/ { print $0; }' | ip6tables-restore
|
iptables -X
|
||||||
|
|
||||||
|
iptables -t nat -F
|
||||||
|
|
||||||
|
ip6tables -F
|
||||||
|
ip6tables -X
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
# Limit ssh to 6 new connections per 60 seconds
|
# Limit ssh to 6 new connections per 60 seconds
|
||||||
/usr/sbin/ip6tables -A INPUT -p tcp --dport 22 -m conntrack --ctstate NEW -m recent --set --name dropbear
|
/usr/sbin/ip6tables -A INPUT -p tcp --dport 22 -m conntrack --ctstate NEW -m recent --set --name dropbear
|
||||||
/usr/sbin/ip6tables -A INPUT -p tcp --dport 22 -m conntrack --ctstate NEW -m recent --update --seconds 60 --hitcount 6 --rttl --name dropbear -j DROP
|
/usr/sbin/ip6tables -A INPUT -p tcp --dport 22 -m conntrack --ctstate NEW -m recent --update --seconds 60 --hitcount 6 --rttl --name dropbear -j DROP
|
||||||
/usr/sbin/iptables -A INPUT -p tcp --dport 22 -m conntrack --ctstate NEW -m recent --set --name dropbear
|
|
||||||
/usr/sbin/iptables -A INPUT -p tcp --dport 22 -m conntrack --ctstate NEW -m recent --update --seconds 60 --hitcount 6 --rttl --name dropbear -j DROP
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=fff-hoods
|
PKG_NAME:=fff-hoods
|
||||||
PKG_RELEASE:=19
|
PKG_RELEASE:=18
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@ define Package/$(PKG_NAME)
|
||||||
SECTION:=base
|
SECTION:=base
|
||||||
CATEGORY:=Freifunk
|
CATEGORY:=Freifunk
|
||||||
TITLE:=Freifunk-Franken hoods
|
TITLE:=Freifunk-Franken hoods
|
||||||
URL:=https://www.freifunk-franken.de
|
URL:=http://www.freifunk-franken.de
|
||||||
DEPENDS:= \
|
DEPENDS:= \
|
||||||
+fff-firewall \
|
+fff-firewall \
|
||||||
+fff-hoodutils \
|
+fff-hoodutils \
|
||||||
|
|
|
@ -191,15 +191,8 @@ if [ -s "$hoodfiletmp" ]; then
|
||||||
if [ -n "$prefix" ] ; then
|
if [ -n "$prefix" ] ; then
|
||||||
# remove escape character
|
# remove escape character
|
||||||
prefix=$(echo "$prefix" | sed -e 's,\\,,')
|
prefix=$(echo "$prefix" | sed -e 's,\\,,')
|
||||||
|
# create proper prefix
|
||||||
# In earlier firmware versions the prefix had to be written
|
prefix=$(echo "$prefix" | sed -e 's,/,:/,')
|
||||||
# in an incorrect syntax (missing a trailing colon).
|
|
||||||
# To make hoodfiles with this old incorrect syntax work with
|
|
||||||
# newer firmware versions like this one, we have to fix the
|
|
||||||
# incorrect syntax here. Both the old, incorrect and
|
|
||||||
# the correct syntax work with this fix.
|
|
||||||
prefix="$(echo "$prefix" | sed -e 's,\([^:]\):/,\1::/,')"
|
|
||||||
|
|
||||||
mac=$(cat "/sys/class/net/br-client/address")
|
mac=$(cat "/sys/class/net/br-client/address")
|
||||||
addr=$(owipcalc "$prefix" add "::$(ipMacSuffix "$mac")")
|
addr=$(owipcalc "$prefix" add "::$(ipMacSuffix "$mac")")
|
||||||
addr_eui=$(owipcalc "$prefix" add "::$(ipEUISuffix "$mac")")
|
addr_eui=$(owipcalc "$prefix" add "::$(ipEUISuffix "$mac")")
|
||||||
|
|
|
@ -9,7 +9,7 @@ define Package/$(PKG_NAME)
|
||||||
SECTION:=base
|
SECTION:=base
|
||||||
CATEGORY:=Freifunk
|
CATEGORY:=Freifunk
|
||||||
TITLE:=Freifunk-Franken hoodutils
|
TITLE:=Freifunk-Franken hoodutils
|
||||||
URL:=https://www.freifunk-franken.de
|
URL:=http://www.freifunk-franken.de
|
||||||
DEPENDS:=+fff-network +fff-config
|
DEPENDS:=+fff-network +fff-config
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
# SPDX-License-Identifier: GPL-3.0-only
|
|
||||||
#
|
|
||||||
# Copyright 2017 Adrian Schmutzler
|
# Copyright 2017 Adrian Schmutzler
|
||||||
|
# License GPLv3
|
||||||
|
|
||||||
. /lib/functions/fff/keyxchange
|
. /lib/functions/fff/keyxchange
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
# SPDX-License-Identifier: GPL-3.0-only
|
|
||||||
#
|
|
||||||
# Copyright 2017 Adrian Schmutzler
|
# Copyright 2017 Adrian Schmutzler
|
||||||
|
# License GPLv3
|
||||||
|
|
||||||
. /usr/share/libubox/jshn.sh
|
. /usr/share/libubox/jshn.sh
|
||||||
. /etc/firmware_release
|
. /etc/firmware_release
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=fff-layer3-config
|
PKG_NAME:=fff-layer3-config
|
||||||
PKG_RELEASE:=9
|
PKG_RELEASE:=4
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@ configure() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# check version of configuration
|
# check version of configuration
|
||||||
local expected_version=2
|
local expected_version=1
|
||||||
local config_version=$(uci -q get gateway.meta.config_version)
|
local config_version=$(uci -q get gateway.meta.config_version)
|
||||||
|
|
||||||
if ! [ -n "$config_version" ]; then
|
if ! [ -n "$config_version" ]; then
|
||||||
|
|
|
@ -13,15 +13,10 @@ configure() {
|
||||||
local ports="$(uci -q get gateway.$vlan.ports)"
|
local ports="$(uci -q get gateway.$vlan.ports)"
|
||||||
local name="$SWITCHDEV"_$vlan
|
local name="$SWITCHDEV"_$vlan
|
||||||
|
|
||||||
if [ "$DSA" = "1" ]; then
|
uci set network.$name='switch_vlan'
|
||||||
uci set network.$name='bridge-vlan'
|
|
||||||
else
|
|
||||||
uci set network.$name='switch_vlan'
|
|
||||||
fi
|
|
||||||
|
|
||||||
uci set network.$name.device="$(uci get network.$SWITCHDEV.name)"
|
uci set network.$name.device="$(uci get network.$SWITCHDEV.name)"
|
||||||
uci set network.$name.vlan="$vlan"
|
uci set network.$name.vlan="$vlan"
|
||||||
uci set network.$name.ports="$(get_cpu_port) $ports"
|
uci set network.$name.ports="$CPUPORT $ports"
|
||||||
}
|
}
|
||||||
|
|
||||||
remove_vlan() {
|
remove_vlan() {
|
||||||
|
@ -39,7 +34,6 @@ configure() {
|
||||||
|
|
||||||
config_load network
|
config_load network
|
||||||
config_foreach remove_vlan switch_vlan
|
config_foreach remove_vlan switch_vlan
|
||||||
config_foreach remove_vlan bridge-vlan
|
|
||||||
|
|
||||||
config_load gateway
|
config_load gateway
|
||||||
config_foreach add_vlan vlan
|
config_foreach add_vlan vlan
|
||||||
|
|
|
@ -50,7 +50,7 @@ configure() {
|
||||||
|
|
||||||
# set interface
|
# set interface
|
||||||
#remove all eth interfaces
|
#remove all eth interfaces
|
||||||
ifaces=$(uci get network.client.ifname | sed 's/\beth[^ ]* *//g' | sed 's/\bswitch[^ ]* *//g')
|
ifaces=$(uci get network.client.ifname | sed 's/\beth[^ ]* *//g')
|
||||||
if vlan=$(uci -q get gateway.@client[0].vlan); then
|
if vlan=$(uci -q get gateway.@client[0].vlan); then
|
||||||
uci set network.client.ifname="${SWITCHDEV}.$vlan $ifaces"
|
uci set network.client.ifname="${SWITCHDEV}.$vlan $ifaces"
|
||||||
elif iface=$(uci -q get gateway.@client[0].iface); then
|
elif iface=$(uci -q get gateway.@client[0].iface); then
|
||||||
|
|
|
@ -1,83 +0,0 @@
|
||||||
. /lib/functions.sh
|
|
||||||
|
|
||||||
configure() {
|
|
||||||
local router_ip
|
|
||||||
local router_ip6
|
|
||||||
|
|
||||||
# clean old addresses
|
|
||||||
uci -q del network.loopback.ipaddr
|
|
||||||
uci -q del network.loopback.ip6addr
|
|
||||||
|
|
||||||
# remove netmask entry that ships by default
|
|
||||||
uci -q del network.loopback.netmask
|
|
||||||
|
|
||||||
# clean old rules
|
|
||||||
remove_rules() {
|
|
||||||
local name="$1"
|
|
||||||
|
|
||||||
# check if filter was added by this script
|
|
||||||
if ! [ "$(uci -q get network.$name.addedbyautoconfig)" = '30-network-routerip' ]; then
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
uci -q del network.$name
|
|
||||||
}
|
|
||||||
|
|
||||||
config_load network
|
|
||||||
config_foreach remove_rules rule
|
|
||||||
config_foreach remove_rules rule6
|
|
||||||
|
|
||||||
# add router_ip
|
|
||||||
router_ip=$(uci -q get gateway.meta.router_ip)
|
|
||||||
for ip in $router_ip; do
|
|
||||||
uci -q add_list network.loopback.ipaddr="$ip"
|
|
||||||
|
|
||||||
# CIDR notation required
|
|
||||||
case $ip in
|
|
||||||
*/*)
|
|
||||||
# do nothing; ip is already in CIDR notation
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
ip="$ip/32"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
config=$(uci add network rule)
|
|
||||||
uci -q set network.$config.src="$ip"
|
|
||||||
uci -q set network.$config.lookup='fff'
|
|
||||||
# default prio for the ip4table interface option is 10000
|
|
||||||
uci -q set network.$config.priority='10000'
|
|
||||||
uci -q set network.$config.addedbyautoconfig='30-network-routerip'
|
|
||||||
done
|
|
||||||
|
|
||||||
# add router_ip6
|
|
||||||
router_ip6=$(uci -q get gateway.meta.router_ip6)
|
|
||||||
for ip in $router_ip6; do
|
|
||||||
uci -q add_list network.loopback.ip6addr="$ip"
|
|
||||||
|
|
||||||
# CIDR notation required
|
|
||||||
case $ip in
|
|
||||||
*/*)
|
|
||||||
# do nothing; ip is already in CIDR notation
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
ip="$ip/128"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
config=$(uci add network rule6)
|
|
||||||
uci -q set network.$config.src="$ip"
|
|
||||||
uci -q set network.$config.lookup='fff'
|
|
||||||
# default prio for the ip6table interface option is 10000
|
|
||||||
uci -q set network.$config.priority='10000'
|
|
||||||
uci -q set network.$config.addedbyautoconfig='30-network-routerip'
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
apply() {
|
|
||||||
uci commit network
|
|
||||||
}
|
|
||||||
|
|
||||||
revert() {
|
|
||||||
uci revert network
|
|
||||||
}
|
|
|
@ -1,21 +0,0 @@
|
||||||
# load board specific properties
|
|
||||||
BOARD="$(uci get board.model.name)"
|
|
||||||
. /etc/network.$BOARD
|
|
||||||
|
|
||||||
configure() {
|
|
||||||
if vlan=$(uci -q get gateway.@wan[0].vlan); then
|
|
||||||
uci set network.wan.ifname="${SWITCHDEV}.$vlan"
|
|
||||||
elif iface=$(uci -q get gateway.@wan[0].iface); then
|
|
||||||
uci set network.wan.ifname="$iface"
|
|
||||||
else
|
|
||||||
echo "WARNING: No vlan/interface for WAN specified. The default setting won't be overwritten."
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
apply() {
|
|
||||||
uci commit network
|
|
||||||
}
|
|
||||||
|
|
||||||
revert() {
|
|
||||||
uci revert network
|
|
||||||
}
|
|
|
@ -1,79 +0,0 @@
|
||||||
## this script migrates configs from version 1 to 2.
|
|
||||||
##
|
|
||||||
## with version 2 the switchport names of some devices changed
|
|
||||||
## due to the switch to DSA
|
|
||||||
|
|
||||||
|
|
||||||
BOARD="$(uci get board.model.name)"
|
|
||||||
|
|
||||||
# only migrate appropriate config versions
|
|
||||||
[ "$(uci -q get gateway.meta.config_version)" = "1" ] || exit 1
|
|
||||||
|
|
||||||
translate_ports() {
|
|
||||||
local vlan="$1"
|
|
||||||
local oldports="$(uci -q get gateway.$vlan.ports)"
|
|
||||||
local newports
|
|
||||||
|
|
||||||
local name
|
|
||||||
local tag
|
|
||||||
|
|
||||||
for port in $oldports; do
|
|
||||||
# generate new tagged/untagged syntax
|
|
||||||
if [ -z "${port##*t}" ]; then
|
|
||||||
# port is tagged
|
|
||||||
tag=":t"
|
|
||||||
else
|
|
||||||
# port is untagged
|
|
||||||
tag=":*"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# generate new name
|
|
||||||
case "$BOARD" in
|
|
||||||
ubnt,edgerouter-x|\
|
|
||||||
ubnt,edgerouter-x-sfp)
|
|
||||||
case "${port%%t}" in
|
|
||||||
0) name="eth0" ;;
|
|
||||||
1) name="eth1" ;;
|
|
||||||
2) name="eth2" ;;
|
|
||||||
3) name="eth3" ;;
|
|
||||||
4) name="eth4" ;;
|
|
||||||
5) name="eth5" ;;
|
|
||||||
*) name="" ;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
netgear,r6220)
|
|
||||||
case "${port%%t}" in
|
|
||||||
0) name="lan1" ;;
|
|
||||||
1) name="lan2" ;;
|
|
||||||
2) name="lan3" ;;
|
|
||||||
3) name="lan4" ;;
|
|
||||||
4) name="wan" ;;
|
|
||||||
*) name="" ;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# catch empty name (invalid entry or old cpuport)
|
|
||||||
[ -z "$name" ] && continue
|
|
||||||
|
|
||||||
# assemble new port name
|
|
||||||
newports="$newports ${name}${tag}"
|
|
||||||
done
|
|
||||||
|
|
||||||
# cleanup unnecessary spaces
|
|
||||||
newports=$(echo "$newports" | xargs)
|
|
||||||
|
|
||||||
uci set gateway.$vlan.ports="$newports"
|
|
||||||
}
|
|
||||||
|
|
||||||
case "$BOARD" in
|
|
||||||
ubnt,edgerouter-x|\
|
|
||||||
ubnt,edgerouter-x-sfp|\
|
|
||||||
netgear,r6220)
|
|
||||||
config_load gateway
|
|
||||||
config_foreach translate_ports vlan
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
uci set gateway.meta.config_version='2'
|
|
||||||
uci commit gateway
|
|
|
@ -1,5 +1,14 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
# This program is free software; you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation; either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
|
||||||
|
|
||||||
# IMPORTANT!!
|
# IMPORTANT!!
|
||||||
# DO NOT RUN THIS IN CRONJOB!
|
# DO NOT RUN THIS IN CRONJOB!
|
||||||
|
@ -73,7 +82,6 @@ keep_changes() {
|
||||||
test_changes() {
|
test_changes() {
|
||||||
echo $$ > /tmp/configure-layer3-pid
|
echo $$ > /tmp/configure-layer3-pid
|
||||||
trap keep_changes SIGINT SIGTERM
|
trap keep_changes SIGINT SIGTERM
|
||||||
trap : SIGHUP
|
|
||||||
|
|
||||||
reload_services
|
reload_services
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,32 @@
|
||||||
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
|
PKG_NAME:=fff-layer3-ipv4snat
|
||||||
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
|
define Package/fff-layer3-ipv4snat
|
||||||
|
SECTION:=base
|
||||||
|
CATEGORY:=Freifunk
|
||||||
|
TITLE:=Freifunk-Franken layer3 configuration with SNAT
|
||||||
|
URL:=https://www.freifunk-franken.de
|
||||||
|
DEPENDS:= \
|
||||||
|
+iptables-mod-nat-extra \
|
||||||
|
+fff-firewall \
|
||||||
|
+fff-layer3-config
|
||||||
|
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Package/fff-layer3-ipv4snat/description
|
||||||
|
With this package it is possible to make SNAT with IPv4 on the router
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Build/Compile
|
||||||
|
# nothing
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Package/fff-layer3-ipv4snat/install
|
||||||
|
$(CP) ./files/* $(1)/
|
||||||
|
endef
|
||||||
|
|
||||||
|
$(eval $(call BuildPackage,fff-layer3-ipv4snat))
|
|
@ -0,0 +1,31 @@
|
||||||
|
configure() {
|
||||||
|
# first we delete the snat config
|
||||||
|
uci del network.client.nat
|
||||||
|
if [ "$(uci -q get gateway.@client[0].nat)" = '1' ]; then
|
||||||
|
|
||||||
|
# first check the config is plausible
|
||||||
|
if ! peer_ip=$(uci get gateway.meta.peer_ip); then
|
||||||
|
echo "ERROR: No peer_ip set! For SNAT use you must set a peer_ip"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
if ! ipaddr=$(uci get gateway.@client[0].ipaddr); then
|
||||||
|
echo "ERROR: No ipaddr set! For SNAT use you must set ipaddr"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# We set the snat config
|
||||||
|
uci set network.client.nat=1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
reload() {
|
||||||
|
/etc/init.d/fff-firewall start
|
||||||
|
}
|
||||||
|
|
||||||
|
apply() {
|
||||||
|
uci commit network
|
||||||
|
}
|
||||||
|
|
||||||
|
revert() {
|
||||||
|
uci revert network
|
||||||
|
}
|
|
@ -0,0 +1,7 @@
|
||||||
|
if [ "$(uci -q get gateway.@client[0].nat)" = '1' ]; then
|
||||||
|
peer_ip=$(uci get gateway.meta.peer_ip)
|
||||||
|
ipaddr=$(uci get gateway.@client[0].ipaddr)
|
||||||
|
for ip in $ipaddr; do
|
||||||
|
iptables -t nat -A POSTROUTING -s $ip -j SNAT --to-source $peer_ip
|
||||||
|
done
|
||||||
|
fi
|
|
@ -1,7 +1,7 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=fff-layer3
|
PKG_NAME:=fff-layer3
|
||||||
PKG_RELEASE:=9
|
PKG_RELEASE:=8
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
|
@ -16,6 +16,7 @@ define Package/fff-layer3
|
||||||
+fff-dhcp \
|
+fff-dhcp \
|
||||||
+fff-layer3-config \
|
+fff-layer3-config \
|
||||||
+fff-mqtt-monitoring \
|
+fff-mqtt-monitoring \
|
||||||
|
+fff-layer3-ipv4snat \
|
||||||
+fff-network \
|
+fff-network \
|
||||||
+fff-ra \
|
+fff-ra \
|
||||||
+fff-web-mqtt \
|
+fff-web-mqtt \
|
||||||
|
|
|
@ -17,7 +17,7 @@ define Package/$(PKG_NAME)
|
||||||
SECTION:=base
|
SECTION:=base
|
||||||
CATEGORY:=Freifunk
|
CATEGORY:=Freifunk
|
||||||
TITLE:=Freifunk-Franken mac nocker
|
TITLE:=Freifunk-Franken mac nocker
|
||||||
URL:=https://www.freifunk-franken.de
|
URL:=http://www.freifunk-franken.de
|
||||||
KCONFIG:= \
|
KCONFIG:= \
|
||||||
CONFIG_NET_EMATCH=y \
|
CONFIG_NET_EMATCH=y \
|
||||||
CONFIG_NET_EMATCH_U32=y \
|
CONFIG_NET_EMATCH_U32=y \
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
*/5 * * * * sleep $(/usr/bin/random 70 85); /usr/sbin/alfred-mqtt-proxy
|
*/5 * * * * sleep $(/usr/bin/random 0 29); /usr/sbin/alfred-mqtt-proxy
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=fff-mqtt
|
PKG_NAME:=fff-mqtt
|
||||||
PKG_RELEASE:=2
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_BUILD_DIR:=$(BUILD_DIR)/fff-mqtt
|
PKG_BUILD_DIR:=$(BUILD_DIR)/fff-mqtt
|
||||||
|
|
||||||
|
@ -15,7 +15,8 @@ define Package/fff-mqtt
|
||||||
DEPENDS:= \
|
DEPENDS:= \
|
||||||
+fff-config \
|
+fff-config \
|
||||||
+libmosquitto-ssl \
|
+libmosquitto-ssl \
|
||||||
+mosquitto-client-ssl
|
+mosquitto-client-ssl \
|
||||||
|
+mosquitto-ssl
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/fff-mqtt/description
|
define Package/fff-mqtt/description
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=fff-network
|
PKG_NAME:=fff-network
|
||||||
PKG_RELEASE:=50
|
PKG_RELEASE:=28
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@ define Package/$(PKG_NAME)
|
||||||
SECTION:=base
|
SECTION:=base
|
||||||
CATEGORY:=Freifunk
|
CATEGORY:=Freifunk
|
||||||
TITLE:=Freifunk-Franken network configuration
|
TITLE:=Freifunk-Franken network configuration
|
||||||
URL:=https://www.freifunk-franken.de
|
URL:=http://www.freifunk-franken.de
|
||||||
DEPENDS:= \
|
DEPENDS:= \
|
||||||
+owipcalc \
|
+owipcalc \
|
||||||
+fff-boardname \
|
+fff-boardname \
|
||||||
|
|
|
@ -1,5 +0,0 @@
|
||||||
WANDEV=eth0
|
|
||||||
SWITCHDEV=eth0
|
|
||||||
CLIENT_PORTS="0t 3 4"
|
|
||||||
WAN_PORTS="0t 5"
|
|
||||||
BATMAN_PORTS="0t 1 2"
|
|
|
@ -1,5 +1,9 @@
|
||||||
|
PORTORDER="5 4 3 2 1"
|
||||||
|
|
||||||
WANDEV=eth0
|
WANDEV=eth0
|
||||||
SWITCHDEV=eth0
|
SWITCHDEV=eth0
|
||||||
CLIENT_PORTS="0t 1 2"
|
CLIENT_PORTS="0t 1 2"
|
||||||
WAN_PORTS="0t 5"
|
WAN_PORTS="0t 5"
|
||||||
BATMAN_PORTS="0t 3 4"
|
BATMAN_PORTS="0t 3 4"
|
||||||
|
|
||||||
|
ROUTERMAC=$(cat /sys/class/net/eth1/address)
|
||||||
|
|
|
@ -1,6 +1,3 @@
|
||||||
config globals 'globals'
|
|
||||||
option packet_steering '1'
|
|
||||||
|
|
||||||
config interface 'loopback'
|
config interface 'loopback'
|
||||||
option ifname 'lo'
|
option ifname 'lo'
|
||||||
option proto 'static'
|
option proto 'static'
|
||||||
|
@ -12,12 +9,8 @@ config interface 'client'
|
||||||
option auto '1'
|
option auto '1'
|
||||||
|
|
||||||
config interface 'wan'
|
config interface 'wan'
|
||||||
option proto 'none'
|
|
||||||
option ifname 'eth2'
|
|
||||||
|
|
||||||
config interface 'wan4'
|
|
||||||
option proto 'dhcp'
|
option proto 'dhcp'
|
||||||
option ifname '@wan'
|
option ifname 'eth2'
|
||||||
|
|
||||||
config interface 'wan6'
|
config interface 'wan6'
|
||||||
option proto 'dhcpv6'
|
option proto 'dhcpv6'
|
||||||
|
|
|
@ -1,24 +1,49 @@
|
||||||
# Disable IPv4 forwarding.
|
net.ipv4.conf.default.arp_ignore=1
|
||||||
# This has to be set first, because it resets some of the
|
net.ipv4.conf.all.arp_ignore=1
|
||||||
# net.ipv4.conf.* sysctls.
|
net.ipv4.conf.all.forwarding=0
|
||||||
|
net.ipv4.conf.all.send_redirects=0
|
||||||
|
net.ipv4.tcp_ecn=0
|
||||||
|
net.ipv4.tcp_fin_timeout=30
|
||||||
|
net.ipv4.tcp_keepalive_time=120
|
||||||
|
net.ipv4.tcp_syncookies=1
|
||||||
|
net.core.netdev_max_backlog=30
|
||||||
|
net.netfilter.nf_conntrack_checksum=0
|
||||||
|
|
||||||
|
#Controls source route verification
|
||||||
|
net.ipv4.conf.default.rp_filter=1
|
||||||
|
|
||||||
|
#Do not accept source routing
|
||||||
|
net.ipv4.conf.all.accept_source_route=0
|
||||||
|
net.ipv4.conf.all.accept_redirects=0
|
||||||
|
net.ipv4.conf.default.accept_source_route=0
|
||||||
|
net.ipv4.conf.default.accept_redirects=0
|
||||||
|
net.ipv4.icmp_echo_ignore_broadcasts=1
|
||||||
|
net.ipv4.icmp_ignore_bogus_error_responses=1
|
||||||
net.ipv4.ip_forward=0
|
net.ipv4.ip_forward=0
|
||||||
|
|
||||||
# Enable IPv6 forwarding, otherwise the fc00::/7 route sometimes is
|
net.ipv6.conf.default.accept_dad=0
|
||||||
# not used if a default route is available, which breaks fc00::/7
|
net.ipv6.conf.default.accept_ra=0
|
||||||
# inside Freifunk.
|
net.ipv6.conf.default.accept_redirects=0
|
||||||
# To ensure no packets are routed to different interfaces, fff-firewall
|
net.ipv6.conf.all.accept_dad=0
|
||||||
# sets appropriate iptables rules
|
net.ipv6.conf.all.accept_ra=0
|
||||||
|
net.ipv6.conf.all.accept_redirects=0
|
||||||
|
|
||||||
|
# Learn Prefix Information in Router Advertisement
|
||||||
|
net.ipv6.conf.default.accept_ra_pinfo = 0
|
||||||
|
net.ipv6.conf.all.accept_ra_pinfo = 0
|
||||||
|
|
||||||
|
# Setting controls whether the system will accept Hop Limit settings from a router advertisement
|
||||||
|
net.ipv6.conf.default.accept_ra_defrtr = 0
|
||||||
|
net.ipv6.conf.all.accept_ra_defrtr = 0
|
||||||
|
|
||||||
|
#router advertisements can cause the system to assign a global unicast address to an interface
|
||||||
|
net.ipv6.conf.default.autoconf = 0
|
||||||
|
net.ipv6.conf.all.autoconf = 0
|
||||||
|
|
||||||
|
#how many neighbor solicitations to send out per address?
|
||||||
|
net.ipv6.conf.default.dad_transmits = 3
|
||||||
|
net.ipv6.conf.all.dad_transmits = 3
|
||||||
|
|
||||||
|
# Enable forwarding, otherwise not all local route are examined
|
||||||
net.ipv6.conf.all.forwarding=1
|
net.ipv6.conf.all.forwarding=1
|
||||||
net.ipv6.conf.default.forwarding=0
|
net.ipv6.conf.default.forwarding=0
|
||||||
|
|
||||||
# Do not accept Router Advertisements, so no public
|
|
||||||
# addresses are assigned to interfaces, where we don't
|
|
||||||
# want them. OpenWrts netifd overwrites this option for the WAN
|
|
||||||
# interface, so IPv6 WAN connectivity is still possible.
|
|
||||||
net.ipv6.conf.default.accept_ra=0
|
|
||||||
net.ipv6.conf.all.accept_ra=0
|
|
||||||
|
|
||||||
# Disable DAD, so fdff::1 on br-client does not get erroneously disabled.
|
|
||||||
# This should be done on a per-interface basis in the future.
|
|
||||||
net.ipv6.conf.default.accept_dad=0
|
|
||||||
net.ipv6.conf.all.accept_dad=0
|
|
||||||
|
|
|
@ -1,2 +0,0 @@
|
||||||
# Remove port configuration residues from earlier firmware versions
|
|
||||||
sed -i -e '/^WAN_PORTS/d' -e '/^BATMAN_PORTS/d' -e '/^CLIENT_PORTS/d' /etc/network.config
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
uci batch <<EOF
|
||||||
|
add nodewatcher network
|
||||||
|
set nodewatcher.@network[-1].mesh_interface='br-client'
|
||||||
|
set nodewatcher.@network[-1].iface_blacklist='lo ifb0'
|
||||||
|
set nodewatcher.@network[-1].ip_whitelist='br-client'
|
||||||
|
EOF
|
||||||
|
uci commit nodewatcher
|
||||||
|
|
||||||
|
exit 0
|
|
@ -1,36 +1,38 @@
|
||||||
# SPDX-License-Identifier: GPL-3.0-only
|
|
||||||
#
|
|
||||||
# Copyright 2019 Adrian Schmutzler
|
# Copyright 2019 Adrian Schmutzler
|
||||||
|
# License GPLv3
|
||||||
|
|
||||||
get_cpu_port() {
|
BOARD="$(uci get board.model.name)"
|
||||||
local BOARD=$(uci get board.model.name)
|
|
||||||
local CPUPORT
|
|
||||||
|
|
||||||
case "$BOARD" in
|
case "$BOARD" in
|
||||||
tplink,archer-c50-v3|\
|
tplink,tl-wr1043nd-v1)
|
||||||
tplink,archer-c50-v4|\
|
CPUPORT="5t"
|
||||||
tplink,tl-wr1043nd-v2|\
|
;;
|
||||||
tplink,tl-wr1043nd-v3|\
|
tplink,c50-v3|\
|
||||||
tplink,tl-wr841n-v13|\
|
tplink,c50-v4|\
|
||||||
xiaomi,mi-router-4a-100m)
|
tplink,tl-wr1043nd-v2|\
|
||||||
CPUPORT="6t"
|
tplink,tl-wr1043nd-v3|\
|
||||||
;;
|
tl-wr841n-v13|\
|
||||||
netgear,r6220|\
|
r6220|\
|
||||||
tplink,cpe210-v2|\
|
ubnt-erx|\
|
||||||
tplink,cpe210-v3|\
|
ubnt-erx-sfp)
|
||||||
ubnt,edgerouter-4|\
|
CPUPORT="6t"
|
||||||
ubnt,edgerouter-x|\
|
;;
|
||||||
ubnt,edgerouter-x-sfp|\
|
tplink,cpe210-v2|\
|
||||||
ubnt,nanostation-loco-m-xw|\
|
tplink,cpe210-v3|\
|
||||||
ubnt,unifi|\
|
tplink,tl-mr3020-v1|\
|
||||||
ubnt,unifiac-mesh|\
|
tplink,tl-wa850re-v1|\
|
||||||
xiaomi,mi-router-4a-gigabit)
|
tplink,tl-wa860re-v1|\
|
||||||
CPUPORT=""
|
tplink,tl-wa901nd-v2|\
|
||||||
;;
|
ubnt,bullet-m|\
|
||||||
*)
|
ubnt,nanostation-loco-m|\
|
||||||
CPUPORT="0t"
|
ubnt,nanostation-loco-m-xw|\
|
||||||
;;
|
ubnt,nanostation-m|\
|
||||||
esac
|
ubnt,picostation-m|\
|
||||||
|
ubnt,unifi|\
|
||||||
echo "$CPUPORT"
|
ubnt,unifiac-mesh)
|
||||||
}
|
CPUPORT=""
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
CPUPORT="0t"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
# SPDX-License-Identifier: GPL-3.0-only
|
|
||||||
#
|
|
||||||
# Copyright 2017 Adrian Schmutzler
|
# Copyright 2017 Adrian Schmutzler
|
||||||
|
# License GPLv3
|
||||||
|
|
||||||
ipMacSuffix() {
|
ipMacSuffix() {
|
||||||
# Returns the lower 64 bits of an IPv6 address (0:aabb:ccdd:eeff)
|
# Returns the lower 64 bits of an IPv6 address (0:aabb:ccdd:eeff)
|
||||||
|
|
|
@ -1,48 +0,0 @@
|
||||||
# SPDX-License-Identifier: GPL-3.0-only
|
|
||||||
#
|
|
||||||
# Copyright 2019 Adrian Schmutzler
|
|
||||||
|
|
||||||
get_port_order() {
|
|
||||||
local BOARD=$(uci get board.model.name)
|
|
||||||
local PORTORDER
|
|
||||||
|
|
||||||
case "$BOARD" in
|
|
||||||
avm,fritzbox-4040)
|
|
||||||
PORTORDER="5 1 2 3 4"
|
|
||||||
;;
|
|
||||||
glinet,gl-ar150)
|
|
||||||
PORTORDER="1"
|
|
||||||
;;
|
|
||||||
netgear,r6220)
|
|
||||||
PORTORDER="4 3 2 1 0"
|
|
||||||
;;
|
|
||||||
tplink,archer-c25-v1|\
|
|
||||||
tplink,archer-c60-v1|\
|
|
||||||
tplink,archer-c60-v2)
|
|
||||||
PORTORDER="4 3 2 1"
|
|
||||||
;;
|
|
||||||
tplink,archer-c50-v4|\
|
|
||||||
tplink,tl-wr841n-v13)
|
|
||||||
PORTORDER="0 1 2 3 4"
|
|
||||||
;;
|
|
||||||
tplink,archer-c7-v2|\
|
|
||||||
tplink,archer-c7-v5|\
|
|
||||||
tplink,tl-wdr4300-v1)
|
|
||||||
PORTORDER="1 2 3 4 5"
|
|
||||||
;;
|
|
||||||
tplink,c2600|\
|
|
||||||
tplink,tl-wr1043nd-v4|\
|
|
||||||
tplink,tl-wr1043n-v5)
|
|
||||||
PORTORDER="5 4 3 2 1"
|
|
||||||
;;
|
|
||||||
tplink,cpe210-v1|\
|
|
||||||
tplink,cpe510-v1)
|
|
||||||
PORTORDER="5 4"
|
|
||||||
;;
|
|
||||||
xiaomi,mi-router-4a-100m)
|
|
||||||
PORTORDER="0 2 4"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
echo "$PORTORDER"
|
|
||||||
}
|
|
|
@ -1,7 +1,6 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# SPDX-License-Identifier: GPL-3.0-only
|
|
||||||
#
|
|
||||||
# Netmon Nodewatcher (C) 2010-2012 Freifunk Oldenburg
|
# Netmon Nodewatcher (C) 2010-2012 Freifunk Oldenburg
|
||||||
|
# License; GPL v3
|
||||||
|
|
||||||
IFACEBLACKLIST=$(uci get nodewatcher.@network[0].iface_blacklist)
|
IFACEBLACKLIST=$(uci get nodewatcher.@network[0].iface_blacklist)
|
||||||
IPWHITELIST=$(uci get nodewatcher.@network[0].ip_whitelist)
|
IPWHITELIST=$(uci get nodewatcher.@network[0].ip_whitelist)
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# SPDX-License-Identifier: GPL-3.0-only
|
|
||||||
#
|
|
||||||
# Netmon Nodewatcher (C) 2010-2012 Freifunk Oldenburg
|
# Netmon Nodewatcher (C) 2010-2012 Freifunk Oldenburg
|
||||||
|
# License; GPL v3
|
||||||
|
|
||||||
MESH_INTERFACE=$(uci get nodewatcher.@network[0].mesh_interface)
|
MESH_INTERFACE=$(uci get nodewatcher.@network[0].mesh_interface)
|
||||||
|
|
||||||
|
|
|
@ -1,22 +1,52 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
# This program is free software; you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation; either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
|
||||||
. /lib/functions/system.sh
|
|
||||||
. /lib/functions/fff/network
|
. /lib/functions/fff/network
|
||||||
|
|
||||||
|
setupPorts() {
|
||||||
|
# Add a single port to the *_PORTS config
|
||||||
|
# Usage: setupPorts <port id> <port mode>
|
||||||
|
|
||||||
|
local port=$1
|
||||||
|
local mode=$2
|
||||||
|
|
||||||
|
#default: BATMAN
|
||||||
|
if [ "$mode" = "WAN" ] ; then
|
||||||
|
WAN_PORTS="${WAN_PORTS} $port"
|
||||||
|
elif [ "$mode" = "CLIENT" ] ; then
|
||||||
|
CLIENT_PORTS="${CLIENT_PORTS} $port"
|
||||||
|
else
|
||||||
|
BATMAN_PORTS="${BATMAN_PORTS} $port"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
BOARD="$(uci get board.model.name)"
|
BOARD="$(uci get board.model.name)"
|
||||||
. /etc/network.$BOARD
|
. /etc/network.$BOARD
|
||||||
[ -n "$ROUTERMAC" ] || ROUTERMAC=$(get_mac_label)
|
|
||||||
|
|
||||||
if [ -s /etc/network.config ] ; then
|
if [ -s /etc/network.config ] ; then
|
||||||
. /etc/network.config
|
. /etc/network.config
|
||||||
else
|
else
|
||||||
# Write network.config
|
# Write network.config
|
||||||
|
echo "CLIENT_PORTS='$CLIENT_PORTS'" > /etc/network.config
|
||||||
|
echo "BATMAN_PORTS='$BATMAN_PORTS'" >> /etc/network.config
|
||||||
|
if [ -n "$WAN_PORTS" ] ; then
|
||||||
|
echo "WAN_PORTS='$WAN_PORTS'" >> /etc/network.config
|
||||||
|
fi
|
||||||
if [ "$ONE_PORT" = "YES" ] || [ -n "$ETHPORT" ] ; then
|
if [ "$ONE_PORT" = "YES" ] || [ -n "$ETHPORT" ] ; then
|
||||||
echo "ETHMODE='$ETHMODE' # use BATMAN, CLIENT or WAN" >> /etc/network.config
|
echo "ETHMODE='$ETHMODE' # use BATMAN, CLIENT or WAN" >> /etc/network.config
|
||||||
fi
|
fi
|
||||||
if [ -n "$TWO_PORT" ] ; then
|
if [ -n "$LAN0PORT" ] ; then
|
||||||
echo "LAN0MODE='$LAN0MODE' # use BATMAN, CLIENT or WAN" >> /etc/network.config
|
echo "LAN0MODE='$LAN0MODE' # use BATMAN, CLIENT or WAN" >> /etc/network.config
|
||||||
|
fi
|
||||||
|
if [ -n "$LAN1PORT" ] ; then
|
||||||
echo "LAN1MODE='$LAN1MODE' # use BATMAN, CLIENT or WAN" >> /etc/network.config
|
echo "LAN1MODE='$LAN1MODE' # use BATMAN, CLIENT or WAN" >> /etc/network.config
|
||||||
fi
|
fi
|
||||||
echo "FORCEPARSE='0' # Parse at: 0=first boot only, 1=every reboot, 2=next reboot (once)" >> /etc/network.config
|
echo "FORCEPARSE='0' # Parse at: 0=first boot only, 1=every reboot, 2=next reboot (once)" >> /etc/network.config
|
||||||
|
@ -28,148 +58,79 @@ if [ "$FORCEPARSE" = '2' ] ; then
|
||||||
FORCEPARSE='1'
|
FORCEPARSE='1'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$ONE_PORT" = "YES" ]; then
|
if [ -n "$ETHPORT" ] ; then
|
||||||
if ! uci -q get network.$SWITCHDEV.ifname || [ "$FORCEPARSE" = '1' ] ; then
|
#LAN@AR150: default: BATMAN
|
||||||
uci set network.$SWITCHDEV=interface
|
setupPorts "$ETHPORT" "${ETHMODE}"
|
||||||
uci set network.$SWITCHDEV.ifname=$SWITCHDEV
|
fi
|
||||||
if [ "$ETHMODE" = "WAN" ]; then
|
if [ -n "$LAN0PORT" ] ; then
|
||||||
uci set network.client.ifname="bat0"
|
#LAN0@two-port: default: BATMAN
|
||||||
uci set network.wan.ifname="$WANDEV"
|
setupPorts "$LAN0PORT" "${LAN0MODE}"
|
||||||
uci del network.ethmesh.ifname
|
fi
|
||||||
uci del network.${SWITCHDEV}.macaddr
|
if [ -n "$LAN1PORT" ] ; then
|
||||||
elif [ "$ETHMODE" = "CLIENT" ] ; then
|
#LAN1@two-port: default: BATMAN
|
||||||
uci set network.client.ifname="bat0 $SWITCHDEV"
|
setupPorts "$LAN1PORT" "${LAN1MODE}"
|
||||||
uci set network.wan.ifname="eth2" #eth2 because it is default in config file
|
fi
|
||||||
uci del network.ethmesh.ifname
|
|
||||||
uci del network.${SWITCHDEV}.macaddr
|
if ! uci -q get network.$SWITCHDEV > /dev/null || [ "$FORCEPARSE" = '1' ] ; then
|
||||||
elif [ "$ETHMODE" = "BATMAN" ] ; then
|
|
||||||
uci set network.client.ifname="bat0"
|
SWITCHHW=$(swconfig list | awk '{ print $4 }')
|
||||||
uci set network.wan.ifname="eth2" #eth2 because it is default in config file
|
|
||||||
uci set network.ethmesh.ifname="$SWITCHDEV"
|
uci set network.$SWITCHDEV=switch
|
||||||
ETH0DEV="$SWITCHDEV"
|
uci set network.$SWITCHDEV.name=$SWITCHHW
|
||||||
ETH0MAC="w2ap"
|
uci set network.$SWITCHDEV.enable=1
|
||||||
fi
|
uci set network.$SWITCHDEV.reset=1
|
||||||
uci commit network
|
uci set network.$SWITCHDEV.enable_vlan=1
|
||||||
|
|
||||||
|
uci set network.${SWITCHDEV}_1=switch_vlan
|
||||||
|
uci set network.${SWITCHDEV}_1.device=$SWITCHHW
|
||||||
|
uci set network.${SWITCHDEV}_1.vlan=1
|
||||||
|
uci set network.${SWITCHDEV}_1.ports="$CLIENT_PORTS"
|
||||||
|
|
||||||
|
if [ "$WANDEV" = "$SWITCHDEV" ] || ! [ -z "$WAN_PORTS" ]; then
|
||||||
|
uci set network.${SWITCHDEV}_2=switch_vlan
|
||||||
|
uci set network.${SWITCHDEV}_2.device=$SWITCHHW
|
||||||
|
uci set network.${SWITCHDEV}_2.vlan=2
|
||||||
|
uci set network.${SWITCHDEV}_2.ports="$WAN_PORTS"
|
||||||
fi
|
fi
|
||||||
elif [ "$TWO_PORT" = "YES" ]; then
|
|
||||||
if ! uci -q get network.$WANDEV.ifname || [ "$FORCEPARSE" = '1' ] ; then
|
|
||||||
uci set network.$WANDEV=interface
|
|
||||||
uci set network.$WANDEV.ifname="$WANDEV"
|
|
||||||
uci set network.$SWITCHDEV=interface
|
|
||||||
uci set network.$SWITCHDEV.ifname="$SWITCHDEV"
|
|
||||||
# Only one WAN possible, second port will be unset if both are WAN
|
|
||||||
if [ "$LAN0MODE" = "WAN" ]; then
|
|
||||||
if [ "$LAN1MODE" = "CLIENT" ]; then
|
|
||||||
uci set network.client.ifname="bat0 $SWITCHDEV"; else
|
|
||||||
uci set network.client.ifname=bat0; fi
|
|
||||||
# WAN
|
|
||||||
uci set network.wan.ifname="$WANDEV"
|
|
||||||
if [ "$LAN1MODE" = "BATMAN" ]; then
|
|
||||||
uci set network.ethmesh.ifname="$SWITCHDEV"; else
|
|
||||||
uci del network.ethmesh.ifname; fi
|
|
||||||
# Two client ports are possible
|
|
||||||
elif [ "$LAN0MODE" = "CLIENT" ]; then
|
|
||||||
if [ "$LAN1MODE" = "CLIENT" ]; then
|
|
||||||
uci set network.client.ifname="bat0 $WANDEV $SWITCHDEV"; else
|
|
||||||
uci set network.client.ifname="bat0 $WANDEV"; fi
|
|
||||||
if [ "$LAN1MODE" = "WAN" ]; then
|
|
||||||
uci set network.wan.ifname="$SWITCHDEV"; else
|
|
||||||
uci set network.wan.ifname=eth2; fi #eth2 because it is default in config file
|
|
||||||
if [ "$LAN1MODE" = "BATMAN" ]; then
|
|
||||||
uci set network.ethmesh.ifname="$SWITCHDEV"; else
|
|
||||||
uci del network.ethmesh.ifname; fi
|
|
||||||
# Only one BATMAN port possible, second port will be unset if both are BATMAN
|
|
||||||
elif [ "$LAN0MODE" = "BATMAN" ] ; then
|
|
||||||
if [ "$LAN1MODE" = "CLIENT" ]; then
|
|
||||||
uci set network.client.ifname="bat0 $SWITCHDEV"; else
|
|
||||||
uci set network.client.ifname=bat0; fi
|
|
||||||
if [ "$LAN1MODE" = "WAN" ]; then
|
|
||||||
uci set network.wan.ifname="$SWITCHDEV"; else
|
|
||||||
uci set network.wan.ifname=eth2; fi #eth2 because it is default in config file
|
|
||||||
# BATMAN
|
|
||||||
uci set network.ethmesh.ifname="$WANDEV"
|
|
||||||
fi
|
|
||||||
if [ "$LAN0MODE" = "BATMAN" ]; then
|
|
||||||
ETH0DEV="$WANDEV" # only needed for setting macaddr
|
|
||||||
ETH0MAC=w2ap
|
|
||||||
uci del network.$SWITCHDEV.macaddr
|
|
||||||
elif [ "$LAN1MODE" = "BATMAN" ]; then
|
|
||||||
# $WANDEV will win if both are set to BATMAN, as above
|
|
||||||
ETH0DEV="$SWITCHDEV" # only needed for setting macaddr
|
|
||||||
ETH0MAC=w2ap
|
|
||||||
uci del network.$WANDEV.macaddr
|
|
||||||
else
|
|
||||||
uci del network.$WANDEV.macaddr
|
|
||||||
uci del network.$SWITCHDEV.macaddr
|
|
||||||
fi
|
|
||||||
|
|
||||||
uci commit network
|
uci set network.${SWITCHDEV}_3=switch_vlan
|
||||||
|
uci set network.${SWITCHDEV}_3.device=$SWITCHHW
|
||||||
|
uci set network.${SWITCHDEV}_3.vlan=3
|
||||||
|
uci set network.${SWITCHDEV}_3.ports="$BATMAN_PORTS"
|
||||||
|
|
||||||
|
uci set network.client.ifname="$SWITCHDEV.1 bat0"
|
||||||
|
|
||||||
|
uci set network.ethmesh.ifname="$SWITCHDEV.3"
|
||||||
|
|
||||||
|
if [ "$WANDEV" = "$SWITCHDEV" ]; then
|
||||||
|
uci set network.wan.ifname=$WANDEV.2
|
||||||
|
else
|
||||||
|
uci set network.wan.ifname=$WANDEV
|
||||||
fi
|
fi
|
||||||
else
|
|
||||||
if ! uci -q get network.$SWITCHDEV > /dev/null ; then
|
|
||||||
|
|
||||||
if [ "$DSA" = "1" ]; then
|
uci commit network
|
||||||
uci set network.$SWITCHDEV=device
|
fi
|
||||||
uci set network.$SWITCHDEV.name=$SWITCHDEV
|
|
||||||
uci set network.$SWITCHDEV.type=bridge
|
|
||||||
# temporary workaround for netifd bug present in OpenWrt 21.02.0 (FS#4104)
|
|
||||||
uci set network.$SWITCHDEV.bridge_empty='1'
|
|
||||||
|
|
||||||
uci set network.${SWITCHDEV}_1=bridge-vlan
|
if [ "$ONE_PORT" = "YES" ] && ( ! uci -q get network.$SWITCHDEV.ifname || [ "$FORCEPARSE" = '1' ] ) ; then
|
||||||
uci set network.${SWITCHDEV}_1.device=$SWITCHDEV
|
uci set network.$SWITCHDEV=interface
|
||||||
uci set network.${SWITCHDEV}_1.vlan=1
|
uci set network.$SWITCHDEV.ifname=$SWITCHDEV
|
||||||
uci set network.${SWITCHDEV}_1.ports="$CLIENT_PORTS"
|
if [ "$ETHMODE" = "WAN" ]; then
|
||||||
|
uci set network.client.ifname="bat0"
|
||||||
if [ "$WANDEV" = "$SWITCHDEV" ] || ! [ -z "$WAN_PORTS" ]; then
|
uci set network.wan.ifname="$WANDEV"
|
||||||
uci set network.${SWITCHDEV}_2=bridge-vlan
|
uci del network.ethmesh.ifname
|
||||||
uci set network.${SWITCHDEV}_2.device=$SWITCHDEV
|
uci del network.eth0.macaddr
|
||||||
uci set network.${SWITCHDEV}_2.vlan=2
|
elif [ "$ETHMODE" = "CLIENT" ] ; then
|
||||||
uci set network.${SWITCHDEV}_2.ports="$WAN_PORTS"
|
uci set network.client.ifname="bat0 $SWITCHDEV"
|
||||||
fi
|
uci set network.wan.ifname="eth2" #eth2 because it is default in config file
|
||||||
|
uci del network.ethmesh.ifname
|
||||||
uci set network.${SWITCHDEV}_3=bridge-vlan
|
uci del network.eth0.macaddr
|
||||||
uci set network.${SWITCHDEV}_3.device=$SWITCHDEV
|
elif [ "$ETHMODE" = "BATMAN" ] ; then
|
||||||
uci set network.${SWITCHDEV}_3.vlan=3
|
uci set network.client.ifname="bat0"
|
||||||
uci set network.${SWITCHDEV}_3.ports="$BATMAN_PORTS"
|
uci set network.wan.ifname="eth2" #eth2 because it is default in config file
|
||||||
else
|
uci set network.ethmesh.ifname="$SWITCHDEV"
|
||||||
SWITCHHW=$(swconfig list | awk '{ print $4 }')
|
ETH0MAC="w2ap"
|
||||||
|
|
||||||
uci set network.$SWITCHDEV=switch
|
|
||||||
uci set network.$SWITCHDEV.name=$SWITCHHW
|
|
||||||
uci set network.$SWITCHDEV.enable=1
|
|
||||||
uci set network.$SWITCHDEV.reset=1
|
|
||||||
uci set network.$SWITCHDEV.enable_vlan=1
|
|
||||||
|
|
||||||
uci set network.${SWITCHDEV}_1=switch_vlan
|
|
||||||
uci set network.${SWITCHDEV}_1.device=$SWITCHHW
|
|
||||||
uci set network.${SWITCHDEV}_1.vlan=1
|
|
||||||
uci set network.${SWITCHDEV}_1.ports="$CLIENT_PORTS"
|
|
||||||
|
|
||||||
if [ "$WANDEV" = "$SWITCHDEV" ] || [ -n "$WAN_PORTS" ]; then
|
|
||||||
uci set network.${SWITCHDEV}_2=switch_vlan
|
|
||||||
uci set network.${SWITCHDEV}_2.device=$SWITCHHW
|
|
||||||
uci set network.${SWITCHDEV}_2.vlan=2
|
|
||||||
uci set network.${SWITCHDEV}_2.ports="$WAN_PORTS"
|
|
||||||
fi
|
|
||||||
|
|
||||||
uci set network.${SWITCHDEV}_3=switch_vlan
|
|
||||||
uci set network.${SWITCHDEV}_3.device=$SWITCHHW
|
|
||||||
uci set network.${SWITCHDEV}_3.vlan=3
|
|
||||||
uci set network.${SWITCHDEV}_3.ports="$BATMAN_PORTS"
|
|
||||||
fi
|
|
||||||
|
|
||||||
uci set network.client.ifname="$SWITCHDEV.1 bat0"
|
|
||||||
|
|
||||||
uci set network.ethmesh.ifname="$SWITCHDEV.3"
|
|
||||||
|
|
||||||
if [ "$WANDEV" = "$SWITCHDEV" ]; then
|
|
||||||
uci set network.wan.ifname=$WANDEV.2
|
|
||||||
else
|
|
||||||
uci set network.wan.ifname=$WANDEV
|
|
||||||
fi
|
|
||||||
|
|
||||||
uci commit network
|
|
||||||
fi
|
fi
|
||||||
|
uci commit network
|
||||||
fi
|
fi
|
||||||
|
|
||||||
/etc/init.d/network restart
|
/etc/init.d/network restart
|
||||||
|
@ -211,14 +172,14 @@ if [ -n "$ROUTERMAC" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "$ETH0MAC" ]; then
|
if [ -n "$ETH0MAC" ]; then
|
||||||
echo "Fixing MAC on $ETH0DEV"
|
echo "Fixing MAC on eth0"
|
||||||
sleep 10
|
sleep 10
|
||||||
NEW_MACADDR=$(cat "/sys/class/net/${ETH0MAC}/address")
|
NEW_MACADDR=$(cat "/sys/class/net/${ETH0MAC}/address")
|
||||||
uci set network.$ETH0DEV.macaddr=$NEW_MACADDR
|
uci set network.eth0.macaddr=$NEW_MACADDR
|
||||||
uci commit network
|
uci commit network
|
||||||
ifconfig $ETH0DEV down
|
ifconfig eth0 down
|
||||||
ifconfig $ETH0DEV hw ether $NEW_MACADDR
|
ifconfig eth0 hw ether $NEW_MACADDR
|
||||||
ifconfig $ETH0DEV up
|
ifconfig eth0 up
|
||||||
/etc/init.d/network restart
|
/etc/init.d/network restart
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -239,6 +200,8 @@ else
|
||||||
addr=$(owipcalc "$prefix" add "::$(ipMacSuffix "$ROUTERMAC")")
|
addr=$(owipcalc "$prefix" add "::$(ipMacSuffix "$ROUTERMAC")")
|
||||||
ip -6 addr add $addr dev br-client
|
ip -6 addr add $addr dev br-client
|
||||||
|
|
||||||
|
uci -q del network.globals
|
||||||
|
uci -q set network.globals=globals
|
||||||
uci -q set network.globals.ula_prefix=$prefix
|
uci -q set network.globals.ula_prefix=$prefix
|
||||||
uci -q add_list network.client.ip6addr=$addr
|
uci -q add_list network.client.ip6addr=$addr
|
||||||
uci -q set network.client.proto=static
|
uci -q set network.client.proto=static
|
||||||
|
|
|
@ -0,0 +1,20 @@
|
||||||
|
. /lib/functions/fff/network
|
||||||
|
|
||||||
|
PORTORDER="5 4"
|
||||||
|
|
||||||
|
WANDEV=eth0
|
||||||
|
SWITCHDEV=eth0
|
||||||
|
CLIENT_PORTS="0t"
|
||||||
|
WAN_PORTS="0t"
|
||||||
|
BATMAN_PORTS="0t"
|
||||||
|
|
||||||
|
# use mac address from phy0 with 'locally administered' bit set to '1'
|
||||||
|
# only possible, because wXmesh is created first and therefore gets the 'universally administered address'
|
||||||
|
|
||||||
|
ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/ieee80211/phy0/macaddress)")
|
||||||
|
ROUTERMAC=$(cat /sys/class/net/eth0/address)
|
||||||
|
|
||||||
|
. /etc/network.mode
|
||||||
|
|
||||||
|
LAN0PORT=5
|
||||||
|
LAN1PORT=4
|
|
@ -0,0 +1,20 @@
|
||||||
|
. /lib/functions/fff/network
|
||||||
|
|
||||||
|
PORTORDER="5 4"
|
||||||
|
|
||||||
|
WANDEV=eth0
|
||||||
|
SWITCHDEV=eth0
|
||||||
|
CLIENT_PORTS="0t"
|
||||||
|
WAN_PORTS="0t"
|
||||||
|
BATMAN_PORTS="0t"
|
||||||
|
|
||||||
|
# use mac address from phy0 with 'locally administered' bit set to '1'
|
||||||
|
# only possible, because wXmesh is created first and therefore gets the 'universally administered address'
|
||||||
|
|
||||||
|
ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/ieee80211/phy0/macaddress)")
|
||||||
|
ROUTERMAC=$(cat /sys/class/net/eth0/address)
|
||||||
|
|
||||||
|
. /etc/network.mode
|
||||||
|
|
||||||
|
LAN0PORT=5
|
||||||
|
LAN1PORT=4
|
|
@ -1,12 +1,15 @@
|
||||||
. /lib/functions/fff/network
|
. /lib/functions/fff/network
|
||||||
|
|
||||||
|
PORTORDER="1"
|
||||||
|
|
||||||
WANDEV=eth1
|
WANDEV=eth1
|
||||||
SWITCHDEV=eth0
|
SWITCHDEV=eth0
|
||||||
WAN_PORTS=
|
WAN_PORTS=
|
||||||
BATMAN_PORTS="0t"
|
BATMAN_PORTS="0t"
|
||||||
CLIENT_PORTS="0t"
|
CLIENT_PORTS="0t"
|
||||||
|
|
||||||
ETHMESHMAC="$(macFlipLocalBit $(cat /sys/class/net/eth0/address))"
|
ROUTERMAC=$(cat /sys/class/net/eth0/address)
|
||||||
|
ETHMESHMAC="$(macFlipLocalBit "$ROUTERMAC")"
|
||||||
|
|
||||||
. /etc/network.mode
|
. /etc/network.mode
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
PORTORDER="4 3 2 1"
|
||||||
|
|
||||||
WANDEV=eth1
|
WANDEV=eth1
|
||||||
SWITCHDEV=eth0
|
SWITCHDEV=eth0
|
||||||
CLIENT_PORTS="1 2 0t"
|
CLIENT_PORTS="1 2 0t"
|
||||||
|
@ -5,3 +7,4 @@ WAN_PORTS=""
|
||||||
BATMAN_PORTS="3 4 0t"
|
BATMAN_PORTS="3 4 0t"
|
||||||
|
|
||||||
ETHMESHMAC=$(cat /sys/class/net/eth0/address)
|
ETHMESHMAC=$(cat /sys/class/net/eth0/address)
|
||||||
|
ROUTERMAC=$(cat /sys/class/net/eth1/address)
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
|
PORTORDER="4 3 2 1"
|
||||||
|
|
||||||
WANDEV=eth1
|
WANDEV=eth1
|
||||||
SWITCHDEV=eth0
|
SWITCHDEV=eth0
|
||||||
CLIENT_PORTS="1 2 0t"
|
CLIENT_PORTS="1 2 0t"
|
||||||
BATMAN_PORTS="3 4 0t"
|
BATMAN_PORTS="3 4 0t"
|
||||||
|
|
||||||
ETHMESHMAC=$(cat /sys/class/net/eth1/address)
|
ETHMESHMAC=$(cat /sys/class/net/eth1/address)
|
||||||
|
ROUTERMAC=$(cat /sys/class/net/eth0/address)
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
|
PORTORDER="4 3 2 1"
|
||||||
|
|
||||||
WANDEV=eth1
|
WANDEV=eth1
|
||||||
SWITCHDEV=eth0
|
SWITCHDEV=eth0
|
||||||
CLIENT_PORTS="1 2 0t"
|
CLIENT_PORTS="1 2 0t"
|
||||||
BATMAN_PORTS="3 4 0t"
|
BATMAN_PORTS="3 4 0t"
|
||||||
|
|
||||||
ETHMESHMAC=$(cat /sys/class/net/eth1/address)
|
ETHMESHMAC=$(cat /sys/class/net/eth1/address)
|
||||||
|
ROUTERMAC=$(cat /sys/class/net/eth0/address)
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue