aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.8/700-ssb-gigabit-ethernet-driver.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-04-28 16:52:11 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-04-28 16:52:11 +0000
commit1bac172c44fd96ee1c5ed94ce2879b15c7a23745 (patch)
treeebb49ea0f4f71c657aaf7c9a0c54521ea6e1fc9e /target/linux/brcm47xx/patches-3.8/700-ssb-gigabit-ethernet-driver.patch
parentf1e214411d8fe78a19d4df6837f4cbc4aa136667 (diff)
downloadupstream-1bac172c44fd96ee1c5ed94ce2879b15c7a23745.tar.gz
upstream-1bac172c44fd96ee1c5ed94ce2879b15c7a23745.tar.bz2
upstream-1bac172c44fd96ee1c5ed94ce2879b15c7a23745.zip
kernel: update bcma and ssb for kernel 3.8+ to version from wireless-testing master-2013-04-26.
SVN-Revision: 36473
Diffstat (limited to 'target/linux/brcm47xx/patches-3.8/700-ssb-gigabit-ethernet-driver.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.8/700-ssb-gigabit-ethernet-driver.patch42
1 files changed, 0 insertions, 42 deletions
diff --git a/target/linux/brcm47xx/patches-3.8/700-ssb-gigabit-ethernet-driver.patch b/target/linux/brcm47xx/patches-3.8/700-ssb-gigabit-ethernet-driver.patch
index cdbae5f872..fc868c00da 100644
--- a/target/linux/brcm47xx/patches-3.8/700-ssb-gigabit-ethernet-driver.patch
+++ b/target/linux/brcm47xx/patches-3.8/700-ssb-gigabit-ethernet-driver.patch
@@ -343,45 +343,3 @@
#define PCI_DEVICE_ID_TIGON3_5751 0x1677
#define PCI_DEVICE_ID_TIGON3_5715 0x1678
#define PCI_DEVICE_ID_TIGON3_5715S 0x1679
---- a/include/linux/ssb/ssb_driver_gige.h
-+++ b/include/linux/ssb/ssb_driver_gige.h
-@@ -97,21 +97,16 @@ static inline bool ssb_gige_must_flush_p
- return 0;
- }
-
--#ifdef CONFIG_BCM47XX
--#include <bcm47xx_nvram.h>
- /* Get the device MAC address */
--static inline void ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr)
--{
-- char buf[20];
-- if (bcm47xx_nvram_getenv("et0macaddr", buf, sizeof(buf)) < 0)
-- return;
-- bcm47xx_nvram_parse_macaddr(buf, macaddr);
--}
--#else
--static inline void ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr)
-+static inline int ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr)
- {
-+ struct ssb_gige *dev = pdev_to_ssb_gige(pdev);
-+ if (!dev)
-+ return -ENODEV;
-+
-+ memcpy(macaddr, dev->dev->bus->sprom.et0mac, 6);
-+ return 0;
- }
--#endif
-
- extern int ssb_gige_pcibios_plat_dev_init(struct ssb_device *sdev,
- struct pci_dev *pdev);
-@@ -175,6 +170,10 @@ static inline bool ssb_gige_must_flush_p
- {
- return 0;
- }
-+static inline int ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr)
-+{
-+ return -ENODEV;
-+}
-
- #endif /* CONFIG_SSB_DRIVER_GIGE */
- #endif /* LINUX_SSB_DRIVER_GIGE_H_ */