projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'hsi-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
[deliverable/linux.git]
/
net
/
batman-adv
/
gateway_common.c
diff --git
a/net/batman-adv/gateway_common.c
b/net/batman-adv/gateway_common.c
index 4423047889e1e6483d62602ff4d9334a6516b908..d7bc6a87bcc914de8d131d78bc417ba6d6bf9668 100644
(file)
--- a/
net/batman-adv/gateway_common.c
+++ b/
net/batman-adv/gateway_common.c
@@
-19,8
+19,8
@@
#include "main.h"
#include <linux/atomic.h>
#include "main.h"
#include <linux/atomic.h>
-#include <linux/errno.h>
#include <linux/byteorder/generic.h>
#include <linux/byteorder/generic.h>
+#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/math64.h>
#include <linux/netdevice.h>
#include <linux/kernel.h>
#include <linux/math64.h>
#include <linux/netdevice.h>
@@
-28,7
+28,9
@@
#include <linux/string.h>
#include "gateway_client.h"
#include <linux/string.h>
#include "gateway_client.h"
+#include "log.h"
#include "packet.h"
#include "packet.h"
+#include "tvlv.h"
/**
* batadv_parse_throughput - parse supplied string buffer to extract throughput
/**
* batadv_parse_throughput - parse supplied string buffer to extract throughput
@@
-144,7
+146,7
@@
void batadv_gw_tvlv_container_update(struct batadv_priv *bat_priv)
u32 down, up;
char gw_mode;
u32 down, up;
char gw_mode;
- gw_mode = atomic_read(&bat_priv->gw
_
mode);
+ gw_mode = atomic_read(&bat_priv->gw
.
mode);
switch (gw_mode) {
case BATADV_GW_MODE_OFF:
switch (gw_mode) {
case BATADV_GW_MODE_OFF:
@@
-241,8
+243,8
@@
static void batadv_gw_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,
/* restart gateway selection if fast or late switching was enabled */
if ((gateway.bandwidth_down != 0) &&
/* restart gateway selection if fast or late switching was enabled */
if ((gateway.bandwidth_down != 0) &&
- (atomic_read(&bat_priv->gw
_
mode) == BATADV_GW_MODE_CLIENT) &&
- (atomic_read(&bat_priv->gw
_
sel_class) > 2))
+ (atomic_read(&bat_priv->gw
.
mode) == BATADV_GW_MODE_CLIENT) &&
+ (atomic_read(&bat_priv->gw
.
sel_class) > 2))
batadv_gw_check_election(bat_priv, orig);
}
batadv_gw_check_election(bat_priv, orig);
}
This page took
0.026634 seconds
and
5
git commands to generate.