From 25afeba608b9db64cc0cab1f7be790f64193f590 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Thu, 3 Jan 2013 01:53:30 +0000 Subject: brcm47xx: add a new version of the nvram rewrite patch This is the version like it was send for mainline inclusion. SVN-Revision: 34988 --- .../brcm47xx/patches-3.6/700-ssb-gigabit-ethernet-driver.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'target/linux/brcm47xx/patches-3.6/700-ssb-gigabit-ethernet-driver.patch') diff --git a/target/linux/brcm47xx/patches-3.6/700-ssb-gigabit-ethernet-driver.patch b/target/linux/brcm47xx/patches-3.6/700-ssb-gigabit-ethernet-driver.patch index cc9c178be0..fe65cc451d 100644 --- a/target/linux/brcm47xx/patches-3.6/700-ssb-gigabit-ethernet-driver.patch +++ b/target/linux/brcm47xx/patches-3.6/700-ssb-gigabit-ethernet-driver.patch @@ -406,14 +406,14 @@ } -#ifdef CONFIG_BCM47XX --#include +-#include -/* Get the device MAC address */ -static inline void ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr) -{ - char buf[20]; -- if (nvram_getenv("et0macaddr", buf, sizeof(buf)) < 0) +- if (bcm47xx_nvram_getenv("et0macaddr", buf, sizeof(buf)) < 0) - return; -- nvram_parse_macaddr(buf, macaddr); +- bcm47xx_nvram_parse_macaddr(buf, macaddr); -} -#else static inline void ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr) -- cgit v1.2.3