diff options
Diffstat (limited to 'drivers/s390/net/ctcm_main.h')
-rw-r--r-- | drivers/s390/net/ctcm_main.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/s390/net/ctcm_main.h b/drivers/s390/net/ctcm_main.h index a72e0feeb27f..8e10ee86a5ee 100644 --- a/drivers/s390/net/ctcm_main.h +++ b/drivers/s390/net/ctcm_main.h | |||
@@ -229,14 +229,14 @@ void ctcm_remove_files(struct device *dev); | |||
229 | */ | 229 | */ |
230 | static inline void ctcm_clear_busy_do(struct net_device *dev) | 230 | static inline void ctcm_clear_busy_do(struct net_device *dev) |
231 | { | 231 | { |
232 | clear_bit(0, &(((struct ctcm_priv *)dev->priv)->tbusy)); | 232 | clear_bit(0, &(((struct ctcm_priv *)dev->ml_priv)->tbusy)); |
233 | netif_wake_queue(dev); | 233 | netif_wake_queue(dev); |
234 | } | 234 | } |
235 | 235 | ||
236 | static inline void ctcm_clear_busy(struct net_device *dev) | 236 | static inline void ctcm_clear_busy(struct net_device *dev) |
237 | { | 237 | { |
238 | struct mpc_group *grp; | 238 | struct mpc_group *grp; |
239 | grp = ((struct ctcm_priv *)dev->priv)->mpcg; | 239 | grp = ((struct ctcm_priv *)dev->ml_priv)->mpcg; |
240 | 240 | ||
241 | if (!(grp && grp->in_sweep)) | 241 | if (!(grp && grp->in_sweep)) |
242 | ctcm_clear_busy_do(dev); | 242 | ctcm_clear_busy_do(dev); |
@@ -246,7 +246,8 @@ static inline void ctcm_clear_busy(struct net_device *dev) | |||
246 | static inline int ctcm_test_and_set_busy(struct net_device *dev) | 246 | static inline int ctcm_test_and_set_busy(struct net_device *dev) |
247 | { | 247 | { |
248 | netif_stop_queue(dev); | 248 | netif_stop_queue(dev); |
249 | return test_and_set_bit(0, &(((struct ctcm_priv *)dev->priv)->tbusy)); | 249 | return test_and_set_bit(0, |
250 | &(((struct ctcm_priv *)dev->ml_priv)->tbusy)); | ||
250 | } | 251 | } |
251 | 252 | ||
252 | extern int loglevel; | 253 | extern int loglevel; |
@@ -292,7 +293,7 @@ struct mpc_group *ctcmpc_init_mpc_group(struct ctcm_priv *priv); | |||
292 | #define IS_MPC(p) ((p)->protocol == CTCM_PROTO_MPC) | 293 | #define IS_MPC(p) ((p)->protocol == CTCM_PROTO_MPC) |
293 | 294 | ||
294 | /* test if struct ctcm_priv of struct net_device has MPC protocol setting */ | 295 | /* test if struct ctcm_priv of struct net_device has MPC protocol setting */ |
295 | #define IS_MPCDEV(d) IS_MPC((struct ctcm_priv *)d->priv) | 296 | #define IS_MPCDEV(dev) IS_MPC((struct ctcm_priv *)dev->ml_priv) |
296 | 297 | ||
297 | static inline gfp_t gfp_type(void) | 298 | static inline gfp_t gfp_type(void) |
298 | { | 299 | { |