diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-02-04 22:54:29 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-02-04 22:54:29 +0000 |
| commit | 7ae5ff92aeac2ed17f0d5fc9d1554f8eaa3a4d27 (patch) | |
| tree | 57161ac178428e8082038d6371f54d650d0b523c /target/linux/brcm47xx/patches-3.10/790-tg3-phylib.patch | |
| parent | e0d4a548fb099ec45ccb566c9bf5a90c224a121b (diff) | |
| download | upstream-7ae5ff92aeac2ed17f0d5fc9d1554f8eaa3a4d27.tar.gz upstream-7ae5ff92aeac2ed17f0d5fc9d1554f8eaa3a4d27.tar.bz2 upstream-7ae5ff92aeac2ed17f0d5fc9d1554f8eaa3a4d27.zip | |
kernel: ssb: update ssb to a version from kernel 3.14-rc1
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 39464
Diffstat (limited to 'target/linux/brcm47xx/patches-3.10/790-tg3-phylib.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.10/790-tg3-phylib.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/target/linux/brcm47xx/patches-3.10/790-tg3-phylib.patch b/target/linux/brcm47xx/patches-3.10/790-tg3-phylib.patch index f533a0046a..f1c68ba667 100644 --- a/target/linux/brcm47xx/patches-3.10/790-tg3-phylib.patch +++ b/target/linux/brcm47xx/patches-3.10/790-tg3-phylib.patch @@ -195,33 +195,3 @@ netdev_info(dev, "attached PHY driver [%s] (mii_bus:phy_addr=%s)\n", phydev->drv->name, dev_name(&phydev->dev)); ---- a/include/linux/ssb/ssb_driver_gige.h -+++ b/include/linux/ssb/ssb_driver_gige.h -@@ -108,6 +108,16 @@ static inline int ssb_gige_get_macaddr(s - return 0; - } - -+/* Get the device phy address */ -+static inline int ssb_gige_get_phyaddr(struct pci_dev *pdev) -+{ -+ struct ssb_gige *dev = pdev_to_ssb_gige(pdev); -+ if (!dev) -+ return -ENODEV; -+ -+ return dev->dev->bus->sprom.et0phyaddr; -+} -+ - extern int ssb_gige_pcibios_plat_dev_init(struct ssb_device *sdev, - struct pci_dev *pdev); - extern int ssb_gige_map_irq(struct ssb_device *sdev, -@@ -174,6 +184,10 @@ static inline int ssb_gige_get_macaddr(s - { - return -ENODEV; - } -+static inline int ssb_gige_get_phyaddr(struct pci_dev *pdev) -+{ -+ return -ENODEV; -+} - - #endif /* CONFIG_SSB_DRIVER_GIGE */ - #endif /* LINUX_SSB_DRIVER_GIGE_H_ */ |