From 9cf3cd8e43b557bc0e888142d517c53d9cbb544b Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven.eckelmann@gmx.de>
Date: Mon, 9 Aug 2010 23:56:38 +0200
Subject: [PATCH] --- yaml --- r: 209919 b: refs/heads/master c:
 466122df80e447883588ffcf9d21b88152934819 h: refs/heads/master i:   209917:
 21beaa65d014157bf17eccf948487ce78c9c52ae   209915:
 ed54ebeb4aa4939d2c20dcaead465a3c699939b3   209911:
 38ec5e9bc02014a89a50e83d0fa30670505ee377   209903:
 0ab833fb47a97757fa556782b4736e79adc3d616   209887:
 55a9af8df1d28dc10b55aa5433ab47568682971c   209855:
 3a90429bb112c4f5ff29a8079a677905b575fc82   209791:
 a7e46a4f4e72c8832068d32ff29e402774cb64f1   209663:
 715826f480c9f00e542488fab23b393d17be0634   209407:
 824dce00acc2d2c332c689c7ee55bcbb25e736e4   208895:
 b84e94ade56ddd4edbdd07cdf14a6a78a875719b v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/staging/batman-adv/bat_sysfs.c      | 4 ++++
 trunk/drivers/staging/batman-adv/hard-interface.c | 8 --------
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index cb0484cbebdd..a8878f0711f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49b48547724eca062aec13a3bfd621194836513b
+refs/heads/master: 466122df80e447883588ffcf9d21b88152934819
diff --git a/trunk/drivers/staging/batman-adv/bat_sysfs.c b/trunk/drivers/staging/batman-adv/bat_sysfs.c
index b4a8d5eb64fa..05ca15a6c9f8 100644
--- a/trunk/drivers/staging/batman-adv/bat_sysfs.c
+++ b/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;
 }
diff --git a/trunk/drivers/staging/batman-adv/hard-interface.c b/trunk/drivers/staging/batman-adv/hard-interface.c
index 92c216a56885..f6345c465eb3 100644
--- a/trunk/drivers/staging/batman-adv/hard-interface.c
+++ b/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) {