From: David S. Miller <davem@davemloft.net>
Date: Sat, 13 Oct 2018 04:38:46 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d864991b220b7c62e81d21209e1fd978fd67352c;p=linux.git

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

Conflicts were easy to resolve using immediate context mostly,
except the cls_u32.c one where I simply too the entire HEAD
chunk.

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

d864991b220b7c62e81d21209e1fd978fd67352c
diff --cc drivers/net/ethernet/amazon/ena/ena_eth_com.c
index 6f8e15b9b3cf7,2b3ff0c201553..f6c2d3855be83
--- a/drivers/net/ethernet/amazon/ena/ena_eth_com.c
+++ b/drivers/net/ethernet/amazon/ena/ena_eth_com.c
@@@ -349,14 -245,11 +349,14 @@@ static inline void ena_com_rx_set_flags
  		(cdesc->status & ENA_ETH_IO_RX_CDESC_BASE_L4_PROTO_IDX_MASK) >>
  		ENA_ETH_IO_RX_CDESC_BASE_L4_PROTO_IDX_SHIFT;
  	ena_rx_ctx->l3_csum_err =
- 		(cdesc->status & ENA_ETH_IO_RX_CDESC_BASE_L3_CSUM_ERR_MASK) >>
- 		ENA_ETH_IO_RX_CDESC_BASE_L3_CSUM_ERR_SHIFT;
+ 		!!((cdesc->status & ENA_ETH_IO_RX_CDESC_BASE_L3_CSUM_ERR_MASK) >>
+ 		ENA_ETH_IO_RX_CDESC_BASE_L3_CSUM_ERR_SHIFT);
  	ena_rx_ctx->l4_csum_err =
- 		(cdesc->status & ENA_ETH_IO_RX_CDESC_BASE_L4_CSUM_ERR_MASK) >>
- 		ENA_ETH_IO_RX_CDESC_BASE_L4_CSUM_ERR_SHIFT;
+ 		!!((cdesc->status & ENA_ETH_IO_RX_CDESC_BASE_L4_CSUM_ERR_MASK) >>
+ 		ENA_ETH_IO_RX_CDESC_BASE_L4_CSUM_ERR_SHIFT);
 +	ena_rx_ctx->l4_csum_checked =
 +		!!((cdesc->status & ENA_ETH_IO_RX_CDESC_BASE_L4_CSUM_CHECKED_MASK) >>
 +		ENA_ETH_IO_RX_CDESC_BASE_L4_CSUM_CHECKED_SHIFT);
  	ena_rx_ctx->hash = cdesc->hash;
  	ena_rx_ctx->frag =
  		(cdesc->status & ENA_ETH_IO_RX_CDESC_BASE_IPV4_FRAG_MASK) >>
diff --cc drivers/net/wireless/mediatek/mt76/usb.c
index 6b643ea701e38,79e59f2379a26..6a255643c1f0b
--- a/drivers/net/wireless/mediatek/mt76/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/usb.c
@@@ -523,10 -463,9 +523,10 @@@ static int mt76u_alloc_rx(struct mt76_d
  	struct mt76_queue *q = &dev->q_rx[MT_RXQ_MAIN];
  	int i, err, nsgs;
  
 +	spin_lock_init(&q->rx_page_lock);
  	spin_lock_init(&q->lock);
- 	q->entry = devm_kzalloc(dev->dev,
- 				MT_NUM_RX_ENTRIES * sizeof(*q->entry),
+ 	q->entry = devm_kcalloc(dev->dev,
+ 				MT_NUM_RX_ENTRIES, sizeof(*q->entry),
  				GFP_KERNEL);
  	if (!q->entry)
  		return -ENOMEM;
@@@ -753,10 -715,10 +753,10 @@@ static int mt76u_alloc_tx(struct mt76_d
  		q = &dev->q_tx[i];
  		spin_lock_init(&q->lock);
  		INIT_LIST_HEAD(&q->swq);
 -		q->hw_idx = q2hwq(i);
 +		q->hw_idx = mt76_ac_to_hwq(i);
  
- 		q->entry = devm_kzalloc(dev->dev,
- 					MT_NUM_TX_ENTRIES * sizeof(*q->entry),
+ 		q->entry = devm_kcalloc(dev->dev,
+ 					MT_NUM_TX_ENTRIES, sizeof(*q->entry),
  					GFP_KERNEL);
  		if (!q->entry)
  			return -ENOMEM;
diff --cc net/rxrpc/input.c
index 5b2626929822b,570b49d2da427..9128aa0e40aac
--- a/net/rxrpc/input.c
+++ b/net/rxrpc/input.c
@@@ -259,9 -262,11 +262,11 @@@ static bool rxrpc_rotate_tx_window(stru
  	while (list) {
  		skb = list;
  		list = skb->next;
 -		skb->next = NULL;
 +		skb_mark_not_on_list(skb);
  		rxrpc_free_skb(skb, rxrpc_skb_tx_freed);
  	}
+ 
+ 	return rot_last;
  }
  
  /*
diff --cc net/sched/cls_u32.c
index ac79a40a0392a,b2c3406a2cf29..4b28fd44576dd
--- a/net/sched/cls_u32.c
+++ b/net/sched/cls_u32.c
@@@ -390,7 -396,9 +390,8 @@@ static int u32_init(struct tcf_proto *t
  	tp_c->refcnt++;
  	RCU_INIT_POINTER(root_ht->next, tp_c->hlist);
  	rcu_assign_pointer(tp_c->hlist, root_ht);
 -	root_ht->tp_c = tp_c;
  
+ 	root_ht->refcnt++;
  	rcu_assign_pointer(tp->root, root_ht);
  	tp->data = tp_c;
  	return 0;