From 1023ce7d4ecb7dac80aa549eb175c0dd7b7e7d8e Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Mon, 15 Nov 2010 11:12:33 +0000 Subject: [PATCH] --- yaml --- r: 224412 b: refs/heads/master c: 37d668004289d202f71dc5bfdadf6c18b34577a2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/atm/br2684.c | 2 +- trunk/net/atm/lec.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 852591512ca2..6b8427dfb5c9 100644 --- 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 index ad2b232a2055..fce2eae8d476 100644 --- 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 index 181d70c73d70..179e04bc99dd 100644 --- 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. */