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

Commit ab1623da authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'master' into upstream

parents 5b85f29c dc710afe

drivers/net/myri10ge/myri10ge.c

+1 −1
Original line number Diff line number Diff line
@@ -620,7 +620,7 @@ static int myri10ge_load_firmware(struct myri10ge_priv *mgp) 
		return -ENXIO;

	}

	dev_info(&mgp->pdev->dev, "handoff confirmed\n");

	myri10ge_dummy_rdma(mgp, mgp->tx.boundary != 4096);

	myri10ge_dummy_rdma(mgp, 1);



	return 0;

}

drivers/net/skge.c

+1 −4
Original line number Diff line number Diff line
@@ -516,10 +516,7 @@ static int skge_set_pauseparam(struct net_device *dev, 
/* Chip internal frequency for clock calculations */

static inline u32 hwkhz(const struct skge_hw *hw)

{

	if (hw->chip_id == CHIP_ID_GENESIS)

		return 53215; /* or:  53.125 MHz */

	else

		return 78215; /* or:  78.125 MHz */

	return (hw->chip_id == CHIP_ID_GENESIS) ? 53125 : 78125;

}



/* Chip HZ to microseconds */

drivers/net/via-velocity.c

+13 −4
Original line number Diff line number Diff line
@@ -2742,7 +2742,7 @@ static u32 check_connection_type(struct mac_regs __iomem * regs) 


	if (PHYSR0 & PHYSR0_SPDG)

		status |= VELOCITY_SPEED_1000;

	if (PHYSR0 & PHYSR0_SPD10)

	else if (PHYSR0 & PHYSR0_SPD10)

		status |= VELOCITY_SPEED_10;

	else

		status |= VELOCITY_SPEED_100;
@@ -2851,8 +2851,17 @@ static int velocity_get_settings(struct net_device *dev, struct ethtool_cmd *cmd 
	u32 status;

	status = check_connection_type(vptr->mac_regs);



	cmd->supported = SUPPORTED_TP | SUPPORTED_Autoneg | SUPPORTED_10baseT_Half | SUPPORTED_10baseT_Full | SUPPORTED_100baseT_Half | SUPPORTED_100baseT_Full | SUPPORTED_1000baseT_Half | SUPPORTED_1000baseT_Full;

	if (status & VELOCITY_SPEED_100)

	cmd->supported = SUPPORTED_TP |

			SUPPORTED_Autoneg |

			SUPPORTED_10baseT_Half |

			SUPPORTED_10baseT_Full |

			SUPPORTED_100baseT_Half |

			SUPPORTED_100baseT_Full |

			SUPPORTED_1000baseT_Half |

			SUPPORTED_1000baseT_Full;

	if (status & VELOCITY_SPEED_1000)

		cmd->speed = SPEED_1000;

	else if (status & VELOCITY_SPEED_100)

		cmd->speed = SPEED_100;

	else

		cmd->speed = SPEED_10;
@@ -2896,7 +2905,7 @@ static u32 velocity_get_link(struct net_device *dev) 
{

	struct velocity_info *vptr = netdev_priv(dev);

	struct mac_regs __iomem * regs = vptr->mac_regs;

	return BYTE_REG_BITS_IS_ON(PHYSR0_LINKGD, &regs->PHYSR0)  ? 0 : 1;

	return BYTE_REG_BITS_IS_ON(PHYSR0_LINKGD, &regs->PHYSR0) ? 1 : 0;

}



static void velocity_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)

drivers/net/wireless/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -447,6 +447,7 @@ config AIRO_CS 
	tristate "Cisco/Aironet 34X/35X/4500/4800 PCMCIA cards"

	depends on NET_RADIO && PCMCIA && (BROKEN || !M32R)

	select CRYPTO

	select CRYPTO_AES

	---help---

	  This is the standard Linux driver to support Cisco/Aironet PCMCIA

	  802.11 wireless cards.  This driver is the same as the Aironet

drivers/net/wireless/bcm43xx/bcm43xx_main.c

+1 −1
Original line number Diff line number Diff line
@@ -3701,7 +3701,7 @@ static void bcm43xx_ieee80211_set_security(struct net_device *net_dev, 
	}

	if (sec->flags & SEC_AUTH_MODE) {

		secinfo->auth_mode = sec->auth_mode;

		dprintk(", .auth_mode = %d\n", sec->auth_mode);

		dprintk(", .auth_mode = %d", sec->auth_mode);

	}

	dprintk("\n");

	if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED &&