From: David S. Miller <davem@davemloft.net>
Date: Thu, 23 Mar 2017 22:11:56 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v4.12-rc1~108^2~346
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=16ae1f223601c44e5cb65c99257ffae003504704;p=karo-tx-linux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/ethernet/broadcom/genet/bcmmii.c
	drivers/net/hyperv/netvsc.c
	kernel/bpf/hashtab.c

Almost entirely overlapping changes.

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

16ae1f223601c44e5cb65c99257ffae003504704
diff --cc drivers/net/ethernet/broadcom/genet/bcmmii.c
index 8df47c90cfc5,2f9281936f0e..285676f8da6b
--- a/drivers/net/ethernet/broadcom/genet/bcmmii.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c
@@@ -195,49 -195,31 +195,33 @@@ void bcmgenet_phy_power_set(struct net_
  	u32 reg = 0;
  
  	/* EXT_GPHY_CTRL is only valid for GENETv4 and onward */
 -	if (!GENET_IS_V4(priv))
 -		return;
 -
 -	reg = bcmgenet_ext_readl(priv, EXT_GPHY_CTRL);
 -	if (enable) {
 -		reg &= ~EXT_CK25_DIS;
 -		bcmgenet_ext_writel(priv, reg, EXT_GPHY_CTRL);
 -		mdelay(1);
 -
 -		reg &= ~(EXT_CFG_IDDQ_BIAS | EXT_CFG_PWR_DOWN);
 -		reg |= EXT_GPHY_RESET;
 +	if (GENET_IS_V4(priv)) {
 +		reg = bcmgenet_ext_readl(priv, EXT_GPHY_CTRL);
 +		if (enable) {
 +			reg &= ~EXT_CK25_DIS;
 +			bcmgenet_ext_writel(priv, reg, EXT_GPHY_CTRL);
 +			mdelay(1);
 +
 +			reg &= ~(EXT_CFG_IDDQ_BIAS | EXT_CFG_PWR_DOWN);
 +			reg |= EXT_GPHY_RESET;
 +			bcmgenet_ext_writel(priv, reg, EXT_GPHY_CTRL);
 +			mdelay(1);
 +
 +			reg &= ~EXT_GPHY_RESET;
 +		} else {
 +			reg |= EXT_CFG_IDDQ_BIAS | EXT_CFG_PWR_DOWN |
 +			       EXT_GPHY_RESET;
 +			bcmgenet_ext_writel(priv, reg, EXT_GPHY_CTRL);
 +			mdelay(1);
 +			reg |= EXT_CK25_DIS;
 +		}
  		bcmgenet_ext_writel(priv, reg, EXT_GPHY_CTRL);
 -		mdelay(1);
 -
 -		reg &= ~EXT_GPHY_RESET;
 +		udelay(60);
  	} else {
 -		reg |= EXT_CFG_IDDQ_BIAS | EXT_CFG_PWR_DOWN | EXT_GPHY_RESET;
 -		bcmgenet_ext_writel(priv, reg, EXT_GPHY_CTRL);
  		mdelay(1);
 -		reg |= EXT_CK25_DIS;
  	}
 -	bcmgenet_ext_writel(priv, reg, EXT_GPHY_CTRL);
 -	udelay(60);
  }
  
- static void bcmgenet_internal_phy_setup(struct net_device *dev)
- {
- 	struct bcmgenet_priv *priv = netdev_priv(dev);
- 	u32 reg;
- 
- 	/* Power up PHY */
- 	bcmgenet_phy_power_set(dev, true);
- 	if (!GENET_IS_V5(priv)) {
- 		/* enable APD */
- 		reg = bcmgenet_ext_readl(priv, EXT_EXT_PWR_MGMT);
- 		reg |= EXT_PWR_DN_EN_LD;
- 		bcmgenet_ext_writel(priv, reg, EXT_EXT_PWR_MGMT);
- 	}
- 	bcmgenet_mii_reset(dev);
- }
- 
  static void bcmgenet_moca_phy_setup(struct bcmgenet_priv *priv)
  {
  	u32 reg;
diff --cc kernel/bpf/hashtab.c
index 343fb5394c95,361a69dfe543..d5b0623ce87d
--- a/kernel/bpf/hashtab.c
+++ b/kernel/bpf/hashtab.c
@@@ -609,20 -582,7 +616,15 @@@ static void htab_elem_free_rcu(struct r
  
  static void free_htab_elem(struct bpf_htab *htab, struct htab_elem *l)
  {
 +	struct bpf_map *map = &htab->map;
 +
 +	if (map->ops->map_fd_put_ptr) {
 +		void *ptr = fd_htab_map_get_ptr(map, l);
 +
 +		map->ops->map_fd_put_ptr(ptr);
 +	}
 +
- 	if (l->state == HTAB_EXTRA_ELEM_USED) {
- 		l->state = HTAB_EXTRA_ELEM_FREE;
- 		return;
- 	}
- 
- 	if (!(htab->map.map_flags & BPF_F_NO_PREALLOC)) {
+ 	if (htab_is_prealloc(htab)) {
  		pcpu_freelist_push(&htab->freelist, &l->fnode);
  	} else {
  		atomic_dec(&htab->count);