diff options
| author | David S. Miller <davem@davemloft.net> | 2016-07-04 23:33:59 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-07-04 23:33:59 -0700 |
| commit | b77af26a790a2ecfdd4109a3b1328499ea988181 (patch) | |
| tree | 6e192798c8d05bfc04d27aa94dc51a6407801c63 /net/batman-adv/bat_v_elp.h | |
| parent | 5ee389751922a497d38c4750c5cbe6223873c24c (diff) | |
| parent | 29824a55c07cd79a530d4bc1020a529c402515b6 (diff) | |
Merge tag 'batadv-next-for-davem-20160704' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says:
====================
This feature patchset includes the following changes:
- Cleanup work by Markus Pargmann and Sven Eckelmann (six patches)
- Initial Netlink support by Matthias Schiffer (two patches)
- Throughput Meter implementation by Antonio Quartulli, a kernel-space
traffic generator to estimate link speeds. This feature is useful on
low-end WiFi APs where running iperf or netperf from userspace
gives wrong results due to heavy userspace/kernelspace overhead.
(two patches)
- API clean-up work by Antonio Quartulli (one patch)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/bat_v_elp.h')
| -rw-r--r-- | net/batman-adv/bat_v_elp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/batman-adv/bat_v_elp.h b/net/batman-adv/bat_v_elp.h index cc130b2d05e5..be17c0b1369e 100644 --- a/net/batman-adv/bat_v_elp.h +++ b/net/batman-adv/bat_v_elp.h @@ -15,11 +15,11 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "main.h" - #ifndef _NET_BATMAN_ADV_BAT_V_ELP_H_ #define _NET_BATMAN_ADV_BAT_V_ELP_H_ +#include "main.h" + struct sk_buff; struct work_struct; |