Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 466122df authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Greg Kroah-Hartman
Browse files

Staging: batman-adv: Fix merge of linus tree 



Greg Kroah-Hartman merged Linus 2.6.36 tree in
e9563355 with his staging tree.
Different parts of the merge conflicts were resolved incorrectly and may
result in an abnormal behavior.

Signed-off-by: default avatarSven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 49b48547

drivers/staging/batman-adv/bat_sysfs.c

+4 −0
Original line number Diff line number Diff line
@@ -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;

}

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

+0 −8
Original line number Diff line number Diff line
@@ -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) {