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

Commit 73186df8 authored by David S. Miller's avatar David S. Miller
Browse files

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



Minor overlapping changes in net/ipv4/ipmr.c, in 'net' we were
fixing the "BH-ness" of the counter bumps whilst in 'net-next'
the functions were modified to take an explicit 'net' parameter.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0c63d80c ebac62fe

drivers/isdn/i4l/isdn_ppp.c

+8 −4
Original line number Diff line number Diff line
@@ -301,6 +301,8 @@ isdn_ppp_open(int min, struct file *file) 
	is->compflags = 0;



	is->reset = isdn_ppp_ccp_reset_alloc(is);

	if (!is->reset)

		return -ENOMEM;



	is->lp = NULL;

	is->mp_seqno = 0;       /* MP sequence number */
@@ -320,6 +322,10 @@ isdn_ppp_open(int min, struct file *file) 
	 * VJ header compression init

	 */

	is->slcomp = slhc_init(16, 16);	/* not necessary for 2. link in bundle */

	if (IS_ERR(is->slcomp)) {

		isdn_ppp_ccp_reset_free(is);

		return PTR_ERR(is->slcomp);

	}

#endif

#ifdef CONFIG_IPPP_FILTER

	is->pass_filter = NULL;
@@ -567,10 +573,8 @@ isdn_ppp_ioctl(int min, struct file *file, unsigned int cmd, unsigned long arg) 
			is->maxcid = val;

#ifdef CONFIG_ISDN_PPP_VJ

			sltmp = slhc_init(16, val);

			if (!sltmp) {

				printk(KERN_ERR "ippp, can't realloc slhc struct\n");

				return -ENOMEM;

			}

			if (IS_ERR(sltmp))

				return PTR_ERR(sltmp);

			if (is->slcomp)

				slhc_free(is->slcomp);

			is->slcomp = sltmp;

drivers/net/can/dev.c

+1 −1
Original line number Diff line number Diff line
@@ -915,7 +915,7 @@ static int can_fill_info(struct sk_buff *skb, const struct net_device *dev) 
	     nla_put(skb, IFLA_CAN_BITTIMING_CONST,

		     sizeof(*priv->bittiming_const), priv->bittiming_const)) ||



	    nla_put(skb, IFLA_CAN_CLOCK, sizeof(cm), &priv->clock) ||

	    nla_put(skb, IFLA_CAN_CLOCK, sizeof(priv->clock), &priv->clock) ||

	    nla_put_u32(skb, IFLA_CAN_STATE, state) ||

	    nla_put(skb, IFLA_CAN_CTRLMODE, sizeof(cm), &cm) ||

	    nla_put_u32(skb, IFLA_CAN_RESTART_MS, priv->restart_ms) ||

drivers/net/ethernet/broadcom/genet/bcmgenet.c

+3 −1
Original line number Diff line number Diff line
@@ -1055,8 +1055,10 @@ static void bcmgenet_power_up(struct bcmgenet_priv *priv, 
	}



	bcmgenet_ext_writel(priv, reg, EXT_EXT_PWR_MGMT);

	if (mode == GENET_POWER_PASSIVE)

	if (mode == GENET_POWER_PASSIVE) {

		bcmgenet_phy_power_set(priv->dev, true);

		bcmgenet_mii_reset(priv->dev);

	}

}



/* ioctl handle special commands that are not present in ethtool. */

drivers/net/ethernet/broadcom/genet/bcmgenet.h

+1 −0
Original line number Diff line number Diff line
@@ -673,6 +673,7 @@ int bcmgenet_mii_init(struct net_device *dev); 
int bcmgenet_mii_config(struct net_device *dev);

int bcmgenet_mii_probe(struct net_device *dev);

void bcmgenet_mii_exit(struct net_device *dev);

void bcmgenet_mii_reset(struct net_device *dev);

void bcmgenet_phy_power_set(struct net_device *dev, bool enable);

void bcmgenet_mii_setup(struct net_device *dev);

drivers/net/ethernet/broadcom/genet/bcmmii.c

+18 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ void bcmgenet_mii_setup(struct net_device *dev) 
	phy_print_status(phydev);

}





static int bcmgenet_fixed_phy_link_update(struct net_device *dev,

					  struct fixed_phy_status *status)

{
@@ -172,6 +173,22 @@ static int bcmgenet_fixed_phy_link_update(struct net_device *dev, 
	return 0;

}



/* Perform a voluntary PHY software reset, since the EPHY is very finicky about

 * not doing it and will start corrupting packets

 */

void bcmgenet_mii_reset(struct net_device *dev)

{

	struct bcmgenet_priv *priv = netdev_priv(dev);



	if (GENET_IS_V4(priv))

		return;



	if (priv->phydev) {

		phy_init_hw(priv->phydev);

		phy_start_aneg(priv->phydev);

	}

}



void bcmgenet_phy_power_set(struct net_device *dev, bool enable)

{

	struct bcmgenet_priv *priv = netdev_priv(dev);
@@ -214,6 +231,7 @@ static void bcmgenet_internal_phy_setup(struct net_device *dev) 
	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)