ctcm: netdev->priv vs. netdev->ml_priv
Use netdev->ml_priv instead of netdev->priv Signed-off-by: Peter Tiedemann <ptiedem@de.ibm.com> Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
committed by
Jeff Garzik
parent
6951df34d5
commit
261893d30b
@@ -229,14 +229,14 @@ void ctcm_remove_files(struct device *dev);
|
||||
*/
|
||||
static inline void ctcm_clear_busy_do(struct net_device *dev)
|
||||
{
|
||||
clear_bit(0, &(((struct ctcm_priv *)dev->priv)->tbusy));
|
||||
clear_bit(0, &(((struct ctcm_priv *)dev->ml_priv)->tbusy));
|
||||
netif_wake_queue(dev);
|
||||
}
|
||||
|
||||
static inline void ctcm_clear_busy(struct net_device *dev)
|
||||
{
|
||||
struct mpc_group *grp;
|
||||
grp = ((struct ctcm_priv *)dev->priv)->mpcg;
|
||||
grp = ((struct ctcm_priv *)dev->ml_priv)->mpcg;
|
||||
|
||||
if (!(grp && grp->in_sweep))
|
||||
ctcm_clear_busy_do(dev);
|
||||
@@ -246,7 +246,8 @@ static inline void ctcm_clear_busy(struct net_device *dev)
|
||||
static inline int ctcm_test_and_set_busy(struct net_device *dev)
|
||||
{
|
||||
netif_stop_queue(dev);
|
||||
return test_and_set_bit(0, &(((struct ctcm_priv *)dev->priv)->tbusy));
|
||||
return test_and_set_bit(0,
|
||||
&(((struct ctcm_priv *)dev->ml_priv)->tbusy));
|
||||
}
|
||||
|
||||
extern int loglevel;
|
||||
@@ -292,7 +293,7 @@ struct mpc_group *ctcmpc_init_mpc_group(struct ctcm_priv *priv);
|
||||
#define IS_MPC(p) ((p)->protocol == CTCM_PROTO_MPC)
|
||||
|
||||
/* test if struct ctcm_priv of struct net_device has MPC protocol setting */
|
||||
#define IS_MPCDEV(d) IS_MPC((struct ctcm_priv *)d->priv)
|
||||
#define IS_MPCDEV(dev) IS_MPC((struct ctcm_priv *)dev->ml_priv)
|
||||
|
||||
static inline gfp_t gfp_type(void)
|
||||
{
|
||||
|
Reference in New Issue
Block a user