hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ar8216: factor out info whether switch should be configured at probe stage to ar8xxx_chip 

Factor out info whether switch should be configured at probe stage
to ar8xxx_chip. Remove related chip_is_... checks.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43466 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
John Crispin 2014-12-01 16:14:32 +00:00
parent a425f991ec
commit 5a3c2d9aa7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target/linux/generic/files/drivers/net/phy/ar8216.c
View File

@ -70,6 +70,7 @@ struct ar8xxx_mib_desc {
struct ar8xxx_chip { struct ar8xxx_chip {
unsigned long caps; unsigned long caps;
bool config_at_probe;
int (*hw_init)(struct ar8xxx_priv *priv); int (*hw_init)(struct ar8xxx_priv *priv);
void (*cleanup)(struct ar8xxx_priv *priv); void (*cleanup)(struct ar8xxx_priv *priv);
@ -1821,6 +1822,7 @@ ar8327_setup_port(struct ar8xxx_priv *priv, int port, u32 members)
static const struct ar8xxx_chip ar8327_chip = { static const struct ar8xxx_chip ar8327_chip = {
.caps = AR8XXX_CAP_GIGE | AR8XXX_CAP_MIB_COUNTERS, .caps = AR8XXX_CAP_GIGE | AR8XXX_CAP_MIB_COUNTERS,
.config_at_probe = true,
.hw_init = ar8327_hw_init, .hw_init = ar8327_hw_init,
.cleanup = ar8327_cleanup, .cleanup = ar8327_cleanup,
.init_globals = ar8327_init_globals, .init_globals = ar8327_init_globals,
@ -2797,7 +2799,7 @@ ar8xxx_phy_config_init(struct phy_device *phydev)
if (WARN_ON(!priv)) if (WARN_ON(!priv))
return -ENODEV; return -ENODEV;
if (chip_is_ar8327(priv) || chip_is_ar8337(priv)) if (priv->chip->config_at_probe)
return ar8xxx_phy_check_aneg(phydev); return ar8xxx_phy_check_aneg(phydev);
priv->phy = phydev; priv->phy = phydev;
@ -2973,7 +2975,7 @@ found:
phydev->advertising = ADVERTISED_100baseT_Full; phydev->advertising = ADVERTISED_100baseT_Full;
} }
if (chip_is_ar8327(priv) || chip_is_ar8337(priv)) { if (priv->chip->config_at_probe) {
priv->phy = phydev; priv->phy = phydev;
ret = ar8xxx_start(priv); ret = ar8xxx_start(priv);