From: David S. Miller <davem@davemloft.net>
Date: Sat, 23 Jul 2016 23:31:37 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=de0ba9a0d8909996f9e293d311c2cc459fa77d67;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge git://git./linux/kernel/git/davem/net

Just several instances of overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

de0ba9a0d8909996f9e293d311c2cc459fa77d67
diff --cc drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
index f32e272c83dd,44cf16d01f42..bdda17d2ea0f
--- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
@@@ -1722,32 -1730,28 +1729,35 @@@ static int mlx4_en_set_channels(struct 
  	    !channel->tx_count || !channel->rx_count)
  		return -EINVAL;
  
 +	if (channel->tx_count * MLX4_EN_NUM_UP <= priv->xdp_ring_num) {
 +		en_err(priv, "Minimum %d tx channels required with XDP on\n",
 +		       priv->xdp_ring_num / MLX4_EN_NUM_UP + 1);
 +		return -EINVAL;
 +	}
 +
+ 	tmp = kzalloc(sizeof(*tmp), GFP_KERNEL);
+ 	if (!tmp)
+ 		return -ENOMEM;
+ 
  	mutex_lock(&mdev->state_lock);
+ 	memcpy(&new_prof, priv->prof, sizeof(struct mlx4_en_port_profile));
+ 	new_prof.num_tx_rings_p_up = channel->tx_count;
+ 	new_prof.tx_ring_num = channel->tx_count * MLX4_EN_NUM_UP;
+ 	new_prof.rx_ring_num = channel->rx_count;
+ 
+ 	err = mlx4_en_try_alloc_resources(priv, tmp, &new_prof);
+ 	if (err)
+ 		goto out;
+ 
  	if (priv->port_up) {
  		port_up = 1;
  		mlx4_en_stop_port(dev, 1);
  	}
  
- 	mlx4_en_free_resources(priv);
- 
- 	priv->num_tx_rings_p_up = channel->tx_count;
- 	priv->tx_ring_num = channel->tx_count * MLX4_EN_NUM_UP;
- 	priv->rx_ring_num = channel->rx_count;
- 
- 	err = mlx4_en_alloc_resources(priv);
- 	if (err) {
- 		en_err(priv, "Failed reallocating port resources\n");
- 		goto out;
- 	}
+ 	mlx4_en_safe_replace_resources(priv, tmp);
  
 -	netif_set_real_num_tx_queues(dev, priv->tx_ring_num);
 +	netif_set_real_num_tx_queues(dev, priv->tx_ring_num -
 +							priv->xdp_ring_num);
  	netif_set_real_num_rx_queues(dev, priv->rx_ring_num);
  
  	if (dev->num_tc)
diff --cc net/batman-adv/send.c
index 3a10d87b4b76,010397650fa5..6191159484df
--- a/net/batman-adv/send.c
+++ b/net/batman-adv/send.c
@@@ -435,11 -424,31 +435,11 @@@ int batadv_send_skb_via_gw(struct batad
  	struct batadv_orig_node *orig_node;
  
  	orig_node = batadv_gw_get_selected_orig(bat_priv);
- 	return batadv_send_skb_unicast(bat_priv, skb, BATADV_UNICAST, 0,
- 				       orig_node, vid);
+ 	return batadv_send_skb_unicast(bat_priv, skb, BATADV_UNICAST_4ADDR,
+ 				       BATADV_P_DATA, orig_node, vid);
  }
  
 -void batadv_schedule_bat_ogm(struct batadv_hard_iface *hard_iface)
 -{
 -	struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
 -
 -	if ((hard_iface->if_status == BATADV_IF_NOT_IN_USE) ||
 -	    (hard_iface->if_status == BATADV_IF_TO_BE_REMOVED))
 -		return;
 -
 -	/* the interface gets activated here to avoid race conditions between
 -	 * the moment of activating the interface in
 -	 * hardif_activate_interface() where the originator mac is set and
 -	 * outdated packets (especially uninitialized mac addresses) in the
 -	 * packet queue
 -	 */
 -	if (hard_iface->if_status == BATADV_IF_TO_BE_ACTIVATED)
 -		hard_iface->if_status = BATADV_IF_ACTIVE;
 -
 -	bat_priv->bat_algo_ops->bat_ogm_schedule(hard_iface);
 -}
 -
 -static void batadv_forw_packet_free(struct batadv_forw_packet *forw_packet)
 +void batadv_forw_packet_free(struct batadv_forw_packet *forw_packet)
  {
  	kfree_skb(forw_packet->skb);
  	if (forw_packet->if_incoming)
diff --cc net/sched/sch_htb.c
index 91982d9784b3,052f84d6cc23..53dbfa187870
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@@ -1113,22 -1136,18 +1113,24 @@@ static in
  htb_dump_class_stats(struct Qdisc *sch, unsigned long arg, struct gnet_dump *d)
  {
  	struct htb_class *cl = (struct htb_class *)arg;
 +	struct gnet_stats_queue qs = {
 +		.drops = cl->drops,
 +	};
  	__u32 qlen = 0;
  
 -	if (!cl->level && cl->un.leaf.q)
 +	if (!cl->level && cl->un.leaf.q) {
  		qlen = cl->un.leaf.q->q.qlen;
 +		qs.backlog = cl->un.leaf.q->qstats.backlog;
 +	}
- 	cl->xstats.tokens = PSCHED_NS2TICKS(cl->tokens);
- 	cl->xstats.ctokens = PSCHED_NS2TICKS(cl->ctokens);
+ 	cl->xstats.tokens = clamp_t(s64, PSCHED_NS2TICKS(cl->tokens),
+ 				    INT_MIN, INT_MAX);
+ 	cl->xstats.ctokens = clamp_t(s64, PSCHED_NS2TICKS(cl->ctokens),
+ 				     INT_MIN, INT_MAX);
  
 -	if (gnet_stats_copy_basic(d, NULL, &cl->bstats) < 0 ||
 +	if (gnet_stats_copy_basic(qdisc_root_sleeping_running(sch),
 +				  d, NULL, &cl->bstats) < 0 ||
  	    gnet_stats_copy_rate_est(d, NULL, &cl->rate_est) < 0 ||
 -	    gnet_stats_copy_queue(d, NULL, &cl->qstats, qlen) < 0)
 +	    gnet_stats_copy_queue(d, NULL, &qs, qlen) < 0)
  		return -1;
  
  	return gnet_stats_copy_app(d, &cl->xstats, sizeof(cl->xstats));