From b225fc33b4c58377f891db246996c431166cff2a Mon Sep 17 00:00:00 2001
From: Michael Buesch <mb@bu3sch.de>
Date: Thu, 1 Oct 2009 15:54:32 +0200
Subject: [PATCH] --- yaml --- r: 167506 b: refs/heads/master c:
 727c988593271599c9e5943699426afcce1a62d6 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/net/wireless/b43/leds.c | 4 ++--
 trunk/drivers/net/wireless/b43/leds.h | 4 ++--
 trunk/drivers/net/wireless/b43/main.c | 2 +-
 trunk/drivers/net/znet.c              | 8 ++++++++
 trunk/include/linux/netdevice.h       | 2 +-
 trunk/net/sched/cls_api.c             | 2 +-
 7 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index a139992f0008..8198f23993e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad61df918c44316940404891d5082c63e79c256a
+refs/heads/master: 727c988593271599c9e5943699426afcce1a62d6
diff --git a/trunk/drivers/net/wireless/b43/leds.c b/trunk/drivers/net/wireless/b43/leds.c
index fbe3d4f62ce2..1e8dba488004 100644
--- a/trunk/drivers/net/wireless/b43/leds.c
+++ b/trunk/drivers/net/wireless/b43/leds.c
@@ -348,9 +348,9 @@ void b43_leds_register(struct b43_wldev *dev)
 	}
 }
 
-void b43_leds_unregister(struct b43_wldev *dev)
+void b43_leds_unregister(struct b43_wl *wl)
 {
-	struct b43_leds *leds = &dev->wl->leds;
+	struct b43_leds *leds = &wl->leds;
 
 	b43_unregister_led(&leds->led_tx);
 	b43_unregister_led(&leds->led_rx);
diff --git a/trunk/drivers/net/wireless/b43/leds.h b/trunk/drivers/net/wireless/b43/leds.h
index 9592e4c5a5f5..4c56187810fc 100644
--- a/trunk/drivers/net/wireless/b43/leds.h
+++ b/trunk/drivers/net/wireless/b43/leds.h
@@ -60,7 +60,7 @@ enum b43_led_behaviour {
 };
 
 void b43_leds_register(struct b43_wldev *dev);
-void b43_leds_unregister(struct b43_wldev *dev);
+void b43_leds_unregister(struct b43_wl *wl);
 void b43_leds_init(struct b43_wldev *dev);
 void b43_leds_exit(struct b43_wldev *dev);
 void b43_leds_stop(struct b43_wldev *dev);
@@ -76,7 +76,7 @@ struct b43_leds {
 static inline void b43_leds_register(struct b43_wldev *dev)
 {
 }
-static inline void b43_leds_unregister(struct b43_wldev *dev)
+static inline void b43_leds_unregister(struct b43_wl *wl)
 {
 }
 static inline void b43_leds_init(struct b43_wldev *dev)
diff --git a/trunk/drivers/net/wireless/b43/main.c b/trunk/drivers/net/wireless/b43/main.c
index 9b907a36bb8c..130dcd5928b1 100644
--- a/trunk/drivers/net/wireless/b43/main.c
+++ b/trunk/drivers/net/wireless/b43/main.c
@@ -4997,7 +4997,7 @@ static void b43_remove(struct ssb_device *dev)
 
 	if (list_empty(&wl->devlist)) {
 		b43_rng_exit(wl);
-		b43_leds_unregister(wldev);
+		b43_leds_unregister(wl);
 		/* Last core on the chip unregistered.
 		 * We can destroy common struct b43_wl.
 		 */
diff --git a/trunk/drivers/net/znet.c b/trunk/drivers/net/znet.c
index b42347333750..a0384b6f09b6 100644
--- a/trunk/drivers/net/znet.c
+++ b/trunk/drivers/net/znet.c
@@ -169,6 +169,7 @@ static void znet_tx_timeout (struct net_device *dev);
 static int znet_request_resources (struct net_device *dev)
 {
 	struct znet_private *znet = netdev_priv(dev);
+	unsigned long flags;
 
 	if (request_irq (dev->irq, &znet_interrupt, 0, "ZNet", dev))
 		goto failed;
@@ -186,9 +187,13 @@ static int znet_request_resources (struct net_device *dev)
  free_sia:
 	release_region (znet->sia_base, znet->sia_size);
  free_tx_dma:
+	flags = claim_dma_lock();
 	free_dma (znet->tx_dma);
+	release_dma_lock (flags);
  free_rx_dma:
+	flags = claim_dma_lock();
 	free_dma (znet->rx_dma);
+	release_dma_lock (flags);
  free_irq:
 	free_irq (dev->irq, dev);
  failed:
@@ -198,11 +203,14 @@ static int znet_request_resources (struct net_device *dev)
 static void znet_release_resources (struct net_device *dev)
 {
 	struct znet_private *znet = netdev_priv(dev);
+	unsigned long flags;
 
 	release_region (znet->sia_base, znet->sia_size);
 	release_region (dev->base_addr, znet->io_size);
+	flags = claim_dma_lock();
 	free_dma (znet->tx_dma);
 	free_dma (znet->rx_dma);
+	release_dma_lock (flags);
 	free_irq (dev->irq, dev);
 }
 
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
index 812a5f3c2abe..94958c109761 100644
--- a/trunk/include/linux/netdevice.h
+++ b/trunk/include/linux/netdevice.h
@@ -557,7 +557,7 @@ struct netdev_queue {
  *	Callback uses when the transmitter has not made any progress
  *	for dev->watchdog ticks.
  *
- * struct net_device_stats* (*ndo_get_stats)(struct net_device *dev);
+ * struct net_device_stats* (*get_stats)(struct net_device *dev);
  *	Called when a user wants to get the network device usage
  *	statistics. If not defined, the counters in dev->stats will
  *	be used.
diff --git a/trunk/net/sched/cls_api.c b/trunk/net/sched/cls_api.c
index 7cf6c0fbc7a6..6a536949cdc0 100644
--- a/trunk/net/sched/cls_api.c
+++ b/trunk/net/sched/cls_api.c
@@ -350,7 +350,7 @@ static int tcf_fill_node(struct sk_buff *skb, struct tcf_proto *tp,
 	tcm = NLMSG_DATA(nlh);
 	tcm->tcm_family = AF_UNSPEC;
 	tcm->tcm__pad1 = 0;
-	tcm->tcm__pad2 = 0;
+	tcm->tcm__pad1 = 0;
 	tcm->tcm_ifindex = qdisc_dev(tp->q)->ifindex;
 	tcm->tcm_parent = tp->classid;
 	tcm->tcm_info = TC_H_MAKE(tp->prio, tp->protocol);