diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-11-19 11:11:52 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-11-19 11:11:52 -0500 |
| commit | adda306744ec64c7bcd6c230a6bc060fb77bd7c3 (patch) | |
| tree | a9c4722291c9af0cb3e1a58474fdc6f37cc5554f | |
| parent | net: macb: add check for dma mapping error in start_xmit() (diff) | |
| parent | batman-adv: Detect missing primaryif during tp_send as error (diff) | |
| download | linux-dev-adda306744ec64c7bcd6c230a6bc060fb77bd7c3.tar.xz linux-dev-adda306744ec64c7bcd6c230a6bc060fb77bd7c3.zip | |
Merge tag 'batadv-net-for-davem-20161119' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says:
====================
Here are two batman-adv bugfix patches:
- Revert a splat on disabling interface which created another problem,
by Sven Eckelmann
- Fix error handling when the primary interface disappears during a
throughput meter test, by Sven Eckelmann
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/batman-adv/hard-interface.c | 1 | ||||
| -rw-r--r-- | net/batman-adv/tp_meter.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index e034afbd1bb0..08ce36147c4c 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -652,6 +652,7 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface, batadv_softif_destroy_sysfs(hard_iface->soft_iface); } + hard_iface->soft_iface = NULL; batadv_hardif_put(hard_iface); out: diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c index 2333777f919d..8af1611b8ab2 100644 --- a/net/batman-adv/tp_meter.c +++ b/net/batman-adv/tp_meter.c @@ -837,6 +837,7 @@ static int batadv_tp_send(void *arg) primary_if = batadv_primary_if_get_selected(bat_priv); if (unlikely(!primary_if)) { err = BATADV_TP_REASON_DST_UNREACHABLE; + tp_vars->reason = err; goto out; } |