Ignore:
Timestamp:
2011-09-26T11:35:02+02:00 (5 years ago)
Author:
blogic
Message:

[lantiq]

  • rebase 3.0 patches
  • fold some fixes into existing patches
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/lantiq/patches-3.0/170-falcon-dm9000-polling.patch

    r27496 r28308  
    99 #include <linux/ioport.h> 
    1010 #include <linux/netdevice.h> 
    11 @@ -125,6 +126,8 @@ 
     11@@ -125,6 +126,8 @@ typedef struct board_info { 
    1212        struct delayed_work phy_poll; 
    1313        struct net_device  *ndev; 
     
    1818  
    1919        struct mii_if_info mii; 
    20 @@ -824,6 +827,8 @@ 
     20@@ -824,6 +827,8 @@ static void dm9000_timeout(struct net_de 
    2121        netif_stop_queue(dev); 
    2222        dm9000_reset(db); 
     
    2727        dev->trans_start = jiffies; /* prevent tx timeout */ 
    2828        netif_wake_queue(dev); 
    29 @@ -895,6 +900,12 @@ 
     29@@ -895,6 +900,12 @@ dm9000_start_xmit(struct sk_buff *skb, s 
    3030        /* free this SKB */ 
    3131        dev_kfree_skb(skb); 
     
    4040 } 
    4141  
    42 @@ -1136,6 +1147,18 @@ 
     42@@ -1136,6 +1147,18 @@ static void dm9000_poll_controller(struc 
    4343 } 
    4444 #endif 
     
    5959  *  Open the interface. 
    6060  *  The interface is opened whenever "ifconfig" actives it. 
    61 @@ -1149,14 +1172,15 @@ 
     61@@ -1149,14 +1172,15 @@ dm9000_open(struct net_device *dev) 
    6262        if (netif_msg_ifup(db)) 
    6363                dev_dbg(db->dev, "enabling %s\n", dev->name); 
     
    8181        iow(db, DM9000_GPR, 0); /* REG_1F bit0 activate phyxcer */ 
    8282        mdelay(1); /* delay needs by DM9000B */ 
    83 @@ -1165,8 +1189,14 @@ 
     83@@ -1165,8 +1189,14 @@ dm9000_open(struct net_device *dev) 
    8484        dm9000_reset(db); 
    8585        dm9000_init_dm9000(dev); 
     
    9898        /* Init driver variable */ 
    9999        db->dbug_cnt = 0; 
    100 @@ -1174,6 +1204,9 @@ 
     100@@ -1174,6 +1204,9 @@ dm9000_open(struct net_device *dev) 
    101101        mii_check_media(&db->mii, netif_msg_link(db), 1); 
    102102        netif_start_queue(dev); 
     
    108108  
    109109        return 0; 
    110 @@ -1371,6 +1404,7 @@ 
     110@@ -1371,6 +1404,7 @@ dm9000_probe(struct platform_device *pde 
    111111        mutex_init(&db->addr_lock); 
    112112  
Note: See TracChangeset for help on using the changeset viewer.