diff options
| author | David S. Miller <davem@davemloft.net> | 2018-07-18 14:46:57 +0900 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-18 14:46:57 +0900 |
| commit | c0b78038a8477bf0e3368988a3ff63f668cd27db (patch) | |
| tree | 4af2814f977809125d0730d81050569b1884e774 /net/batman-adv/bat_iv_ogm.h | |
| parent | fa52531eb4409a1fc0cc11ac37e249088d3561c7 (diff) | |
| parent | 993a4a5f7cd3aef53be3953d11f86b2d3630ebb8 (diff) | |
Merge tag 'batadv-next-for-davem-20180717' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says:
====================
This feature/cleanup patchset includes the following patches:
- Don't call BATMAN_V experimental in Kconfig anymore, by Sven Eckelmann
- Enable DAT by default at compile time, by Antonio Quartulli
- Remove obsolete default n in Kconfig, by Sven Eckelmann
- Fix checkpatch spelling errors, by Sven Eckelmann
- Unify header guards style, by Sven Eckelmann
- Consolidate batadv_purge_orig functions, by Sven Eckelmann
- Replace type define with proper typedef, by Sven Eckelmann
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/bat_iv_ogm.h')
| -rw-r--r-- | net/batman-adv/bat_iv_ogm.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/batman-adv/bat_iv_ogm.h b/net/batman-adv/bat_iv_ogm.h index 317cafd302cf..3dc6a7a43eb7 100644 --- a/net/batman-adv/bat_iv_ogm.h +++ b/net/batman-adv/bat_iv_ogm.h @@ -16,11 +16,11 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef _BATMAN_ADV_BATADV_IV_OGM_H_ -#define _BATMAN_ADV_BATADV_IV_OGM_H_ +#ifndef _NET_BATMAN_ADV_BAT_IV_OGM_H_ +#define _NET_BATMAN_ADV_BAT_IV_OGM_H_ #include "main.h" int batadv_iv_init(void); -#endif /* _BATMAN_ADV_BATADV_IV_OGM_H_ */ +#endif /* _NET_BATMAN_ADV_BAT_IV_OGM_H_ */ |