---

yaml --- r: 224412 b: refs/heads/master c: 37d6680 h: refs/heads/master v: v3
git-mirror · Nov 17, 2010 · 1023ce7 · 1023ce7
1 parent 4f8f0b2
commit 1023ce7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ece49153b601d95bcebd45a6394e370972f0b0a0
+refs/heads/master: 37d668004289d202f71dc5bfdadf6c18b34577a2
diff --git a/trunk/net/atm/br2684.c b/trunk/net/atm/br2684.c
@@ -97,7 +97,7 @@ static LIST_HEAD(br2684_devs);
 
 static inline struct br2684_dev *BRPRIV(const struct net_device *net_dev)
 {
-	return (struct br2684_dev *)netdev_priv(net_dev);
+	return netdev_priv(net_dev);
 }
 
 static inline struct net_device *list_entry_brdev(const struct list_head *le)

diff --git a/trunk/net/atm/lec.c b/trunk/net/atm/lec.c
@@ -816,8 +816,7 @@ static int lec_mcast_attach(struct atm_vcc *vcc, int arg)
 	if (arg < 0 || arg >= MAX_LEC_ITF || !dev_lec[arg])
 		return -EINVAL;
 	vcc->proto_data = dev_lec[arg];
-	return lec_mcast_make((struct lec_priv *)netdev_priv(dev_lec[arg]),
-				vcc);
+	return lec_mcast_make(netdev_priv(dev_lec[arg]), vcc);
 }
 
 /* Initialize device. */