---

yaml
---
r: 209919
b: refs/heads/master
c: 466122d
h: refs/heads/master
i:
  209917: 21beaa6
  209915: ed54ebe
  209911: 38ec5e9
  209903: 0ab833f
  209887: 55a9af8
  209855: 3a90429
  209791: a7e46a4
  209663: 715826f
  209407: 824dce0
  208895: b84e94a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49b48547724eca062aec13a3bfd621194836513b
+refs/heads/master: 466122df80e447883588ffcf9d21b88152934819

trunk/drivers/staging/batman-adv/bat_sysfs.c

@@ -267,6 +267,10 @@ static ssize_t store_log_level(struct kobject *kobj, struct attribute *attr,
 	if (atomic_read(&bat_priv->log_level) == log_level_tmp)
 		return count;
 
+	bat_info(net_dev, "Changing log level from: %i to: %li\n",
+		 atomic_read(&bat_priv->log_level),
+		 log_level_tmp);
+
 	atomic_set(&bat_priv->log_level, (unsigned)log_level_tmp);
 	return count;
 }

trunk/drivers/staging/batman-adv/hard-interface.c

@@ -442,8 +442,6 @@ int batman_skb_recv(struct sk_buff *skb, struct net_device *dev,
 	struct bat_priv *bat_priv = netdev_priv(soft_device);
 	struct batman_packet *batman_packet;
 	struct batman_if *batman_if;
-	struct net_device_stats *stats;
-	struct rtnl_link_stats64 temp;
 	int ret;
 
 	skb = skb_share_check(skb, GFP_ATOMIC);
@@ -479,12 +477,6 @@ int batman_skb_recv(struct sk_buff *skb, struct net_device *dev,
 	if (batman_if->if_status != IF_ACTIVE)
 		goto err_free;
 
-	stats = (struct net_device_stats *)dev_get_stats(skb->dev, &temp);
-	if (stats) {
-		stats->rx_packets++;
-		stats->rx_bytes += skb->len;
-	}
-
 	batman_packet = (struct batman_packet *)skb->data;
 
 	if (batman_packet->version != COMPAT_VERSION) {