diff options
| author | David S. Miller <davem@davemloft.net> | 2011-06-09 14:56:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-09 14:56:13 -0700 |
| commit | 6018e1183ba52735d47e8c183497d8598da75351 (patch) | |
| tree | 3e9be6d850e292274ff05744ce36431492b975c7 /net/batman-adv/gateway_client.c | |
| parent | 075cd29e307720dfde5b67d1715a102473bf4623 (diff) | |
| parent | ecbd532108cb21d9d3770f73e168bad65d14d9eb (diff) | |
| download | linux-6018e1183ba52735d47e8c183497d8598da75351.tar.gz linux-6018e1183ba52735d47e8c183497d8598da75351.tar.bz2 linux-6018e1183ba52735d47e8c183497d8598da75351.zip | |
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
Diffstat (limited to 'net/batman-adv/gateway_client.c')
| -rw-r--r-- | net/batman-adv/gateway_client.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index ab597c4f9ddd..24aee561f3d8 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -322,7 +322,7 @@ void gw_node_update(struct bat_priv *bat_priv, gw_node->deleted = 0; - if (new_gwflags == 0) { + if (new_gwflags == NO_FLAGS) { gw_node->deleted = jiffies; bat_dbg(DBG_BATMAN, bat_priv, "Gateway %pM removed from gateway list\n", @@ -335,7 +335,7 @@ void gw_node_update(struct bat_priv *bat_priv, goto unlock; } - if (new_gwflags == 0) + if (new_gwflags == NO_FLAGS) goto unlock; gw_node_add(bat_priv, orig_node, new_gwflags); @@ -352,7 +352,7 @@ unlock: void gw_node_delete(struct bat_priv *bat_priv, struct orig_node *orig_node) { - return gw_node_update(bat_priv, orig_node, 0); + gw_node_update(bat_priv, orig_node, 0); } void gw_node_purge(struct bat_priv *bat_priv) |