From 73a14a8aa95e114176b8f2b58b03f3f8c5cb7715 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Mon, 15 Nov 2010 11:12:25 +0000 Subject: [PATCH] --- yaml --- r: 224405 b: refs/heads/master c: c04914af6861d62df303aeedbbe554972ce4e736 h: refs/heads/master i: 224403: ca5d2b519a5398dda7b9023692f7d9c064e70b80 v: v3 --- [refs] | 2 +- trunk/drivers/net/bonding/bond_3ad.c | 3 +-- trunk/drivers/net/bonding/bonding.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3bd99e21f580..874dc5319eaf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a17531fa4c951f32ca4f90b04ca42cfb11924098 +refs/heads/master: c04914af6861d62df303aeedbbe554972ce4e736 diff --git a/trunk/drivers/net/bonding/bond_3ad.c b/trunk/drivers/net/bonding/bond_3ad.c index 881914bc4e9c..48cf24ff4e6f 100644 --- a/trunk/drivers/net/bonding/bond_3ad.c +++ b/trunk/drivers/net/bonding/bond_3ad.c @@ -2474,8 +2474,7 @@ int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct net_device *dev, struct pac goto out; read_lock(&bond->lock); - slave = bond_get_slave_by_dev((struct bonding *)netdev_priv(dev), - orig_dev); + slave = bond_get_slave_by_dev(netdev_priv(dev), orig_dev); if (!slave) goto out_unlock; diff --git a/trunk/drivers/net/bonding/bonding.h b/trunk/drivers/net/bonding/bonding.h index 4eedb12df6ca..ad3ae46a4c01 100644 --- a/trunk/drivers/net/bonding/bonding.h +++ b/trunk/drivers/net/bonding/bonding.h @@ -286,7 +286,7 @@ static inline struct bonding *bond_get_bond_by_slave(struct slave *slave) return NULL; } - return (struct bonding *)netdev_priv(slave->dev->master); + return netdev_priv(slave->dev->master); } static inline bool bond_is_lb(const struct bonding *bond)