X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=target%2Flinux%2Far7%2Fpatches-2.6.27%2F900-cpmac_multiqueue.patch;h=c604aa4c3f56905773a26733d0a7c8648a1ae6c0;hp=1484e2b5fda4e7828b1f102cebcd5c0362380351;hb=1a448e9620ca29a959d0880540b571303eb6d58f;hpb=eda7f6e2008cb0df6c826c40a4a120ba95fc32e6;ds=sidebyside diff --git a/target/linux/ar7/patches-2.6.27/900-cpmac_multiqueue.patch b/target/linux/ar7/patches-2.6.27/900-cpmac_multiqueue.patch index 1484e2b5fd..c604aa4c3f 100644 --- a/target/linux/ar7/patches-2.6.27/900-cpmac_multiqueue.patch +++ b/target/linux/ar7/patches-2.6.27/900-cpmac_multiqueue.patch @@ -19,7 +19,7 @@ because other drivers do it in the same way. --- a/drivers/net/cpmac.c +++ b/drivers/net/cpmac.c -@@ -621,13 +621,13 @@ +@@ -621,13 +621,13 @@ static void cpmac_end_xmit(struct net_de dev_kfree_skb_irq(desc->skb); desc->skb = NULL; @@ -35,7 +35,7 @@ because other drivers do it in the same way. netif_wake_subqueue(dev, queue); } } -@@ -737,7 +737,6 @@ +@@ -737,7 +737,6 @@ static void cpmac_clear_tx(struct net_de static void cpmac_hw_error(struct work_struct *work) { @@ -43,7 +43,7 @@ because other drivers do it in the same way. struct cpmac_priv *priv = container_of(work, struct cpmac_priv, reset_work); -@@ -824,7 +823,6 @@ +@@ -824,7 +823,6 @@ static irqreturn_t cpmac_irq(int irq, vo static void cpmac_tx_timeout(struct net_device *dev) { @@ -51,7 +51,7 @@ because other drivers do it in the same way. struct cpmac_priv *priv = netdev_priv(dev); spin_lock(&priv->lock); -@@ -1103,7 +1101,7 @@ +@@ -1103,7 +1101,7 @@ static int external_switch; static int __devinit cpmac_probe(struct platform_device *pdev) { @@ -60,7 +60,7 @@ because other drivers do it in the same way. char *mdio_bus_id = "0"; struct resource *mem; struct cpmac_priv *priv; -@@ -1132,6 +1130,7 @@ +@@ -1132,6 +1130,7 @@ static int __devinit cpmac_probe(struct } dev = alloc_etherdev_mq(sizeof(*priv), CPMAC_QUEUES);