diff options
author | acoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-04-30 11:05:40 +0000 |
---|---|---|
committer | acoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-04-30 11:05:40 +0000 |
commit | 821842c129870cf0e282bd6df77ec48cb5200f36 (patch) | |
tree | 68aaaf22909cc3e96a00f36e796287491a27aee0 /target/linux/brcm47xx/patches-2.6.33/700-ssb-gigabit-ethernet-driver.patch | |
parent | a85e4d1eb9b4b46b2e4b5372c9f93d24fb125754 (diff) |
brcm47xx: refresh 2.6.33 kernel patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21265 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.33/700-ssb-gigabit-ethernet-driver.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-2.6.33/700-ssb-gigabit-ethernet-driver.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.33/700-ssb-gigabit-ethernet-driver.patch b/target/linux/brcm47xx/patches-2.6.33/700-ssb-gigabit-ethernet-driver.patch index 04185d729..5eb87d9ba 100644 --- a/target/linux/brcm47xx/patches-2.6.33/700-ssb-gigabit-ethernet-driver.patch +++ b/target/linux/brcm47xx/patches-2.6.33/700-ssb-gigabit-ethernet-driver.patch @@ -8,7 +8,7 @@ #include <net/checksum.h> #include <net/ip.h> -@@ -466,8 +467,9 @@ static void _tw32_flush(struct tg3 *tp, +@@ -466,8 +467,9 @@ static void _tw32_flush(struct tg3 *tp, static inline void tw32_mailbox_flush(struct tg3 *tp, u32 off, u32 val) { tp->write32_mbox(tp, off, val); @@ -61,7 +61,7 @@ { u32 frame_val; unsigned int loops; -@@ -842,7 +849,7 @@ static int tg3_writephy(struct tg3 *tp, +@@ -842,7 +849,7 @@ static int tg3_writephy(struct tg3 *tp, udelay(80); } @@ -70,7 +70,7 @@ MI_COM_PHY_ADDR_MASK); frame_val |= ((reg << MI_COM_REG_ADDR_SHIFT) & MI_COM_REG_ADDR_MASK); -@@ -875,6 +882,11 @@ static int tg3_writephy(struct tg3 *tp, +@@ -875,6 +882,11 @@ static int tg3_writephy(struct tg3 *tp, return ret; } @@ -147,7 +147,7 @@ tw32(GRC_MODE, tp->grc_mode); if (tp->pci_chip_rev_id == CHIPREV_ID_5705_A0) { -@@ -7089,9 +7127,12 @@ static int tg3_halt_cpu(struct tg3 *tp, +@@ -7089,9 +7127,12 @@ static int tg3_halt_cpu(struct tg3 *tp, return -ENODEV; } @@ -175,7 +175,7 @@ fw_data = (void *)tp->fw->data; /* Firmware blob starts with version numbers, followed by -@@ -7213,6 +7259,11 @@ static int tg3_load_tso_firmware(struct +@@ -7213,6 +7259,11 @@ static int tg3_load_tso_firmware(struct unsigned long cpu_base, cpu_scratch_base, cpu_scratch_size; int err, i; @@ -242,7 +242,7 @@ tw32_f(GRC_EEPROM_ADDR, (EEPROM_ADDR_FSM_RESET | (EEPROM_DEFAULT_CLOCK_PERIOD << -@@ -11936,6 +12003,9 @@ static int tg3_nvram_write_block(struct +@@ -11936,6 +12003,9 @@ static int tg3_nvram_write_block(struct { int ret; |