diff options
| author | David S. Miller <davem@davemloft.net> | 2017-06-13 19:47:16 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-13 19:47:16 +0200 |
| commit | 5952b0200e9a0b0bfcc367d03a8caeb53e42545e (patch) | |
| tree | d339d5b64e8f71831f945d2768f128b873465e6d /include/net | |
| parent | net: phy: Make phy_ethtool_ksettings_get return void (diff) | |
| parent | batman-adv: Accept only filled wifi station info (diff) | |
| download | linux-5952b0200e9a0b0bfcc367d03a8caeb53e42545e.tar.xz linux-5952b0200e9a0b0bfcc367d03a8caeb53e42545e.zip | |
Merge tag 'batadv-next-for-davem-20170613' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says:
====================
This feature/cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich
- decrease maximum fragment size, by Matthias Schiffer
- Clean up seqfile writing, by Markus Elfring (2 patches)
- use __func__ in debug messages, by Sven Eckelmann
- Mark tpmeter initializers with __init, by Antonio Quartulli
- ignore loop detection MAC addresses, by Simon Wunderlich
- clean up some return handling, by Simon Wunderlich
- improve ELP throughput value handling for WiFi neighbors
in BATMAN V/ELP, by Sven Eckelmann (2 patches)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
0 files changed, 0 insertions, 0 deletions