* [B.A.T.M.A.N.] [PATCH 30/31] batman-adv: packet.h, add some missing includes
2014-12-02 11:16 [B.A.T.M.A.N.] [PATCH 00/31] batman-adv: Cleanups Markus Pargmann
@ 2014-12-02 11:16 ` Markus Pargmann
0 siblings, 0 replies; 6+ messages in thread
From: Markus Pargmann @ 2014-12-02 11:16 UTC (permalink / raw)
To: Marek Lindner, Simon Wunderlich, Antonio Quartulli; +Cc: b.a.t.m.a.n
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
packet.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/packet.h b/packet.h
index facd1feddd4e..cbf1a9140d5e 100644
--- a/packet.h
+++ b/packet.h
@@ -18,6 +18,9 @@
#ifndef _NET_BATMAN_ADV_PACKET_H_
#define _NET_BATMAN_ADV_PACKET_H_
+#include <linux/bitops.h>
+#include <uapi/linux/if_ether.h>
+
/**
* enum batadv_packettype - types for batman-adv encapsulated packets
* @BATADV_IV_OGM: originator messages for B.A.T.M.A.N. IV
--
2.1.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [B.A.T.M.A.N.] [PATCH 30/31] batman-adv: packet.h, add some missing includes
@ 2014-12-02 13:03 Sven Eckelmann
2014-12-02 13:57 ` Markus Pargmann
2014-12-02 16:22 ` Markus Pargmann
0 siblings, 2 replies; 6+ messages in thread
From: Sven Eckelmann @ 2014-12-02 13:03 UTC (permalink / raw)
To: b.a.t.m.a.n
[-- Attachment #1: Type: text/plain, Size: 350 bytes --]
Hi,
please explain how this file can now be used unmodified in userspace (batctl)
and kernel. If it cannot be done without modifying the file then please
provide patches to modify the daily checks which make sure that the files in
both repos are the same. I think the batman-adv developers can give you the
original scripts.
Kind regards,
Sven
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [B.A.T.M.A.N.] [PATCH 30/31] batman-adv: packet.h, add some missing includes
2014-12-02 13:03 [B.A.T.M.A.N.] [PATCH 30/31] batman-adv: packet.h, add some missing includes Sven Eckelmann
@ 2014-12-02 13:57 ` Markus Pargmann
2014-12-02 14:09 ` Sven Eckelmann
2014-12-02 16:22 ` Markus Pargmann
1 sibling, 1 reply; 6+ messages in thread
From: Markus Pargmann @ 2014-12-02 13:57 UTC (permalink / raw)
To: Sven Eckelmann; +Cc: b.a.t.m.a.n
[-- Attachment #1: Type: text/plain, Size: 886 bytes --]
On Tue, Dec 02, 2014 at 02:03:16PM +0100, Sven Eckelmann wrote:
> Hi,
>
> please explain how this file can now be used unmodified in userspace (batctl)
> and kernel. If it cannot be done without modifying the file then please
> provide patches to modify the daily checks which make sure that the files in
> both repos are the same. I think the batman-adv developers can give you the
> original scripts.
I wasn't aware that this file is also used in batctl. Why is it needed
there?
Probably I should have a look into the batctl sources.
Thanks,
Markus
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [B.A.T.M.A.N.] [PATCH 30/31] batman-adv: packet.h, add some missing includes
2014-12-02 13:57 ` Markus Pargmann
@ 2014-12-02 14:09 ` Sven Eckelmann
2014-12-02 15:30 ` Markus Pargmann
0 siblings, 1 reply; 6+ messages in thread
From: Sven Eckelmann @ 2014-12-02 14:09 UTC (permalink / raw)
To: Markus Pargmann; +Cc: b.a.t.m.a.n
[-- Attachment #1: Type: text/plain, Size: 1378 bytes --]
On Tuesday 02 December 2014 14:57:03 Markus Pargmann wrote:
> On Tue, Dec 02, 2014 at 02:03:16PM +0100, Sven Eckelmann wrote:
> > Hi,
> >
> > please explain how this file can now be used unmodified in userspace
> > (batctl) and kernel. If it cannot be done without modifying the file then
> > please provide patches to modify the daily checks which make sure that
> > the files in both repos are the same. I think the batman-adv developers
> > can give you the original scripts.
>
> I wasn't aware that this file is also used in batctl. Why is it needed
> there?
> Probably I should have a look into the batctl sources.
It is used for things like the tcpdump, ping and traceroute. In the past (svn
times) it was just a links from batctl to batman-adv. But after the switch to
git it was decided that both should be kept in sync manually but checked
automatically.
I would like to give you the mini-check script but I don't have it. And I
don't have access to the servers anymore. But it is basically checkout of
master, maint and next of batctl+batman-adv and some calls to cmp (or diff?)
to check if both files are the same. A mail is sent [1] to a mailing list.
Someone has to merge the missing changes manually.
Btw. thanks for taking your time to cleanup things.
Kind regards,
Sven
[1] https://lists.open-mesh.org/pipermail/linux-merge/2014-March/001736.html
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [B.A.T.M.A.N.] [PATCH 30/31] batman-adv: packet.h, add some missing includes
2014-12-02 14:09 ` Sven Eckelmann
@ 2014-12-02 15:30 ` Markus Pargmann
0 siblings, 0 replies; 6+ messages in thread
From: Markus Pargmann @ 2014-12-02 15:30 UTC (permalink / raw)
To: Sven Eckelmann; +Cc: b.a.t.m.a.n
[-- Attachment #1: Type: text/plain, Size: 1900 bytes --]
On Tue, Dec 02, 2014 at 03:09:52PM +0100, Sven Eckelmann wrote:
> On Tuesday 02 December 2014 14:57:03 Markus Pargmann wrote:
> > On Tue, Dec 02, 2014 at 02:03:16PM +0100, Sven Eckelmann wrote:
> > > Hi,
> > >
> > > please explain how this file can now be used unmodified in userspace
> > > (batctl) and kernel. If it cannot be done without modifying the file then
> > > please provide patches to modify the daily checks which make sure that
> > > the files in both repos are the same. I think the batman-adv developers
> > > can give you the original scripts.
> >
> > I wasn't aware that this file is also used in batctl. Why is it needed
> > there?
> > Probably I should have a look into the batctl sources.
>
> It is used for things like the tcpdump, ping and traceroute. In the past (svn
> times) it was just a links from batctl to batman-adv. But after the switch to
> git it was decided that both should be kept in sync manually but checked
> automatically.
>
> I would like to give you the mini-check script but I don't have it. And I
> don't have access to the servers anymore. But it is basically checkout of
> master, maint and next of batctl+batman-adv and some calls to cmp (or diff?)
> to check if both files are the same. A mail is sent [1] to a mailing list.
> Someone has to merge the missing changes manually.
Thanks for the clarification. I will have a look at compile issues for
batctl. Until now I only worked with the batman tree imported into my
linux tree so all my kernel tools are still working.
Best regards,
Markus
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [B.A.T.M.A.N.] [PATCH 30/31] batman-adv: packet.h, add some missing includes
2014-12-02 13:03 [B.A.T.M.A.N.] [PATCH 30/31] batman-adv: packet.h, add some missing includes Sven Eckelmann
2014-12-02 13:57 ` Markus Pargmann
@ 2014-12-02 16:22 ` Markus Pargmann
1 sibling, 0 replies; 6+ messages in thread
From: Markus Pargmann @ 2014-12-02 16:22 UTC (permalink / raw)
To: Sven Eckelmann; +Cc: b.a.t.m.a.n
[-- Attachment #1: Type: text/plain, Size: 838 bytes --]
On Tue, Dec 02, 2014 at 02:03:16PM +0100, Sven Eckelmann wrote:
> Hi,
>
> please explain how this file can now be used unmodified in userspace (batctl)
> and kernel. If it cannot be done without modifying the file then please
> provide patches to modify the daily checks which make sure that the files in
> both repos are the same. I think the batman-adv developers can give you the
> original scripts.
I added an ifdef __KERNEL__ around the includes which should work for
the userspace.
Regards,
Markus
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-12-02 16:22 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-02 13:03 [B.A.T.M.A.N.] [PATCH 30/31] batman-adv: packet.h, add some missing includes Sven Eckelmann
2014-12-02 13:57 ` Markus Pargmann
2014-12-02 14:09 ` Sven Eckelmann
2014-12-02 15:30 ` Markus Pargmann
2014-12-02 16:22 ` Markus Pargmann
-- strict thread matches above, loose matches on Subject: below --
2014-12-02 11:16 [B.A.T.M.A.N.] [PATCH 00/31] batman-adv: Cleanups Markus Pargmann
2014-12-02 11:16 ` [B.A.T.M.A.N.] [PATCH 30/31] batman-adv: packet.h, add some missing includes Markus Pargmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).