From 93d0905fb63ffd16122e85ebf8beaecfa9fb96cf Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Thu, 8 Oct 2009 15:55:21 -0700
Subject: [PATCH] --- yaml --- r: 167519 b: refs/heads/master c:
 67972e0c238fa802580b5919f11e1de3da5179da h: refs/heads/master i:   167517:
 1e176c0820f3330c8950a6f64a0bc54fdf07799f   167515:
 bf4487b54b967258efbd2251af850045a9e07131   167511:
 8dc74926b781c289d20f0b64549abf95096bf624   167503:
 3df0c96a9fc2894e3911824ecb187e4250673f25   167487:
 3c43425def95af48a19f94474930f45e0b70e865 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/net/znet.c        | 8 --------
 trunk/include/linux/netdevice.h | 2 +-
 trunk/net/sched/cls_api.c       | 2 +-
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 95424dc07e09..40cbc93d3c81 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a8e05e5d8f6155788761961fc9845328863c16d
+refs/heads/master: 67972e0c238fa802580b5919f11e1de3da5179da
diff --git a/trunk/drivers/net/znet.c b/trunk/drivers/net/znet.c
index a0384b6f09b6..b42347333750 100644
--- a/trunk/drivers/net/znet.c
+++ b/trunk/drivers/net/znet.c
@@ -169,7 +169,6 @@ 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;
@@ -187,13 +186,9 @@ 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:
@@ -203,14 +198,11 @@ 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 94958c109761..812a5f3c2abe 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* (*get_stats)(struct net_device *dev);
+ * struct net_device_stats* (*ndo_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 6a536949cdc0..7cf6c0fbc7a6 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__pad1 = 0;
+	tcm->tcm__pad2 = 0;
 	tcm->tcm_ifindex = qdisc_dev(tp->q)->ifindex;
 	tcm->tcm_parent = tp->classid;
 	tcm->tcm_info = TC_H_MAKE(tp->prio, tp->protocol);