linux-toradex.git/net/batman-adv/soft-interface.c, branch v4.17-rc7

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2018-03-06T06:20:46+00:00

All of the conflicts were cases of overlapping changes.

In net/core/devlink.c, we have to make care that the
resouce size_params have become a struct member rather
than a pointer to such an object.

Signed-off-by: David S. Miller

batman-adv: Update copyright years for 2018

2018-02-26T16:57:39+00:00

Signed-off-by: Sven Eckelmann 
Signed-off-by: Simon Wunderlich

batman-adv: fix packet checksum in receive path

2018-02-25T19:00:44+00:00

eth_type_trans() internally calls skb_pull(), which does not adjust the
skb checksum; skb_postpull_rcsum() is necessary to avoid log spam of the
form "bat0: hw csum failure" when packets with CHECKSUM_COMPLETE are
received.

Note that in usual setups, packets don't reach batman-adv with
CHECKSUM_COMPLETE (I assume NICs bail out of checksumming when they see
batadv's ethtype?), which is why the log messages do not occur on every
system using batman-adv. I could reproduce this issue by stacking
batman-adv on top of a VXLAN interface.

Fixes: c6c8fea29769 ("net: Add batman-adv meshing protocol")
Tested-by: Maximilian Wilhelm 
Signed-off-by: Matthias Schiffer 
Signed-off-by: Sven Eckelmann 
Signed-off-by: Simon Wunderlich

batman-adv: Convert packet.h to uapi header

2017-12-21T20:35:53+00:00

The header file is used by different userspace programs to inject packets
or to decode sniffed packets. It should therefore be available to them as
userspace header.

Also other components in the kernel (like the flow dissector) require
access to the packet definitions to be able to decode ETH_P_BATMAN ethernet
packets.

Signed-off-by: Sven Eckelmann 
Signed-off-by: David S. Miller

batman-adv: Add kernel-doc to externally visible functions

2017-12-15T16:29:24+00:00

According to the kernel-doc documentation, externally visible functions
should be documented. This refers to all all non-static function which can
(and will) be used by functions in other sources files.

Signed-off-by: Sven Eckelmann 
Signed-off-by: Simon Wunderlich

batman-adv: Use parentheses in function kernel-doc

2017-12-15T16:29:20+00:00

The documentation describing kernel-doc comments for functions ("How to
format kernel-doc comments") uses parentheses at the end of the function
name. Using this format allows to use a consistent style when adding
documentation to a function and when referencing this function in a
different kernel-doc section.

Signed-off-by: Sven Eckelmann 
Signed-off-by: Simon Wunderlich

batman-adv: include gfp.h for GFP_* defines

2017-12-15T16:24:10+00:00

The linux/gfp.h provides the GFP_ATOMIC and GFP_KERNEL define. It should
therefore be included instead of linux/fs.h.

Signed-off-by: Sven Eckelmann 
Signed-off-by: Simon Wunderlich

batman-adv: Add SPDX license identifier above copyright header

2017-12-15T16:22:45+00:00

The "Linux kernel licensing rules" require that each file has a SPDX
license identifier as first line (and sometimes as second line).

The FSFE REUSE practices [1] would also require the same tags but have no
restrictions on the placement in the source file. Using the "Linux kernel
licensing rules" is therefore also fulfilling the FSFE REUSE practices
requirements at the same time.

[1] https://reuse.software/practices/

Signed-off-by: Sven Eckelmann 
Signed-off-by: Simon Wunderlich

batman-adv: Add missing kerneldoc for extack

2017-10-12T09:49:36+00:00

The parameter extack was added to batadv_softif_slave_add without adding
the kernel-doc for it. This caused kernel-doc warnings.

Signed-off-by: Sven Eckelmann 
Acked-by: David Ahern 
Signed-off-by: Simon Wunderlich

Merge tag 'batadv-next-for-davem-20171006' of git://git.open-mesh.org/linux-merge

2017-10-06T17:12:52+00:00

Simon Wunderlich says:

====================
This cleanup patchset includes the following patches:

 - bump version strings, by Simon Wunderlich

 - Cleanup patches to make checkpatch happy, by Sven Eckelmann (3 patches)
====================

Signed-off-by: David S. Miller