projects
/
feed
/
routing.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1033 from ecsv/batadv-2023.3
[feed/routing.git]
/
batman-adv
/
patches
/
0001-Revert-batman-adv-Migrate-to-linux-container_of.h.patch
diff --git
a/batman-adv/patches/0001-Revert-batman-adv-Migrate-to-linux-container_of.h.patch
b/batman-adv/patches/0001-Revert-batman-adv-Migrate-to-linux-container_of.h.patch
index fbf1ef6a32620f12114b022cd5548ca1b3bab4ec..466ce1ace7080bb9c8c633c7d62a56074d67b5f5 100644
(file)
--- a/
batman-adv/patches/0001-Revert-batman-adv-Migrate-to-linux-container_of.h.patch
+++ b/
batman-adv/patches/0001-Revert-batman-adv-Migrate-to-linux-container_of.h.patch
@@
-117,10
+117,10
@@
This reverts commit 043ae5634bdfd4c4dd8b95a22890752495080bb5.
#include <linux/gfp.h>
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
#include <linux/gfp.h>
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
-@@ -9,12 +9,12 @@
-
+@@ -10,12 +10,12 @@
#include <linux/atomic.h>
#include <linux/byteorder/generic.h>
#include <linux/atomic.h>
#include <linux/byteorder/generic.h>
+ #include <linux/compiler.h>
-#include <linux/container_of.h>
#include <linux/errno.h>
#include <linux/gfp.h>
-#include <linux/container_of.h>
#include <linux/errno.h>
#include <linux/gfp.h>