diff options
author | Peter Tiedemann <ptiedem@de.ibm.com> | 2008-08-21 11:10:24 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-08-27 05:17:52 -0400 |
commit | 261893d30b0ddb5587f9143df18a6efed39a7ed6 (patch) | |
tree | 495dcda6ed7d774d816ed473df4a70837627e8f9 /drivers | |
parent | 6951df34d50330f1b117fd8371d7f7df39f43f6a (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/s390/net/ctcm_fsms.c | 56 | ||||
-rw-r--r-- | drivers/s390/net/ctcm_main.c | 24 | ||||
-rw-r--r-- | drivers/s390/net/ctcm_main.h | 9 | ||||
-rw-r--r-- | drivers/s390/net/ctcm_mpc.c | 46 |
4 files changed, 68 insertions, 67 deletions
diff --git a/drivers/s390/net/ctcm_fsms.c b/drivers/s390/net/ctcm_fsms.c index 0b4e6253abe4..42776550acfd 100644 --- a/drivers/s390/net/ctcm_fsms.c +++ b/drivers/s390/net/ctcm_fsms.c | |||
@@ -245,7 +245,7 @@ static void chx_txdone(fsm_instance *fi, int event, void *arg) | |||
245 | { | 245 | { |
246 | struct channel *ch = arg; | 246 | struct channel *ch = arg; |
247 | struct net_device *dev = ch->netdev; | 247 | struct net_device *dev = ch->netdev; |
248 | struct ctcm_priv *priv = dev->priv; | 248 | struct ctcm_priv *priv = dev->ml_priv; |
249 | struct sk_buff *skb; | 249 | struct sk_buff *skb; |
250 | int first = 1; | 250 | int first = 1; |
251 | int i; | 251 | int i; |
@@ -336,7 +336,7 @@ void ctcm_chx_txidle(fsm_instance *fi, int event, void *arg) | |||
336 | { | 336 | { |
337 | struct channel *ch = arg; | 337 | struct channel *ch = arg; |
338 | struct net_device *dev = ch->netdev; | 338 | struct net_device *dev = ch->netdev; |
339 | struct ctcm_priv *priv = dev->priv; | 339 | struct ctcm_priv *priv = dev->ml_priv; |
340 | 340 | ||
341 | CTCM_PR_DEBUG("%s(%s): %s\n", __func__, ch->id, dev->name); | 341 | CTCM_PR_DEBUG("%s(%s): %s\n", __func__, ch->id, dev->name); |
342 | 342 | ||
@@ -357,7 +357,7 @@ static void chx_rx(fsm_instance *fi, int event, void *arg) | |||
357 | { | 357 | { |
358 | struct channel *ch = arg; | 358 | struct channel *ch = arg; |
359 | struct net_device *dev = ch->netdev; | 359 | struct net_device *dev = ch->netdev; |
360 | struct ctcm_priv *priv = dev->priv; | 360 | struct ctcm_priv *priv = dev->ml_priv; |
361 | int len = ch->max_bufsize - ch->irb->scsw.cmd.count; | 361 | int len = ch->max_bufsize - ch->irb->scsw.cmd.count; |
362 | struct sk_buff *skb = ch->trans_skb; | 362 | struct sk_buff *skb = ch->trans_skb; |
363 | __u16 block_len = *((__u16 *)skb->data); | 363 | __u16 block_len = *((__u16 *)skb->data); |
@@ -459,7 +459,7 @@ static void chx_firstio(fsm_instance *fi, int event, void *arg) | |||
459 | chx_rxidle(fi, event, arg); | 459 | chx_rxidle(fi, event, arg); |
460 | } else { | 460 | } else { |
461 | struct net_device *dev = ch->netdev; | 461 | struct net_device *dev = ch->netdev; |
462 | struct ctcm_priv *priv = dev->priv; | 462 | struct ctcm_priv *priv = dev->ml_priv; |
463 | fsm_newstate(fi, CTC_STATE_TXIDLE); | 463 | fsm_newstate(fi, CTC_STATE_TXIDLE); |
464 | fsm_event(priv->fsm, DEV_EVENT_TXUP, dev); | 464 | fsm_event(priv->fsm, DEV_EVENT_TXUP, dev); |
465 | } | 465 | } |
@@ -496,7 +496,7 @@ static void chx_firstio(fsm_instance *fi, int event, void *arg) | |||
496 | if ((CHANNEL_DIRECTION(ch->flags) == READ) && | 496 | if ((CHANNEL_DIRECTION(ch->flags) == READ) && |
497 | (ch->protocol == CTCM_PROTO_S390)) { | 497 | (ch->protocol == CTCM_PROTO_S390)) { |
498 | struct net_device *dev = ch->netdev; | 498 | struct net_device *dev = ch->netdev; |
499 | struct ctcm_priv *priv = dev->priv; | 499 | struct ctcm_priv *priv = dev->ml_priv; |
500 | fsm_event(priv->fsm, DEV_EVENT_RXUP, dev); | 500 | fsm_event(priv->fsm, DEV_EVENT_RXUP, dev); |
501 | } | 501 | } |
502 | } | 502 | } |
@@ -514,7 +514,7 @@ static void chx_rxidle(fsm_instance *fi, int event, void *arg) | |||
514 | { | 514 | { |
515 | struct channel *ch = arg; | 515 | struct channel *ch = arg; |
516 | struct net_device *dev = ch->netdev; | 516 | struct net_device *dev = ch->netdev; |
517 | struct ctcm_priv *priv = dev->priv; | 517 | struct ctcm_priv *priv = dev->ml_priv; |
518 | __u16 buflen; | 518 | __u16 buflen; |
519 | int rc; | 519 | int rc; |
520 | 520 | ||
@@ -699,7 +699,7 @@ static void ctcm_chx_cleanup(fsm_instance *fi, int state, | |||
699 | struct channel *ch) | 699 | struct channel *ch) |
700 | { | 700 | { |
701 | struct net_device *dev = ch->netdev; | 701 | struct net_device *dev = ch->netdev; |
702 | struct ctcm_priv *priv = dev->priv; | 702 | struct ctcm_priv *priv = dev->ml_priv; |
703 | 703 | ||
704 | CTCM_DBF_TEXT_(SETUP, CTC_DBF_NOTICE, | 704 | CTCM_DBF_TEXT_(SETUP, CTC_DBF_NOTICE, |
705 | "%s(%s): %s[%d]\n", | 705 | "%s(%s): %s[%d]\n", |
@@ -784,7 +784,7 @@ static void ctcm_chx_setuperr(fsm_instance *fi, int event, void *arg) | |||
784 | { | 784 | { |
785 | struct channel *ch = arg; | 785 | struct channel *ch = arg; |
786 | struct net_device *dev = ch->netdev; | 786 | struct net_device *dev = ch->netdev; |
787 | struct ctcm_priv *priv = dev->priv; | 787 | struct ctcm_priv *priv = dev->ml_priv; |
788 | 788 | ||
789 | /* | 789 | /* |
790 | * Special case: Got UC_RCRESET on setmode. | 790 | * Special case: Got UC_RCRESET on setmode. |
@@ -874,7 +874,7 @@ static void ctcm_chx_rxiniterr(fsm_instance *fi, int event, void *arg) | |||
874 | { | 874 | { |
875 | struct channel *ch = arg; | 875 | struct channel *ch = arg; |
876 | struct net_device *dev = ch->netdev; | 876 | struct net_device *dev = ch->netdev; |
877 | struct ctcm_priv *priv = dev->priv; | 877 | struct ctcm_priv *priv = dev->ml_priv; |
878 | 878 | ||
879 | if (event == CTC_EVENT_TIMER) { | 879 | if (event == CTC_EVENT_TIMER) { |
880 | if (!IS_MPCDEV(dev)) | 880 | if (!IS_MPCDEV(dev)) |
@@ -902,7 +902,7 @@ static void ctcm_chx_rxinitfail(fsm_instance *fi, int event, void *arg) | |||
902 | { | 902 | { |
903 | struct channel *ch = arg; | 903 | struct channel *ch = arg; |
904 | struct net_device *dev = ch->netdev; | 904 | struct net_device *dev = ch->netdev; |
905 | struct ctcm_priv *priv = dev->priv; | 905 | struct ctcm_priv *priv = dev->ml_priv; |
906 | 906 | ||
907 | CTCM_DBF_TEXT_(ERROR, CTC_DBF_ERROR, | 907 | CTCM_DBF_TEXT_(ERROR, CTC_DBF_ERROR, |
908 | "%s(%s): RX %s busy, init. fail", | 908 | "%s(%s): RX %s busy, init. fail", |
@@ -923,7 +923,7 @@ static void ctcm_chx_rxdisc(fsm_instance *fi, int event, void *arg) | |||
923 | struct channel *ch = arg; | 923 | struct channel *ch = arg; |
924 | struct channel *ch2; | 924 | struct channel *ch2; |
925 | struct net_device *dev = ch->netdev; | 925 | struct net_device *dev = ch->netdev; |
926 | struct ctcm_priv *priv = dev->priv; | 926 | struct ctcm_priv *priv = dev->ml_priv; |
927 | 927 | ||
928 | CTCM_DBF_TEXT_(TRACE, CTC_DBF_NOTICE, | 928 | CTCM_DBF_TEXT_(TRACE, CTC_DBF_NOTICE, |
929 | "%s: %s: remote disconnect - re-init ...", | 929 | "%s: %s: remote disconnect - re-init ...", |
@@ -954,7 +954,7 @@ static void ctcm_chx_txiniterr(fsm_instance *fi, int event, void *arg) | |||
954 | { | 954 | { |
955 | struct channel *ch = arg; | 955 | struct channel *ch = arg; |
956 | struct net_device *dev = ch->netdev; | 956 | struct net_device *dev = ch->netdev; |
957 | struct ctcm_priv *priv = dev->priv; | 957 | struct ctcm_priv *priv = dev->ml_priv; |
958 | 958 | ||
959 | if (event == CTC_EVENT_TIMER) { | 959 | if (event == CTC_EVENT_TIMER) { |
960 | fsm_deltimer(&ch->timer); | 960 | fsm_deltimer(&ch->timer); |
@@ -984,7 +984,7 @@ static void ctcm_chx_txretry(fsm_instance *fi, int event, void *arg) | |||
984 | { | 984 | { |
985 | struct channel *ch = arg; | 985 | struct channel *ch = arg; |
986 | struct net_device *dev = ch->netdev; | 986 | struct net_device *dev = ch->netdev; |
987 | struct ctcm_priv *priv = dev->priv; | 987 | struct ctcm_priv *priv = dev->ml_priv; |
988 | struct sk_buff *skb; | 988 | struct sk_buff *skb; |
989 | 989 | ||
990 | CTCM_PR_DEBUG("Enter: %s: cp=%i ch=0x%p id=%s\n", | 990 | CTCM_PR_DEBUG("Enter: %s: cp=%i ch=0x%p id=%s\n", |
@@ -1057,7 +1057,7 @@ static void ctcm_chx_iofatal(fsm_instance *fi, int event, void *arg) | |||
1057 | { | 1057 | { |
1058 | struct channel *ch = arg; | 1058 | struct channel *ch = arg; |
1059 | struct net_device *dev = ch->netdev; | 1059 | struct net_device *dev = ch->netdev; |
1060 | struct ctcm_priv *priv = dev->priv; | 1060 | struct ctcm_priv *priv = dev->ml_priv; |
1061 | int rd = CHANNEL_DIRECTION(ch->flags); | 1061 | int rd = CHANNEL_DIRECTION(ch->flags); |
1062 | 1062 | ||
1063 | fsm_deltimer(&ch->timer); | 1063 | fsm_deltimer(&ch->timer); |
@@ -1207,7 +1207,7 @@ static void ctcmpc_chx_txdone(fsm_instance *fi, int event, void *arg) | |||
1207 | { | 1207 | { |
1208 | struct channel *ch = arg; | 1208 | struct channel *ch = arg; |
1209 | struct net_device *dev = ch->netdev; | 1209 | struct net_device *dev = ch->netdev; |
1210 | struct ctcm_priv *priv = dev->priv; | 1210 | struct ctcm_priv *priv = dev->ml_priv; |
1211 | struct mpc_group *grp = priv->mpcg; | 1211 | struct mpc_group *grp = priv->mpcg; |
1212 | struct sk_buff *skb; | 1212 | struct sk_buff *skb; |
1213 | int first = 1; | 1213 | int first = 1; |
@@ -1368,7 +1368,7 @@ static void ctcmpc_chx_rx(fsm_instance *fi, int event, void *arg) | |||
1368 | { | 1368 | { |
1369 | struct channel *ch = arg; | 1369 | struct channel *ch = arg; |
1370 | struct net_device *dev = ch->netdev; | 1370 | struct net_device *dev = ch->netdev; |
1371 | struct ctcm_priv *priv = dev->priv; | 1371 | struct ctcm_priv *priv = dev->ml_priv; |
1372 | struct mpc_group *grp = priv->mpcg; | 1372 | struct mpc_group *grp = priv->mpcg; |
1373 | struct sk_buff *skb = ch->trans_skb; | 1373 | struct sk_buff *skb = ch->trans_skb; |
1374 | struct sk_buff *new_skb; | 1374 | struct sk_buff *new_skb; |
@@ -1471,7 +1471,7 @@ static void ctcmpc_chx_firstio(fsm_instance *fi, int event, void *arg) | |||
1471 | { | 1471 | { |
1472 | struct channel *ch = arg; | 1472 | struct channel *ch = arg; |
1473 | struct net_device *dev = ch->netdev; | 1473 | struct net_device *dev = ch->netdev; |
1474 | struct ctcm_priv *priv = dev->priv; | 1474 | struct ctcm_priv *priv = dev->ml_priv; |
1475 | struct mpc_group *gptr = priv->mpcg; | 1475 | struct mpc_group *gptr = priv->mpcg; |
1476 | 1476 | ||
1477 | CTCM_PR_DEBUG("Enter %s: id=%s, ch=0x%p\n", | 1477 | CTCM_PR_DEBUG("Enter %s: id=%s, ch=0x%p\n", |
@@ -1525,7 +1525,7 @@ void ctcmpc_chx_rxidle(fsm_instance *fi, int event, void *arg) | |||
1525 | { | 1525 | { |
1526 | struct channel *ch = arg; | 1526 | struct channel *ch = arg; |
1527 | struct net_device *dev = ch->netdev; | 1527 | struct net_device *dev = ch->netdev; |
1528 | struct ctcm_priv *priv = dev->priv; | 1528 | struct ctcm_priv *priv = dev->ml_priv; |
1529 | struct mpc_group *grp = priv->mpcg; | 1529 | struct mpc_group *grp = priv->mpcg; |
1530 | int rc; | 1530 | int rc; |
1531 | unsigned long saveflags = 0; /* avoids compiler warning */ | 1531 | unsigned long saveflags = 0; /* avoids compiler warning */ |
@@ -1580,7 +1580,7 @@ static void ctcmpc_chx_attn(fsm_instance *fsm, int event, void *arg) | |||
1580 | { | 1580 | { |
1581 | struct channel *ch = arg; | 1581 | struct channel *ch = arg; |
1582 | struct net_device *dev = ch->netdev; | 1582 | struct net_device *dev = ch->netdev; |
1583 | struct ctcm_priv *priv = dev->priv; | 1583 | struct ctcm_priv *priv = dev->ml_priv; |
1584 | struct mpc_group *grp = priv->mpcg; | 1584 | struct mpc_group *grp = priv->mpcg; |
1585 | 1585 | ||
1586 | CTCM_PR_DEBUG("%s(%s): %s(ch=0x%p), cp=%i, ChStat:%s, GrpStat:%s\n", | 1586 | CTCM_PR_DEBUG("%s(%s): %s(ch=0x%p), cp=%i, ChStat:%s, GrpStat:%s\n", |
@@ -1639,7 +1639,7 @@ static void ctcmpc_chx_attnbusy(fsm_instance *fsm, int event, void *arg) | |||
1639 | { | 1639 | { |
1640 | struct channel *ch = arg; | 1640 | struct channel *ch = arg; |
1641 | struct net_device *dev = ch->netdev; | 1641 | struct net_device *dev = ch->netdev; |
1642 | struct ctcm_priv *priv = dev->priv; | 1642 | struct ctcm_priv *priv = dev->ml_priv; |
1643 | struct mpc_group *grp = priv->mpcg; | 1643 | struct mpc_group *grp = priv->mpcg; |
1644 | 1644 | ||
1645 | CTCM_PR_DEBUG("%s(%s): %s\n ChState:%s GrpState:%s\n", | 1645 | CTCM_PR_DEBUG("%s(%s): %s\n ChState:%s GrpState:%s\n", |
@@ -1724,7 +1724,7 @@ static void ctcmpc_chx_resend(fsm_instance *fsm, int event, void *arg) | |||
1724 | { | 1724 | { |
1725 | struct channel *ch = arg; | 1725 | struct channel *ch = arg; |
1726 | struct net_device *dev = ch->netdev; | 1726 | struct net_device *dev = ch->netdev; |
1727 | struct ctcm_priv *priv = dev->priv; | 1727 | struct ctcm_priv *priv = dev->ml_priv; |
1728 | struct mpc_group *grp = priv->mpcg; | 1728 | struct mpc_group *grp = priv->mpcg; |
1729 | 1729 | ||
1730 | fsm_event(grp->fsm, MPCG_EVENT_XID0DO, ch); | 1730 | fsm_event(grp->fsm, MPCG_EVENT_XID0DO, ch); |
@@ -1740,7 +1740,7 @@ static void ctcmpc_chx_send_sweep(fsm_instance *fsm, int event, void *arg) | |||
1740 | { | 1740 | { |
1741 | struct channel *ach = arg; | 1741 | struct channel *ach = arg; |
1742 | struct net_device *dev = ach->netdev; | 1742 | struct net_device *dev = ach->netdev; |
1743 | struct ctcm_priv *priv = dev->priv; | 1743 | struct ctcm_priv *priv = dev->ml_priv; |
1744 | struct mpc_group *grp = priv->mpcg; | 1744 | struct mpc_group *grp = priv->mpcg; |
1745 | struct channel *wch = priv->channel[WRITE]; | 1745 | struct channel *wch = priv->channel[WRITE]; |
1746 | struct channel *rch = priv->channel[READ]; | 1746 | struct channel *rch = priv->channel[READ]; |
@@ -2050,7 +2050,7 @@ int mpc_ch_fsm_len = ARRAY_SIZE(ctcmpc_ch_fsm); | |||
2050 | static void dev_action_start(fsm_instance *fi, int event, void *arg) | 2050 | static void dev_action_start(fsm_instance *fi, int event, void *arg) |
2051 | { | 2051 | { |
2052 | struct net_device *dev = arg; | 2052 | struct net_device *dev = arg; |
2053 | struct ctcm_priv *priv = dev->priv; | 2053 | struct ctcm_priv *priv = dev->ml_priv; |
2054 | int direction; | 2054 | int direction; |
2055 | 2055 | ||
2056 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); | 2056 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); |
@@ -2076,7 +2076,7 @@ static void dev_action_stop(fsm_instance *fi, int event, void *arg) | |||
2076 | { | 2076 | { |
2077 | int direction; | 2077 | int direction; |
2078 | struct net_device *dev = arg; | 2078 | struct net_device *dev = arg; |
2079 | struct ctcm_priv *priv = dev->priv; | 2079 | struct ctcm_priv *priv = dev->ml_priv; |
2080 | 2080 | ||
2081 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); | 2081 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); |
2082 | 2082 | ||
@@ -2096,7 +2096,7 @@ static void dev_action_restart(fsm_instance *fi, int event, void *arg) | |||
2096 | { | 2096 | { |
2097 | int restart_timer; | 2097 | int restart_timer; |
2098 | struct net_device *dev = arg; | 2098 | struct net_device *dev = arg; |
2099 | struct ctcm_priv *priv = dev->priv; | 2099 | struct ctcm_priv *priv = dev->ml_priv; |
2100 | 2100 | ||
2101 | CTCMY_DBF_DEV_NAME(TRACE, dev, ""); | 2101 | CTCMY_DBF_DEV_NAME(TRACE, dev, ""); |
2102 | 2102 | ||
@@ -2133,12 +2133,12 @@ static void dev_action_restart(fsm_instance *fi, int event, void *arg) | |||
2133 | static void dev_action_chup(fsm_instance *fi, int event, void *arg) | 2133 | static void dev_action_chup(fsm_instance *fi, int event, void *arg) |
2134 | { | 2134 | { |
2135 | struct net_device *dev = arg; | 2135 | struct net_device *dev = arg; |
2136 | struct ctcm_priv *priv = dev->priv; | 2136 | struct ctcm_priv *priv = dev->ml_priv; |
2137 | int dev_stat = fsm_getstate(fi); | 2137 | int dev_stat = fsm_getstate(fi); |
2138 | 2138 | ||
2139 | CTCM_DBF_TEXT_(SETUP, CTC_DBF_NOTICE, | 2139 | CTCM_DBF_TEXT_(SETUP, CTC_DBF_NOTICE, |
2140 | "%s(%s): priv = %p [%d,%d]\n ", CTCM_FUNTAIL, | 2140 | "%s(%s): priv = %p [%d,%d]\n ", CTCM_FUNTAIL, |
2141 | dev->name, dev->priv, dev_stat, event); | 2141 | dev->name, dev->ml_priv, dev_stat, event); |
2142 | 2142 | ||
2143 | switch (fsm_getstate(fi)) { | 2143 | switch (fsm_getstate(fi)) { |
2144 | case DEV_STATE_STARTWAIT_RXTX: | 2144 | case DEV_STATE_STARTWAIT_RXTX: |
@@ -2195,7 +2195,7 @@ static void dev_action_chdown(fsm_instance *fi, int event, void *arg) | |||
2195 | { | 2195 | { |
2196 | 2196 | ||
2197 | struct net_device *dev = arg; | 2197 | struct net_device *dev = arg; |
2198 | struct ctcm_priv *priv = dev->priv; | 2198 | struct ctcm_priv *priv = dev->ml_priv; |
2199 | 2199 | ||
2200 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); | 2200 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); |
2201 | 2201 | ||
diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c index 126a3ebb8ab2..b11fec24c7d2 100644 --- a/drivers/s390/net/ctcm_main.c +++ b/drivers/s390/net/ctcm_main.c | |||
@@ -69,7 +69,7 @@ struct channel *channels; | |||
69 | void ctcm_unpack_skb(struct channel *ch, struct sk_buff *pskb) | 69 | void ctcm_unpack_skb(struct channel *ch, struct sk_buff *pskb) |
70 | { | 70 | { |
71 | struct net_device *dev = ch->netdev; | 71 | struct net_device *dev = ch->netdev; |
72 | struct ctcm_priv *priv = dev->priv; | 72 | struct ctcm_priv *priv = dev->ml_priv; |
73 | __u16 len = *((__u16 *) pskb->data); | 73 | __u16 len = *((__u16 *) pskb->data); |
74 | 74 | ||
75 | skb_put(pskb, 2 + LL_HEADER_LENGTH); | 75 | skb_put(pskb, 2 + LL_HEADER_LENGTH); |
@@ -414,7 +414,7 @@ int ctcm_ch_alloc_buffer(struct channel *ch) | |||
414 | */ | 414 | */ |
415 | int ctcm_open(struct net_device *dev) | 415 | int ctcm_open(struct net_device *dev) |
416 | { | 416 | { |
417 | struct ctcm_priv *priv = dev->priv; | 417 | struct ctcm_priv *priv = dev->ml_priv; |
418 | 418 | ||
419 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); | 419 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); |
420 | if (!IS_MPC(priv)) | 420 | if (!IS_MPC(priv)) |
@@ -432,7 +432,7 @@ int ctcm_open(struct net_device *dev) | |||
432 | */ | 432 | */ |
433 | int ctcm_close(struct net_device *dev) | 433 | int ctcm_close(struct net_device *dev) |
434 | { | 434 | { |
435 | struct ctcm_priv *priv = dev->priv; | 435 | struct ctcm_priv *priv = dev->ml_priv; |
436 | 436 | ||
437 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); | 437 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); |
438 | if (!IS_MPC(priv)) | 438 | if (!IS_MPC(priv)) |
@@ -573,7 +573,7 @@ static int ctcm_transmit_skb(struct channel *ch, struct sk_buff *skb) | |||
573 | skb_pull(skb, LL_HEADER_LENGTH + 2); | 573 | skb_pull(skb, LL_HEADER_LENGTH + 2); |
574 | } else if (ccw_idx == 0) { | 574 | } else if (ccw_idx == 0) { |
575 | struct net_device *dev = ch->netdev; | 575 | struct net_device *dev = ch->netdev; |
576 | struct ctcm_priv *priv = dev->priv; | 576 | struct ctcm_priv *priv = dev->ml_priv; |
577 | priv->stats.tx_packets++; | 577 | priv->stats.tx_packets++; |
578 | priv->stats.tx_bytes += skb->len - LL_HEADER_LENGTH; | 578 | priv->stats.tx_bytes += skb->len - LL_HEADER_LENGTH; |
579 | } | 579 | } |
@@ -592,7 +592,7 @@ static void ctcmpc_send_sweep_req(struct channel *rch) | |||
592 | struct channel *ch; | 592 | struct channel *ch; |
593 | /* int rc = 0; */ | 593 | /* int rc = 0; */ |
594 | 594 | ||
595 | priv = dev->priv; | 595 | priv = dev->ml_priv; |
596 | grp = priv->mpcg; | 596 | grp = priv->mpcg; |
597 | ch = priv->channel[WRITE]; | 597 | ch = priv->channel[WRITE]; |
598 | 598 | ||
@@ -652,7 +652,7 @@ static int ctcmpc_transmit_skb(struct channel *ch, struct sk_buff *skb) | |||
652 | { | 652 | { |
653 | struct pdu *p_header; | 653 | struct pdu *p_header; |
654 | struct net_device *dev = ch->netdev; | 654 | struct net_device *dev = ch->netdev; |
655 | struct ctcm_priv *priv = dev->priv; | 655 | struct ctcm_priv *priv = dev->ml_priv; |
656 | struct mpc_group *grp = priv->mpcg; | 656 | struct mpc_group *grp = priv->mpcg; |
657 | struct th_header *header; | 657 | struct th_header *header; |
658 | struct sk_buff *nskb; | 658 | struct sk_buff *nskb; |
@@ -867,7 +867,7 @@ done: | |||
867 | /* first merge version - leaving both functions separated */ | 867 | /* first merge version - leaving both functions separated */ |
868 | static int ctcm_tx(struct sk_buff *skb, struct net_device *dev) | 868 | static int ctcm_tx(struct sk_buff *skb, struct net_device *dev) |
869 | { | 869 | { |
870 | struct ctcm_priv *priv = dev->priv; | 870 | struct ctcm_priv *priv = dev->ml_priv; |
871 | 871 | ||
872 | if (skb == NULL) { | 872 | if (skb == NULL) { |
873 | CTCM_DBF_TEXT_(ERROR, CTC_DBF_ERROR, | 873 | CTCM_DBF_TEXT_(ERROR, CTC_DBF_ERROR, |
@@ -911,7 +911,7 @@ static int ctcm_tx(struct sk_buff *skb, struct net_device *dev) | |||
911 | static int ctcmpc_tx(struct sk_buff *skb, struct net_device *dev) | 911 | static int ctcmpc_tx(struct sk_buff *skb, struct net_device *dev) |
912 | { | 912 | { |
913 | int len = 0; | 913 | int len = 0; |
914 | struct ctcm_priv *priv = dev->priv; | 914 | struct ctcm_priv *priv = dev->ml_priv; |
915 | struct mpc_group *grp = priv->mpcg; | 915 | struct mpc_group *grp = priv->mpcg; |
916 | struct sk_buff *newskb = NULL; | 916 | struct sk_buff *newskb = NULL; |
917 | 917 | ||
@@ -1025,7 +1025,7 @@ static int ctcm_change_mtu(struct net_device *dev, int new_mtu) | |||
1025 | if (new_mtu < 576 || new_mtu > 65527) | 1025 | if (new_mtu < 576 || new_mtu > 65527) |
1026 | return -EINVAL; | 1026 | return -EINVAL; |
1027 | 1027 | ||
1028 | priv = dev->priv; | 1028 | priv = dev->ml_priv; |
1029 | max_bufsize = priv->channel[READ]->max_bufsize; | 1029 | max_bufsize = priv->channel[READ]->max_bufsize; |
1030 | 1030 | ||
1031 | if (IS_MPC(priv)) { | 1031 | if (IS_MPC(priv)) { |
@@ -1050,7 +1050,7 @@ static int ctcm_change_mtu(struct net_device *dev, int new_mtu) | |||
1050 | */ | 1050 | */ |
1051 | static struct net_device_stats *ctcm_stats(struct net_device *dev) | 1051 | static struct net_device_stats *ctcm_stats(struct net_device *dev) |
1052 | { | 1052 | { |
1053 | return &((struct ctcm_priv *)dev->priv)->stats; | 1053 | return &((struct ctcm_priv *)dev->ml_priv)->stats; |
1054 | } | 1054 | } |
1055 | 1055 | ||
1056 | static void ctcm_free_netdevice(struct net_device *dev) | 1056 | static void ctcm_free_netdevice(struct net_device *dev) |
@@ -1060,7 +1060,7 @@ static void ctcm_free_netdevice(struct net_device *dev) | |||
1060 | 1060 | ||
1061 | CTCM_DBF_TEXT_(SETUP, CTC_DBF_INFO, | 1061 | CTCM_DBF_TEXT_(SETUP, CTC_DBF_INFO, |
1062 | "%s(%s)", CTCM_FUNTAIL, dev->name); | 1062 | "%s(%s)", CTCM_FUNTAIL, dev->name); |
1063 | priv = dev->priv; | 1063 | priv = dev->ml_priv; |
1064 | if (priv) { | 1064 | if (priv) { |
1065 | grp = priv->mpcg; | 1065 | grp = priv->mpcg; |
1066 | if (grp) { | 1066 | if (grp) { |
@@ -1125,7 +1125,7 @@ static struct net_device *ctcm_init_netdevice(struct ctcm_priv *priv) | |||
1125 | CTCM_FUNTAIL); | 1125 | CTCM_FUNTAIL); |
1126 | return NULL; | 1126 | return NULL; |
1127 | } | 1127 | } |
1128 | dev->priv = priv; | 1128 | dev->ml_priv = priv; |
1129 | priv->fsm = init_fsm("ctcmdev", dev_state_names, dev_event_names, | 1129 | priv->fsm = init_fsm("ctcmdev", dev_state_names, dev_event_names, |
1130 | CTCM_NR_DEV_STATES, CTCM_NR_DEV_EVENTS, | 1130 | CTCM_NR_DEV_STATES, CTCM_NR_DEV_EVENTS, |
1131 | dev_fsm, dev_fsm_len, GFP_KERNEL); | 1131 | dev_fsm, dev_fsm_len, GFP_KERNEL); |
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 | { |
diff --git a/drivers/s390/net/ctcm_mpc.c b/drivers/s390/net/ctcm_mpc.c index 49ae1cd25caa..407f816f091b 100644 --- a/drivers/s390/net/ctcm_mpc.c +++ b/drivers/s390/net/ctcm_mpc.c | |||
@@ -313,10 +313,10 @@ static struct net_device *ctcmpc_get_dev(int port_num) | |||
313 | CTCM_FUNTAIL, device); | 313 | CTCM_FUNTAIL, device); |
314 | return NULL; | 314 | return NULL; |
315 | } | 315 | } |
316 | priv = dev->priv; | 316 | priv = dev->ml_priv; |
317 | if (priv == NULL) { | 317 | if (priv == NULL) { |
318 | CTCM_DBF_TEXT_(MPC_ERROR, CTC_DBF_ERROR, | 318 | CTCM_DBF_TEXT_(MPC_ERROR, CTC_DBF_ERROR, |
319 | "%s(%s): dev->priv is NULL", | 319 | "%s(%s): dev->ml_priv is NULL", |
320 | CTCM_FUNTAIL, device); | 320 | CTCM_FUNTAIL, device); |
321 | return NULL; | 321 | return NULL; |
322 | } | 322 | } |
@@ -345,7 +345,7 @@ int ctc_mpc_alloc_channel(int port_num, void (*callback)(int, int)) | |||
345 | dev = ctcmpc_get_dev(port_num); | 345 | dev = ctcmpc_get_dev(port_num); |
346 | if (dev == NULL) | 346 | if (dev == NULL) |
347 | return 1; | 347 | return 1; |
348 | priv = dev->priv; | 348 | priv = dev->ml_priv; |
349 | grp = priv->mpcg; | 349 | grp = priv->mpcg; |
350 | 350 | ||
351 | grp->allochanfunc = callback; | 351 | grp->allochanfunc = callback; |
@@ -417,7 +417,7 @@ void ctc_mpc_establish_connectivity(int port_num, | |||
417 | dev = ctcmpc_get_dev(port_num); | 417 | dev = ctcmpc_get_dev(port_num); |
418 | if (dev == NULL) | 418 | if (dev == NULL) |
419 | return; | 419 | return; |
420 | priv = dev->priv; | 420 | priv = dev->ml_priv; |
421 | grp = priv->mpcg; | 421 | grp = priv->mpcg; |
422 | rch = priv->channel[READ]; | 422 | rch = priv->channel[READ]; |
423 | wch = priv->channel[WRITE]; | 423 | wch = priv->channel[WRITE]; |
@@ -535,7 +535,7 @@ void ctc_mpc_dealloc_ch(int port_num) | |||
535 | dev = ctcmpc_get_dev(port_num); | 535 | dev = ctcmpc_get_dev(port_num); |
536 | if (dev == NULL) | 536 | if (dev == NULL) |
537 | return; | 537 | return; |
538 | priv = dev->priv; | 538 | priv = dev->ml_priv; |
539 | grp = priv->mpcg; | 539 | grp = priv->mpcg; |
540 | 540 | ||
541 | CTCM_DBF_TEXT_(MPC_SETUP, CTC_DBF_DEBUG, | 541 | CTCM_DBF_TEXT_(MPC_SETUP, CTC_DBF_DEBUG, |
@@ -571,7 +571,7 @@ void ctc_mpc_flow_control(int port_num, int flowc) | |||
571 | dev = ctcmpc_get_dev(port_num); | 571 | dev = ctcmpc_get_dev(port_num); |
572 | if (dev == NULL) | 572 | if (dev == NULL) |
573 | return; | 573 | return; |
574 | priv = dev->priv; | 574 | priv = dev->ml_priv; |
575 | grp = priv->mpcg; | 575 | grp = priv->mpcg; |
576 | 576 | ||
577 | CTCM_DBF_TEXT_(MPC_TRACE, CTC_DBF_DEBUG, | 577 | CTCM_DBF_TEXT_(MPC_TRACE, CTC_DBF_DEBUG, |
@@ -620,7 +620,7 @@ static void mpc_rcvd_sweep_resp(struct mpcg_info *mpcginfo) | |||
620 | { | 620 | { |
621 | struct channel *rch = mpcginfo->ch; | 621 | struct channel *rch = mpcginfo->ch; |
622 | struct net_device *dev = rch->netdev; | 622 | struct net_device *dev = rch->netdev; |
623 | struct ctcm_priv *priv = dev->priv; | 623 | struct ctcm_priv *priv = dev->ml_priv; |
624 | struct mpc_group *grp = priv->mpcg; | 624 | struct mpc_group *grp = priv->mpcg; |
625 | struct channel *ch = priv->channel[WRITE]; | 625 | struct channel *ch = priv->channel[WRITE]; |
626 | 626 | ||
@@ -651,7 +651,7 @@ static void mpc_rcvd_sweep_resp(struct mpcg_info *mpcginfo) | |||
651 | static void ctcmpc_send_sweep_resp(struct channel *rch) | 651 | static void ctcmpc_send_sweep_resp(struct channel *rch) |
652 | { | 652 | { |
653 | struct net_device *dev = rch->netdev; | 653 | struct net_device *dev = rch->netdev; |
654 | struct ctcm_priv *priv = dev->priv; | 654 | struct ctcm_priv *priv = dev->ml_priv; |
655 | struct mpc_group *grp = priv->mpcg; | 655 | struct mpc_group *grp = priv->mpcg; |
656 | int rc = 0; | 656 | int rc = 0; |
657 | struct th_sweep *header; | 657 | struct th_sweep *header; |
@@ -713,7 +713,7 @@ static void mpc_rcvd_sweep_req(struct mpcg_info *mpcginfo) | |||
713 | { | 713 | { |
714 | struct channel *rch = mpcginfo->ch; | 714 | struct channel *rch = mpcginfo->ch; |
715 | struct net_device *dev = rch->netdev; | 715 | struct net_device *dev = rch->netdev; |
716 | struct ctcm_priv *priv = dev->priv; | 716 | struct ctcm_priv *priv = dev->ml_priv; |
717 | struct mpc_group *grp = priv->mpcg; | 717 | struct mpc_group *grp = priv->mpcg; |
718 | struct channel *ch = priv->channel[WRITE]; | 718 | struct channel *ch = priv->channel[WRITE]; |
719 | 719 | ||
@@ -847,7 +847,7 @@ static int mpcg_fsm_len = ARRAY_SIZE(mpcg_fsm); | |||
847 | static void mpc_action_go_ready(fsm_instance *fsm, int event, void *arg) | 847 | static void mpc_action_go_ready(fsm_instance *fsm, int event, void *arg) |
848 | { | 848 | { |
849 | struct net_device *dev = arg; | 849 | struct net_device *dev = arg; |
850 | struct ctcm_priv *priv = dev->priv; | 850 | struct ctcm_priv *priv = dev->ml_priv; |
851 | struct mpc_group *grp = priv->mpcg; | 851 | struct mpc_group *grp = priv->mpcg; |
852 | 852 | ||
853 | if (grp == NULL) { | 853 | if (grp == NULL) { |
@@ -891,7 +891,7 @@ static void mpc_action_go_ready(fsm_instance *fsm, int event, void *arg) | |||
891 | void mpc_group_ready(unsigned long adev) | 891 | void mpc_group_ready(unsigned long adev) |
892 | { | 892 | { |
893 | struct net_device *dev = (struct net_device *)adev; | 893 | struct net_device *dev = (struct net_device *)adev; |
894 | struct ctcm_priv *priv = dev->priv; | 894 | struct ctcm_priv *priv = dev->ml_priv; |
895 | struct mpc_group *grp = priv->mpcg; | 895 | struct mpc_group *grp = priv->mpcg; |
896 | struct channel *ch = NULL; | 896 | struct channel *ch = NULL; |
897 | 897 | ||
@@ -947,7 +947,7 @@ void mpc_group_ready(unsigned long adev) | |||
947 | void mpc_channel_action(struct channel *ch, int direction, int action) | 947 | void mpc_channel_action(struct channel *ch, int direction, int action) |
948 | { | 948 | { |
949 | struct net_device *dev = ch->netdev; | 949 | struct net_device *dev = ch->netdev; |
950 | struct ctcm_priv *priv = dev->priv; | 950 | struct ctcm_priv *priv = dev->ml_priv; |
951 | struct mpc_group *grp = priv->mpcg; | 951 | struct mpc_group *grp = priv->mpcg; |
952 | 952 | ||
953 | if (grp == NULL) { | 953 | if (grp == NULL) { |
@@ -1057,7 +1057,7 @@ done: | |||
1057 | static void ctcmpc_unpack_skb(struct channel *ch, struct sk_buff *pskb) | 1057 | static void ctcmpc_unpack_skb(struct channel *ch, struct sk_buff *pskb) |
1058 | { | 1058 | { |
1059 | struct net_device *dev = ch->netdev; | 1059 | struct net_device *dev = ch->netdev; |
1060 | struct ctcm_priv *priv = dev->priv; | 1060 | struct ctcm_priv *priv = dev->ml_priv; |
1061 | struct mpc_group *grp = priv->mpcg; | 1061 | struct mpc_group *grp = priv->mpcg; |
1062 | struct pdu *curr_pdu; | 1062 | struct pdu *curr_pdu; |
1063 | struct mpcg_info *mpcginfo; | 1063 | struct mpcg_info *mpcginfo; |
@@ -1255,7 +1255,7 @@ void ctcmpc_bh(unsigned long thischan) | |||
1255 | struct channel *ch = (struct channel *)thischan; | 1255 | struct channel *ch = (struct channel *)thischan; |
1256 | struct sk_buff *skb; | 1256 | struct sk_buff *skb; |
1257 | struct net_device *dev = ch->netdev; | 1257 | struct net_device *dev = ch->netdev; |
1258 | struct ctcm_priv *priv = dev->priv; | 1258 | struct ctcm_priv *priv = dev->ml_priv; |
1259 | struct mpc_group *grp = priv->mpcg; | 1259 | struct mpc_group *grp = priv->mpcg; |
1260 | 1260 | ||
1261 | CTCM_PR_DEBUG("%s cp:%i enter: %s() %s\n", | 1261 | CTCM_PR_DEBUG("%s cp:%i enter: %s() %s\n", |
@@ -1377,7 +1377,7 @@ static void mpc_action_go_inop(fsm_instance *fi, int event, void *arg) | |||
1377 | BUG_ON(dev == NULL); | 1377 | BUG_ON(dev == NULL); |
1378 | CTCM_PR_DEBUG("Enter %s: %s\n", __func__, dev->name); | 1378 | CTCM_PR_DEBUG("Enter %s: %s\n", __func__, dev->name); |
1379 | 1379 | ||
1380 | priv = dev->priv; | 1380 | priv = dev->ml_priv; |
1381 | grp = priv->mpcg; | 1381 | grp = priv->mpcg; |
1382 | grp->flow_off_called = 0; | 1382 | grp->flow_off_called = 0; |
1383 | fsm_deltimer(&grp->timer); | 1383 | fsm_deltimer(&grp->timer); |
@@ -1483,7 +1483,7 @@ static void mpc_action_timeout(fsm_instance *fi, int event, void *arg) | |||
1483 | 1483 | ||
1484 | BUG_ON(dev == NULL); | 1484 | BUG_ON(dev == NULL); |
1485 | 1485 | ||
1486 | priv = dev->priv; | 1486 | priv = dev->ml_priv; |
1487 | grp = priv->mpcg; | 1487 | grp = priv->mpcg; |
1488 | wch = priv->channel[WRITE]; | 1488 | wch = priv->channel[WRITE]; |
1489 | rch = priv->channel[READ]; | 1489 | rch = priv->channel[READ]; |
@@ -1521,7 +1521,7 @@ void mpc_action_discontact(fsm_instance *fi, int event, void *arg) | |||
1521 | if (ch) { | 1521 | if (ch) { |
1522 | dev = ch->netdev; | 1522 | dev = ch->netdev; |
1523 | if (dev) { | 1523 | if (dev) { |
1524 | priv = dev->priv; | 1524 | priv = dev->ml_priv; |
1525 | if (priv) { | 1525 | if (priv) { |
1526 | CTCM_DBF_TEXT_(MPC_TRACE, CTC_DBF_NOTICE, | 1526 | CTCM_DBF_TEXT_(MPC_TRACE, CTC_DBF_NOTICE, |
1527 | "%s: %s: %s\n", | 1527 | "%s: %s: %s\n", |
@@ -1569,7 +1569,7 @@ static int mpc_validate_xid(struct mpcg_info *mpcginfo) | |||
1569 | { | 1569 | { |
1570 | struct channel *ch = mpcginfo->ch; | 1570 | struct channel *ch = mpcginfo->ch; |
1571 | struct net_device *dev = ch->netdev; | 1571 | struct net_device *dev = ch->netdev; |
1572 | struct ctcm_priv *priv = dev->priv; | 1572 | struct ctcm_priv *priv = dev->ml_priv; |
1573 | struct mpc_group *grp = priv->mpcg; | 1573 | struct mpc_group *grp = priv->mpcg; |
1574 | struct xid2 *xid = mpcginfo->xid; | 1574 | struct xid2 *xid = mpcginfo->xid; |
1575 | int rc = 0; | 1575 | int rc = 0; |
@@ -1866,7 +1866,7 @@ static void mpc_action_doxid0(fsm_instance *fsm, int event, void *arg) | |||
1866 | { | 1866 | { |
1867 | struct channel *ch = arg; | 1867 | struct channel *ch = arg; |
1868 | struct net_device *dev = ch->netdev; | 1868 | struct net_device *dev = ch->netdev; |
1869 | struct ctcm_priv *priv = dev->priv; | 1869 | struct ctcm_priv *priv = dev->ml_priv; |
1870 | struct mpc_group *grp = priv->mpcg; | 1870 | struct mpc_group *grp = priv->mpcg; |
1871 | 1871 | ||
1872 | CTCM_PR_DEBUG("Enter %s: cp=%i ch=0x%p id=%s\n", | 1872 | CTCM_PR_DEBUG("Enter %s: cp=%i ch=0x%p id=%s\n", |
@@ -1906,7 +1906,7 @@ static void mpc_action_doxid0(fsm_instance *fsm, int event, void *arg) | |||
1906 | static void mpc_action_doxid7(fsm_instance *fsm, int event, void *arg) | 1906 | static void mpc_action_doxid7(fsm_instance *fsm, int event, void *arg) |
1907 | { | 1907 | { |
1908 | struct net_device *dev = arg; | 1908 | struct net_device *dev = arg; |
1909 | struct ctcm_priv *priv = dev->priv; | 1909 | struct ctcm_priv *priv = dev->ml_priv; |
1910 | struct mpc_group *grp = NULL; | 1910 | struct mpc_group *grp = NULL; |
1911 | int direction; | 1911 | int direction; |
1912 | int send = 0; | 1912 | int send = 0; |
@@ -1983,7 +1983,7 @@ static void mpc_action_rcvd_xid0(fsm_instance *fsm, int event, void *arg) | |||
1983 | struct mpcg_info *mpcginfo = arg; | 1983 | struct mpcg_info *mpcginfo = arg; |
1984 | struct channel *ch = mpcginfo->ch; | 1984 | struct channel *ch = mpcginfo->ch; |
1985 | struct net_device *dev = ch->netdev; | 1985 | struct net_device *dev = ch->netdev; |
1986 | struct ctcm_priv *priv = dev->priv; | 1986 | struct ctcm_priv *priv = dev->ml_priv; |
1987 | struct mpc_group *grp = priv->mpcg; | 1987 | struct mpc_group *grp = priv->mpcg; |
1988 | 1988 | ||
1989 | CTCM_PR_DEBUG("%s: ch-id:%s xid2:%i xid7:%i xidt_p2:%i \n", | 1989 | CTCM_PR_DEBUG("%s: ch-id:%s xid2:%i xid7:%i xidt_p2:%i \n", |
@@ -2045,7 +2045,7 @@ static void mpc_action_rcvd_xid7(fsm_instance *fsm, int event, void *arg) | |||
2045 | struct mpcg_info *mpcginfo = arg; | 2045 | struct mpcg_info *mpcginfo = arg; |
2046 | struct channel *ch = mpcginfo->ch; | 2046 | struct channel *ch = mpcginfo->ch; |
2047 | struct net_device *dev = ch->netdev; | 2047 | struct net_device *dev = ch->netdev; |
2048 | struct ctcm_priv *priv = dev->priv; | 2048 | struct ctcm_priv *priv = dev->ml_priv; |
2049 | struct mpc_group *grp = priv->mpcg; | 2049 | struct mpc_group *grp = priv->mpcg; |
2050 | 2050 | ||
2051 | CTCM_PR_DEBUG("Enter %s: cp=%i ch=0x%p id=%s\n", | 2051 | CTCM_PR_DEBUG("Enter %s: cp=%i ch=0x%p id=%s\n", |
@@ -2097,7 +2097,7 @@ static int mpc_send_qllc_discontact(struct net_device *dev) | |||
2097 | __u32 new_len = 0; | 2097 | __u32 new_len = 0; |
2098 | struct sk_buff *skb; | 2098 | struct sk_buff *skb; |
2099 | struct qllc *qllcptr; | 2099 | struct qllc *qllcptr; |
2100 | struct ctcm_priv *priv = dev->priv; | 2100 | struct ctcm_priv *priv = dev->ml_priv; |
2101 | struct mpc_group *grp = priv->mpcg; | 2101 | struct mpc_group *grp = priv->mpcg; |
2102 | 2102 | ||
2103 | CTCM_PR_DEBUG("%s: GROUP STATE: %s\n", | 2103 | CTCM_PR_DEBUG("%s: GROUP STATE: %s\n", |