diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-03-02 21:58:02 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-03-02 21:58:03 -0800 |
| commit | fa452e0a609a038e5ef9d2e042bb80e08e1af7af (patch) | |
| tree | cf14c19820d8d3d7b24801d471356e2c0d5c8c62 /net/batman-adv/send.c | |
| parent | a577223a97df241df26b91a95d03eec8c9fe0b36 (diff) | |
| parent | 6ee3c393eeb7d16a3c228c4fa23913b76c7e7df3 (diff) | |
| download | linux-fa452e0a609a038e5ef9d2e042bb80e08e1af7af.tar.gz linux-fa452e0a609a038e5ef9d2e042bb80e08e1af7af.tar.bz2 linux-fa452e0a609a038e5ef9d2e042bb80e08e1af7af.zip | |
Merge tag 'batadv-next-pullrequest-20220302' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says:
====================
This cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich
- Remove redundant 'flush_workqueue()' calls, by Christophe JAILLET
- Migrate to linux/container_of.h, by Sven Eckelmann
- Demote batadv-on-batadv skip error message, by Sven Eckelmann
* tag 'batadv-next-pullrequest-20220302' of git://git.open-mesh.org/linux-merge:
batman-adv: Demote batadv-on-batadv skip error message
batman-adv: Migrate to linux/container_of.h
batman-adv: Remove redundant 'flush_workqueue()' calls
batman-adv: Start new development cycle
====================
Link: https://lore.kernel.org/r/20220302163522.102842-1-sw@simonwunderlich.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/batman-adv/send.c')
| -rw-r--r-- | net/batman-adv/send.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 477d85a3b558..0379b126865d 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -10,13 +10,13 @@ #include <linux/atomic.h> #include <linux/bug.h> #include <linux/byteorder/generic.h> +#include <linux/container_of.h> #include <linux/errno.h> #include <linux/etherdevice.h> #include <linux/gfp.h> #include <linux/if.h> #include <linux/if_ether.h> #include <linux/jiffies.h> -#include <linux/kernel.h> #include <linux/kref.h> #include <linux/list.h> #include <linux/netdevice.h> |