* 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
* [B.A.T.M.A.N.] [PATCH 00/31] batman-adv: Cleanups
@ 2014-12-02 11:16 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
0 siblings, 1 reply; 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
Hi,
this series contains some major cleanup patches (at the beginning of the
series) and some minor cleanups at the end of the series. The behavior of
batman should not be influenced by this series as these patches are only
transformations to make the code more readable and maintainable. If it does
influence behavior something is wrong with this series. The series was tested
on ARM SoC with mwifiex driver.
Major changes (Patch 1-12):
- Compiling debugfs.c only when CONFIG_DEBUG_FS is selected. This reduces the
amount of unnecessary code that is executed. At the moment all calls to
debugfs functions will result in NOOPs. However there is some more code that
we simply don't need without DEBUG_FS.
- tvlv is separated from the large main.c file into its own tvlv.c. I don't
see a reason to have this set of functions for tvlv inside the main.c file.
- The hashtable implementation now has accessor functions to avoid direct
access on the private hashtable structure. This should improve the hashtable
interface and create proper encapsulation.
Minor changes (Patch 13-31):
- Removing unnecessary return value variables
- Fixing some comments
- Reordering functions to increase readability
- Coding style fixes
- Declare boolean return types as bool
- Add missing includes
Best Regards,
Markus
Markus Pargmann (31):
batman-adv: debugfs, avoid compiling for !DEBUG_FS
batman-adv: Separate logging header
batman-adv: iv_ogm, Reduce code duplication
batman-adv: iv_ogm, divide and round for ring buffer avg
batman-adv: init, Add some error handling
batman-adv: tvlv realloc, move error handling into if block
batman-adv: split tvlv into a seperate file
batman-adv: hash, remove function implementations from header
batman-adv: hash, Add helper functions
batman-adv: hash, replace direct hash structure accesses
batman-adv: hash, make struct hashtable private
batman-adv: hash, add used linux headers
batman-adv: Makefile, Sort alphabetically
batman-adv: iv_ogm_iface_enable, direct return values
batman-adv: iv_ogm_aggr_packet, bool return value
batman-adv: iv_ogm_send_to_if, declare char* as const
batman-adv: iv_ogm_can_aggregate, code readability
batman-adv: iv_ogm_orig_update, remove unnecessary brackets
batman-adv: iv_ogm_aggregate_new, simplify error handling
batman-adv: iv_ogm_queue_add, Simplify expressions
batman-adv: iv_ogm_orig_update, style, add missin brackets
batman-adv: iv_ogm, Fix dup_status comment
batman-adv: iv_ogm, fix coding style
batman-adv: iv_ogm, fix comment function name
batman-adv: types, Fix comment on bcast_own
batman-adv: main, Convert is_my_mac() to bool
batman-adv: main, batadv_compare_eth return bool
batman-adv: Remove unnecessary ret variable
batman-adv: Remove unnecessary ret variable in algo_register
batman-adv: packet.h, add some missing includes
batman-adv: types.h, add missing include
Makefile.kbuild | 5 +-
bat_iv_ogm.c | 247 +++++++++----------
bitarray.c | 1 +
bridge_loop_avoidance.c | 58 +++--
debugfs.c | 9 +-
debugfs.h | 39 +++
distributed-arp-table.c | 28 ++-
gateway_client.c | 1 +
gateway_common.c | 2 +
hard-interface.c | 1 +
hash.c | 163 +++++++++++++
hash.h | 164 ++-----------
icmp_socket.c | 1 +
log.h | 82 +++++++
main.c | 626 +++---------------------------------------------
main.h | 101 +-------
multicast.c | 1 +
network-coding.c | 38 +--
originator.c | 29 +--
originator.h | 4 +-
packet.h | 3 +
routing.c | 2 +
send.c | 1 +
sysfs.c | 1 +
translation-table.c | 90 ++++---
tvlv.c | 592 +++++++++++++++++++++++++++++++++++++++++++++
tvlv.h | 62 +++++
types.h | 8 +-
28 files changed, 1266 insertions(+), 1093 deletions(-)
create mode 100644 log.h
create mode 100644 tvlv.c
create mode 100644 tvlv.h
--
2.1.3
^ 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).