Merge with upstream to accommodate with thermal changes

This merge is performed to take commit c56f5c0342dfee11a1 ("Thermal: Make
Thermal trip points writeable") out of Linus' tree and then fixup power
supply class. This is needed since thermal stuff added a new argument:

  CC      drivers/power/power_supply_core.o
drivers/power/power_supply_core.c: In function ‘psy_register_thermal’:
drivers/power/power_supply_core.c:204:6: warning: passing argument 3 of ‘thermal_zone_device_register’ makes integer from pointer without a cast [enabled by default]
include/linux/thermal.h:154:29: note: expected ‘int’ but argument is of type ‘struct power_supply *’
drivers/power/power_supply_core.c:204:6: error: too few arguments to function ‘thermal_zone_device_register’
include/linux/thermal.h:154:29: note: declared here
make[1]: *** [drivers/power/power_supply_core.o] Error 1
make: *** [drivers/power/] Error 2

Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>

1 files changed, 5 insertions, 1 deletions

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index 6e2530b02043..a0ec0e4ada4c 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -256,7 +256,11 @@ void interface_rx(struct net_device *soft_iface,
         struct bat_priv *bat_priv = netdev_priv(soft_iface);
         struct ethhdr *ethhdr;
         struct vlan_ethhdr *vhdr;
+        struct batman_header *batadv_header = (struct batman_header *)skb->data;
         short vid __maybe_unused = -1;
+        bool is_bcast;
+
+        is_bcast = (batadv_header->packet_type == BAT_BCAST);
 
         /* check if enough space is available for pulling, and pull */
         if (!pskb_may_pull(skb, hdr_size))
@@ -302,7 +306,7 @@ void interface_rx(struct net_device *soft_iface,
         /* Let the bridge loop avoidance check the packet. If will
          * not handle it, we can safely push it up.
          */
-        if (bla_rx(bat_priv, skb, vid))
+        if (bla_rx(bat_priv, skb, vid, is_bcast))
                 goto out;
 
         netif_rx(skb);