refresh kernel patches
[openwrt/openwrt.git] / target / linux / ar7 / patches-2.6.24 / 900-temporary_cpmac_hack.diff
1 Index: linux-2.6.24.7/drivers/net/cpmac.c
2 ===================================================================
3 --- linux-2.6.24.7.orig/drivers/net/cpmac.c
4 +++ linux-2.6.24.7/drivers/net/cpmac.c
5 @@ -936,7 +936,8 @@ static void cpmac_adjust_link(struct net
6 int new_state = 0;
7
8 spin_lock(&priv->lock);
9 - if (priv->phy->link) {
10 + if (1 /* priv->phy->link */ ) {
11 + netif_carrier_on(dev);
12 netif_start_queue(dev);
13 if (priv->phy->duplex != priv->oldduplex) {
14 new_state = 1;
15 @@ -948,11 +949,11 @@ static void cpmac_adjust_link(struct net
16 priv->oldspeed = priv->phy->speed;
17 }
18
19 - if (!priv->oldlink) {
20 + /*if (!priv->oldlink) {
21 new_state = 1;
22 - priv->oldlink = 1;
23 + priv->oldlink = 1;*/
24 netif_schedule(dev);
25 - }
26 + /*}*/
27 } else if (priv->oldlink) {
28 netif_stop_queue(dev);
29 new_state = 1;