Repository : ssh://git@diktynna/batman-adv
On branch : master
>---------------------------------------------------------------
commit eae8d31bba5f35daf2b6593a08fc4d755aab32fc
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Tue Mar 30 21:15:26 2021 +0200
batman-adv: Fix misspelled "wont"
checkpatch started to complain about the mispelling of:
CHECK: 'wont' may be misspelled - perhaps 'won't'?
#459: FILE: ./net/batman-adv/bat_iv_ogm.c:459:
+ * - the resulting packet wont be bigger than
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
eae8d31bba5f35daf2b6593a08fc4d755aab32fc
net/batman-adv/bat_iv_ogm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index a5e313cd..789f257b 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -456,7 +456,7 @@ batadv_iv_ogm_can_aggregate(const struct batadv_ogm_packet *new_bat_ogm_packet,
* if:
*
* - the send time is within our MAX_AGGREGATION_MS time
- * - the resulting packet wont be bigger than
+ * - the resulting packet won't be bigger than
* MAX_AGGREGATION_BYTES
* otherwise aggregation is not possible
*/
The annotated tag, v5.12-rc5 has been created
at 43362f7fcb8de2dc84d8c14583122e53e576ff7b (tag)
tagging a5e13c6df0e41702d2b2c77c8ad41677ebb065b3 (commit)
replaces v5.12-rc4
tagged by Linus Torvalds
on Sun Mar 28 15:48:16 2021 -0700
- Shortlog ------------------------------------------------------------
Linux 5.12-rc5
-----BEGIN PGP SIGNATURE-----
iQFRBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmBhB7AeHHRvcnZhbGRz
QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGCPUH+KKkSoOlN2YNu1oc
iy2nznwZoSQTk5ZLz7PypO/WWmmtgzudkObG7yqIURdrncsAkHR17Wu2P7rdBr1j
Ma+VhF9MQ+xx+r86upH7c3gYfhyfdUMvzuLy0rwLQ1Yrzrb7xFcVkj3BHk54TAQA
w05sRPuVJ3/c/HPYV2iXkkdnnMbXSTCebeDDwjFb9D3qagr4vcd/PjDHmGbfNF8R
o6gLpbK5Ly6ww1nth9gGGUjzrW95yVItvcroP6vQWljxhuy+NE1lXRm8LsGhxqtW
foFFptJup5nhSNJXWtQt/U3huVD6mZ3W3y9cOThPjXZRy2wva3I1IpBKoEFReUpG
/Tq8EA==
=tPUY
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
Repository : ssh://git@diktynna/batman-adv
On branch : master
>---------------------------------------------------------------
commit a1d7220e479b55e12c6c7f8b1bf58aaec4cb8a60
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Tue Mar 23 21:57:14 2021 +0100
batman-adv: Drop unused header preempt.h
The commit 9fc9079cdc15 ("batman-adv: Use netif_rx_any_context().") removed
the last user for a function declaration from linux/preempt.h. The include
should therefore be cleaned up.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
a1d7220e479b55e12c6c7f8b1bf58aaec4cb8a60
net/batman-adv/bridge_loop_avoidance.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
index bcd543ce..7dc133cf 100644
--- a/net/batman-adv/bridge_loop_avoidance.c
+++ b/net/batman-adv/bridge_loop_avoidance.c
@@ -25,7 +25,6 @@
#include <linux/lockdep.h>
#include <linux/netdevice.h>
#include <linux/netlink.h>
-#include <linux/preempt.h>
#include <linux/rculist.h>
#include <linux/rcupdate.h>
#include <linux/skbuff.h>
The annotated tag, batadv-next-pullrequest-20210312 has been deleted
was f4fcd301698069974936d0bb65bba2e2fa8bb1c8
-----------------------------------------------------------------------
tag batadv-next-pullrequest-20210312
There is only a single patch this time:
- Use netif_rx_any_context(), by Sebastian Andrzej Siewior
-----BEGIN PGP SIGNATURE-----
iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAmBLjJUWHHN3QHNpbW9u
d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoSb6EACfWUz38XgTB/qpmwzFLVj5ho7Z
NhkULQqwL8iGo/nOEImQP51wTXF4latraAUy2S188ZhOyZyHdpATL0u66/jIWblE
zsxxNulKWBycK641F1HMgd2NpgmdCDE7FWEh4IdOdAM8IoY36j2qCwDr1beK5/fN
N6OuJeELaXkCjCNzdTMaEO10yFujqNZ/eRGaC30UMBlqjBNsmzUlGNuMcdr54beq
lLJ4MRA4pX95v2iIzCECYOciw4kfZLtBgTKjq1dVXdDnUgSkAtbzEFDQDWok/8Ue
dwiGqZeyIXZgGdpiqftsaxEiTmSC9XsZNKU5gOhK0fXCW1blXtvEvcd76HkKvsTl
QyTZ9I2oPjkgki8x7t5EvBGyIbz+RW9p9LjfWtOjg12+VNzhQM0I+7H5hlVqeE9p
1owK2c5G9p25WwLC9lihAdtG2PStchx4Uv0JIAYyVzBi73nbKf2awArVU1X6iYFK
j/mAKNSVjXgbPDrjc9AATe+rtDud4e7qDr9VHJgwuW73LbifWM+d5bC5ile4aTxf
rpJzOg+Lo7bdEo3i3Zdzqii1Y1+4jh7diH4rhTr/pIbtrWd+y27c7tEOVsEkvIIn
Ty3frqi3ourKvR7rS21CaOn3srRgn8JUzhJrOnEjqYNxtcDmIrV3hMM1hN5aN8c5
nWKODAZQORbi1zAqyQ==
=HAr3
-----END PGP SIGNATURE-----
b1de0f01b0115575982cf24c88b35106449e9aa7 batman-adv: Use netif_rx_any_context().
-----------------------------------------------------------------------
--
linux integration
The annotated tag, v5.12-rc4 has been created
at ec10c44a332d761d6f30b5ea5f7111ce10cd98d6 (tag)
tagging 0d02ec6b3136c73c09e7859f0d0e4e2c4c07b49b (commit)
replaces v5.12-rc3
tagged by Linus Torvalds
on Sun Mar 21 14:56:43 2021 -0700
- Shortlog ------------------------------------------------------------
Linux 5.12-rc4
-----BEGIN PGP SIGNATURE-----
iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmBXwRseHHRvcnZhbGRz
QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGX80H/2qQ49e2lbOfIqdR
CBThtgg89QmN9WPTfVhwB6b4vejB7kIiIpOPyJVkaio6lVe8Ewhl064fnGHwXm39
vPy0ZVAB96oaKaki6qi1k7jhCAMpl/vXf1RDe5PaEKPwp3Lr81BlY6dcTPbjxkFP
Uw+uC3iRQnT8msSqA1vnhbDl9w6jfmuxX45Eo9NWGz0hDCpZNOEt2oSo/OcXTH4k
c91FiW8Qv9uZX2tV4VSqFQgVPfneA+OWXMpjMg6kfK3jOJ5cZwmFGAa8ByqWACH/
U9OODYQCsyX5ZM11g7MOt7Iv+YSU8OA0We8KDN4cRZobrCHF0Txp3ZTSPjb/xHE3
9nUM50I=
=a6Go
-----END PGP SIGNATURE-----
Leon Romanovsky (1):
module: remove never implemented MODULE_SUPPORTED_DEVICE
-----------------------------------------------------------------------
--
linux integration
The annotated tag, v5.12-rc3 has been created
at a6d574dee98b6bc676391ba747e348b7705732c0 (tag)
tagging 1e28eed17697bcf343c6743f0028cc3b5dd88bf0 (commit)
replaces v5.12-rc2
tagged by Linus Torvalds
on Sun Mar 14 14:41:02 2021 -0700
- Shortlog ------------------------------------------------------------
Linux 5.12-rc3
-----BEGIN PGP SIGNATURE-----
iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmBOgu4eHHRvcnZhbGRz
QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGUd0H/3Ey8aWjVAig9Pe+
VQVZKwG+LXWH6UmUx5qyaTxophhmGnWLvkigJMn63qIg4eQtfp2gNFHK+T4OJNIP
ybnkjFZ337x4J9zD6m8mt4Wmelq9iW2wNOS+3YZAyYiGlXfMGM7SlYRCQRQznTED
2O/JCMsOoP+Z8tr5ah/bzs0dANsXmTZ3QqRP2uzb6irKTgFR3/weOhj+Ht1oJ4Aq
V+bgdcwhtk20hJhlvVeqws+o74LR789tTDCknlz/YNMv9e6VPfyIQ5vJAcFmZATE
Ezj9yzkZ4IU+Ux6ikAyaFyBU8d1a4Wqye3eHCZBsEo6tcSAhbTZ90eoU86vh6ajS
LZjwkNw=
=6y1u
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
The annotated tag, batadv-next-pullrequest-20210312 has been created
at f4fcd301698069974936d0bb65bba2e2fa8bb1c8 (tag)
tagging b1de0f01b0115575982cf24c88b35106449e9aa7 (commit)
replaces v5.11-rc1
tagged by Simon Wunderlich
on Fri Mar 12 16:45:25 2021 +0100
- Shortlog ------------------------------------------------------------
There is only a single patch this time:
- Use netif_rx_any_context(), by Sebastian Andrzej Siewior
-----BEGIN PGP SIGNATURE-----
iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAmBLjJUWHHN3QHNpbW9u
d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoSb6EACfWUz38XgTB/qpmwzFLVj5ho7Z
NhkULQqwL8iGo/nOEImQP51wTXF4latraAUy2S188ZhOyZyHdpATL0u66/jIWblE
zsxxNulKWBycK641F1HMgd2NpgmdCDE7FWEh4IdOdAM8IoY36j2qCwDr1beK5/fN
N6OuJeELaXkCjCNzdTMaEO10yFujqNZ/eRGaC30UMBlqjBNsmzUlGNuMcdr54beq
lLJ4MRA4pX95v2iIzCECYOciw4kfZLtBgTKjq1dVXdDnUgSkAtbzEFDQDWok/8Ue
dwiGqZeyIXZgGdpiqftsaxEiTmSC9XsZNKU5gOhK0fXCW1blXtvEvcd76HkKvsTl
QyTZ9I2oPjkgki8x7t5EvBGyIbz+RW9p9LjfWtOjg12+VNzhQM0I+7H5hlVqeE9p
1owK2c5G9p25WwLC9lihAdtG2PStchx4Uv0JIAYyVzBi73nbKf2awArVU1X6iYFK
j/mAKNSVjXgbPDrjc9AATe+rtDud4e7qDr9VHJgwuW73LbifWM+d5bC5ile4aTxf
rpJzOg+Lo7bdEo3i3Zdzqii1Y1+4jh7diH4rhTr/pIbtrWd+y27c7tEOVsEkvIIn
Ty3frqi3ourKvR7rS21CaOn3srRgn8JUzhJrOnEjqYNxtcDmIrV3hMM1hN5aN8c5
nWKODAZQORbi1zAqyQ==
=HAr3
-----END PGP SIGNATURE-----
Sebastian Andrzej Siewior (1):
batman-adv: Use netif_rx_any_context().
Simon Wunderlich (1):
batman-adv: Start new development cycle
Sven Eckelmann (3):
batman-adv: Drop publication years from copyright info
batman-adv: Avoid sizeof on flexible structure
batman-adv: Fix names for kernel-doc blocks
-----------------------------------------------------------------------
--
linux integration
Repository : ssh://git@diktynna/batman-adv
On branch : master
>---------------------------------------------------------------
commit 9fc9079cdc159be4b89c385a34de2c70b6e9fb8d
Author: Sebastian Andrzej Siewior <bigeasy(a)linutronix.de>
Date: Sat Feb 13 18:02:04 2021 +0100
batman-adv: Use netif_rx_any_context().
The usage of in_interrupt() in non-core code is phased out. Ideally the
information of the calling context should be passed by the callers or the
functions be split as appropriate.
The attempt to consolidate the code by passing an arguemnt or by
distangling it failed due lack of knowledge about this driver and because
the call chains are hard to follow.
As a stop gap use netif_rx_any_context() which invokes the correct code path
depending on context and confines the in_interrupt() usage to core code.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy(a)linutronix.de>
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
9fc9079cdc159be4b89c385a34de2c70b6e9fb8d
compat-include/linux/netdevice.h | 13 +++++++++++++
net/batman-adv/bridge_loop_avoidance.c | 5 +----
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/compat-include/linux/netdevice.h b/compat-include/linux/netdevice.h
index d6342f94..8f01b48f 100644
--- a/compat-include/linux/netdevice.h
+++ b/compat-include/linux/netdevice.h
@@ -54,4 +54,17 @@ static inline void batadv_netif_trans_update(struct net_device *dev)
#endif /* LINUX_VERSION_IS_LESS(4, 11, 9) */
+#if LINUX_VERSION_IS_LESS(5, 10, 0)
+
+#define netif_rx_any_context batadv_netif_rx_any_context
+static inline int batadv_netif_rx_any_context(struct sk_buff *skb)
+{
+ if (in_interrupt())
+ return netif_rx(skb);
+ else
+ return netif_rx_ni(skb);
+}
+
+#endif /* LINUX_VERSION_IS_LESS(5, 10, 0) */
+
#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_NETDEVICE_H_ */
diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
index 360bdbf4..bcd543ce 100644
--- a/net/batman-adv/bridge_loop_avoidance.c
+++ b/net/batman-adv/bridge_loop_avoidance.c
@@ -438,10 +438,7 @@ static void batadv_bla_send_claim(struct batadv_priv *bat_priv, u8 *mac,
batadv_add_counter(bat_priv, BATADV_CNT_RX_BYTES,
skb->len + ETH_HLEN);
- if (in_interrupt())
- netif_rx(skb);
- else
- netif_rx_ni(skb);
+ netif_rx_any_context(skb);
out:
if (primary_if)
batadv_hardif_put(primary_if);
The branch, batadv/net-next-old has been created
at 8b00bf1999c65de9c5c20d4a573a1fd615956a73 (commit)
- Shortlog ------------------------------------------------------------
commit 8b00bf1999c65de9c5c20d4a573a1fd615956a73
Author: Sebastian Andrzej Siewior <bigeasy(a)linutronix.de>
Date: Sat Feb 13 18:02:04 2021 +0100
batman-adv: Use netif_rx_any_context().
The usage of in_interrupt() in non-core code is phased out. Ideally the
information of the calling context should be passed by the callers or the
functions be split as appropriate.
The attempt to consolidate the code by passing an arguemnt or by
distangling it failed due lack of knowledge about this driver and because
the call chains are hard to follow.
As a stop gap use netif_rx_any_context() which invokes the correct code path
depending on context and confines the in_interrupt() usage to core code.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy(a)linutronix.de>
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de>
commit fc8377df3a05ee25f8f00cb9baa4e5b25d790bd7
Author: Simon Wunderlich <sw(a)simonwunderlich.de>
Date: Sat Feb 13 18:07:30 2021 +0100
batman-adv: Start new development cycle
This version will contain all the (major or even only minor) changes for
Linux 5.13.
The version number isn't a semantic version number with major and minor
information. It is just encoding the year of the expected publishing as
Linux -rc1 and the number of published versions this year (starting at 0).
Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de>
-----------------------------------------------------------------------
--
linux integration