Attachment 151687 Details for Bug 216895 – proposed patch

[patch] proposed patch

tg3-mac-fix.patch (text/plain), 2.21 KB, created by Andy Gospodarek on 2007-04-04 17:58:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andy Gospodarek

Created: 2007-04-04 17:58:31 UTC

Size: 2.21 KB

patch

obsolete

>--- linux-2.6.9/drivers/net/tg3.c.rhel4	2007-04-04 13:42:07.037041000 -0400
>+++ linux-2.6.9/drivers/net/tg3.c	2007-04-04 13:42:12.157911000 -0400
>@@ -5846,7 +5846,7 @@ static int tg3_load_tso_firmware(struct 
> #endif /* TG3_TSO_SUPPORT != 0 */
> 
> /* tp->lock is held. */
>-static void __tg3_set_mac_addr(struct tg3 *tp)
>+static void __tg3_set_mac_addr(struct tg3 *tp, int skip_mac_1)
> {
> 	u32 addr_high, addr_low;
> 	int i;
>@@ -5858,6 +5858,8 @@ static void __tg3_set_mac_addr(struct tg
> 		    (tp->dev->dev_addr[4] <<  8) |
> 		    (tp->dev->dev_addr[5] <<  0));
> 	for (i = 0; i < 4; i++) {
>+		if (i == 1 && skip_mac_1)
>+			continue;
> 		tw32(MAC_ADDR_0_HIGH + (i * 8), addr_high);
> 		tw32(MAC_ADDR_0_LOW + (i * 8), addr_low);
> 	}
>@@ -5884,7 +5886,7 @@ static int tg3_set_mac_addr(struct net_d
> {
> 	struct tg3 *tp = netdev_priv(dev);
> 	struct sockaddr *addr = p;
>-	int err = 0;
>+	int err = 0, skip_mac_1 = 0;
> 
> 	if (!is_valid_ether_addr(addr->sa_data))
> 		return -EINVAL;
>@@ -5895,22 +5897,21 @@ static int tg3_set_mac_addr(struct net_d
> 		return 0;
> 
> 	if (tp->tg3_flags & TG3_FLAG_ENABLE_ASF) {
>-		/* Reset chip so that ASF can re-init any MAC addresses it
>-		 * needs.
>-		 */
>-		tg3_netif_stop(tp);
>-		tg3_full_lock(tp, 1);
>+		u32 addr0_high, addr0_low, addr1_high, addr1_low;
> 
>-		tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
>-		err = tg3_restart_hw(tp, 0);
>-		if (!err)
>-			tg3_netif_start(tp);
>-		tg3_full_unlock(tp);
>-	} else {
>-		spin_lock_bh(&tp->lock);
>-		__tg3_set_mac_addr(tp);
>-		spin_unlock_bh(&tp->lock);
>+		addr0_high = tr32(MAC_ADDR_0_HIGH);
>+		addr0_low = tr32(MAC_ADDR_0_LOW);
>+		addr1_high = tr32(MAC_ADDR_1_HIGH);
>+		addr1_low = tr32(MAC_ADDR_1_LOW);
>+
>+		/* Skip MAC addr 1 if ASF is using it. */
>+		if ((addr0_high != addr1_high || addr0_low != addr1_low) && 
>+		    !(addr1_high == 0 && addr1_low == 0))
>+			skip_mac_1 = 1;
> 	}
>+	spin_lock_bh(&tp->lock);
>+	__tg3_set_mac_addr(tp, skip_mac_1);
>+	spin_unlock_bh(&tp->lock);
> 
> 	return err;
> }
>@@ -6222,7 +6223,7 @@ static int tg3_reset_hw(struct tg3 *tp, 
> 		     tp->rx_jumbo_ptr);
> 
> 	/* Initialize MAC address and backoff seed. */
>-	__tg3_set_mac_addr(tp);
>+	__tg3_set_mac_addr(tp, 0);
> 
> 	/* MTU + ethernet header + FCS + optional VLAN tag */
> 	tw32(MAC_RX_MTU_SIZE, tp->dev->mtu + ETH_HLEN + 8);

Actions: View | Diff

Attachments on bug 216895: 148312 | 149677 | 151555 | 151687 | 151755 | 151756