brcm47xx: refresh patches
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 41487
This commit is contained in:
parent
ba1b49dbab
commit
f95fc5b2d5
@ -18,7 +18,7 @@ Patchwork: http://patchwork.linux-mips.org/patch/6211/
|
||||
|
||||
--- a/arch/mips/bcm47xx/sprom.c
|
||||
+++ b/arch/mips/bcm47xx/sprom.c
|
||||
@@ -135,7 +135,7 @@ static void nvram_read_leddc(const char
|
||||
@@ -135,7 +135,7 @@ static void nvram_read_leddc(const char
|
||||
}
|
||||
|
||||
static void nvram_read_macaddr(const char *prefix, const char *name,
|
||||
|
@ -156,7 +156,7 @@
|
||||
} else {
|
||||
u32 bmcr;
|
||||
|
||||
@@ -12122,7 +12129,7 @@ static int tg3_set_pauseparam(struct net
|
||||
@@ -12124,7 +12131,7 @@ static int tg3_set_pauseparam(struct net
|
||||
u32 newadv;
|
||||
struct phy_device *phydev;
|
||||
|
||||
@ -165,7 +165,7 @@
|
||||
|
||||
if (!(phydev->supported & SUPPORTED_Pause) ||
|
||||
(!(phydev->supported & SUPPORTED_Asym_Pause) &&
|
||||
@@ -13556,7 +13563,7 @@ static int tg3_ioctl(struct net_device *
|
||||
@@ -13558,7 +13565,7 @@ static int tg3_ioctl(struct net_device *
|
||||
struct phy_device *phydev;
|
||||
if (!(tp->phy_flags & TG3_PHYFLG_IS_CONNECTED))
|
||||
return -EAGAIN;
|
||||
@ -174,7 +174,7 @@
|
||||
return phy_mii_ioctl(phydev, ifr, cmd);
|
||||
}
|
||||
|
||||
@@ -17192,8 +17199,10 @@ static int tg3_init_one(struct pci_dev *
|
||||
@@ -17194,8 +17201,10 @@ static int tg3_init_one(struct pci_dev *
|
||||
tg3_flag_set(tp, FLUSH_POSTED_WRITES);
|
||||
if (ssb_gige_one_dma_at_once(pdev))
|
||||
tg3_flag_set(tp, ONE_DMA_AT_ONCE);
|
||||
@ -186,7 +186,7 @@
|
||||
if (ssb_gige_is_rgmii(pdev))
|
||||
tg3_flag_set(tp, RGMII_MODE);
|
||||
}
|
||||
@@ -17463,7 +17472,7 @@ static int tg3_init_one(struct pci_dev *
|
||||
@@ -17464,7 +17473,7 @@ static int tg3_init_one(struct pci_dev *
|
||||
|
||||
if (tp->phy_flags & TG3_PHYFLG_IS_CONNECTED) {
|
||||
struct phy_device *phydev;
|
||||
|
Loading…
Reference in New Issue
Block a user