mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
kernel: update linux 3.2 to 3.2.13 and refresh patches
Also remove a duplicate patch from lantiq (already in generic). git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31158 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -8,7 +8,7 @@
|
||||
#include <linux/module.h>
|
||||
#include <linux/ioport.h>
|
||||
#include <linux/netdevice.h>
|
||||
@@ -126,6 +127,8 @@ typedef struct board_info {
|
||||
@@ -132,6 +133,8 @@ typedef struct board_info {
|
||||
struct delayed_work phy_poll;
|
||||
struct net_device *ndev;
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
spinlock_t lock;
|
||||
|
||||
struct mii_if_info mii;
|
||||
@@ -839,6 +842,8 @@ static void dm9000_timeout(struct net_de
|
||||
@@ -844,6 +847,8 @@ static void dm9000_timeout(struct net_de
|
||||
netif_stop_queue(dev);
|
||||
dm9000_reset(db);
|
||||
dm9000_init_dm9000(dev);
|
||||
@@ -26,7 +26,7 @@
|
||||
/* We can accept TX packets again */
|
||||
dev->trans_start = jiffies; /* prevent tx timeout */
|
||||
netif_wake_queue(dev);
|
||||
@@ -910,6 +915,12 @@ dm9000_start_xmit(struct sk_buff *skb, s
|
||||
@@ -915,6 +920,12 @@ dm9000_start_xmit(struct sk_buff *skb, s
|
||||
/* free this SKB */
|
||||
dev_kfree_skb(skb);
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
return NETDEV_TX_OK;
|
||||
}
|
||||
|
||||
@@ -1151,6 +1162,18 @@ static void dm9000_poll_controller(struc
|
||||
@@ -1156,6 +1167,18 @@ static void dm9000_poll_controller(struc
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
/*
|
||||
* Open the interface.
|
||||
* The interface is opened whenever "ifconfig" actives it.
|
||||
@@ -1164,14 +1187,15 @@ dm9000_open(struct net_device *dev)
|
||||
@@ -1169,14 +1192,15 @@ dm9000_open(struct net_device *dev)
|
||||
if (netif_msg_ifup(db))
|
||||
dev_dbg(db->dev, "enabling %s\n", dev->name);
|
||||
|
||||
@@ -80,7 +80,7 @@
|
||||
/* GPIO0 on pre-activate PHY, Reg 1F is not set by reset */
|
||||
iow(db, DM9000_GPR, 0); /* REG_1F bit0 activate phyxcer */
|
||||
mdelay(1); /* delay needs by DM9000B */
|
||||
@@ -1180,8 +1204,14 @@ dm9000_open(struct net_device *dev)
|
||||
@@ -1185,8 +1209,14 @@ dm9000_open(struct net_device *dev)
|
||||
dm9000_reset(db);
|
||||
dm9000_init_dm9000(dev);
|
||||
|
||||
@@ -97,7 +97,7 @@
|
||||
|
||||
/* Init driver variable */
|
||||
db->dbug_cnt = 0;
|
||||
@@ -1189,6 +1219,9 @@ dm9000_open(struct net_device *dev)
|
||||
@@ -1194,6 +1224,9 @@ dm9000_open(struct net_device *dev)
|
||||
mii_check_media(&db->mii, netif_msg_link(db), 1);
|
||||
netif_start_queue(dev);
|
||||
|
||||
@@ -107,7 +107,7 @@
|
||||
dm9000_schedule_poll(db);
|
||||
|
||||
return 0;
|
||||
@@ -1386,6 +1419,7 @@ dm9000_probe(struct platform_device *pde
|
||||
@@ -1391,6 +1424,7 @@ dm9000_probe(struct platform_device *pde
|
||||
mutex_init(&db->addr_lock);
|
||||
|
||||
INIT_DELAYED_WORK(&db->phy_poll, dm9000_poll_work);
|
||||
|
||||
Reference in New Issue
Block a user