aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/net/ctcm_mpc.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/s390/net/ctcm_mpc.c')
-rw-r--r--drivers/s390/net/ctcm_mpc.c47
1 files changed, 23 insertions, 24 deletions
diff --git a/drivers/s390/net/ctcm_mpc.c b/drivers/s390/net/ctcm_mpc.c
index 49ae1cd25caa..cbe470493bf0 100644
--- a/drivers/s390/net/ctcm_mpc.c
+++ b/drivers/s390/net/ctcm_mpc.c
@@ -19,7 +19,6 @@
19#undef DEBUGDATA 19#undef DEBUGDATA
20#undef DEBUGCCW 20#undef DEBUGCCW
21 21
22#include <linux/version.h>
23#include <linux/module.h> 22#include <linux/module.h>
24#include <linux/init.h> 23#include <linux/init.h>
25#include <linux/kernel.h> 24#include <linux/kernel.h>
@@ -313,10 +312,10 @@ static struct net_device *ctcmpc_get_dev(int port_num)
313 CTCM_FUNTAIL, device); 312 CTCM_FUNTAIL, device);
314 return NULL; 313 return NULL;
315 } 314 }
316 priv = dev->priv; 315 priv = dev->ml_priv;
317 if (priv == NULL) { 316 if (priv == NULL) {
318 CTCM_DBF_TEXT_(MPC_ERROR, CTC_DBF_ERROR, 317 CTCM_DBF_TEXT_(MPC_ERROR, CTC_DBF_ERROR,
319 "%s(%s): dev->priv is NULL", 318 "%s(%s): dev->ml_priv is NULL",
320 CTCM_FUNTAIL, device); 319 CTCM_FUNTAIL, device);
321 return NULL; 320 return NULL;
322 } 321 }
@@ -345,7 +344,7 @@ int ctc_mpc_alloc_channel(int port_num, void (*callback)(int, int))
345 dev = ctcmpc_get_dev(port_num); 344 dev = ctcmpc_get_dev(port_num);
346 if (dev == NULL) 345 if (dev == NULL)
347 return 1; 346 return 1;
348 priv = dev->priv; 347 priv = dev->ml_priv;
349 grp = priv->mpcg; 348 grp = priv->mpcg;
350 349
351 grp->allochanfunc = callback; 350 grp->allochanfunc = callback;
@@ -417,7 +416,7 @@ void ctc_mpc_establish_connectivity(int port_num,
417 dev = ctcmpc_get_dev(port_num); 416 dev = ctcmpc_get_dev(port_num);
418 if (dev == NULL) 417 if (dev == NULL)
419 return; 418 return;
420 priv = dev->priv; 419 priv = dev->ml_priv;
421 grp = priv->mpcg; 420 grp = priv->mpcg;
422 rch = priv->channel[READ]; 421 rch = priv->channel[READ];
423 wch = priv->channel[WRITE]; 422 wch = priv->channel[WRITE];
@@ -535,7 +534,7 @@ void ctc_mpc_dealloc_ch(int port_num)
535 dev = ctcmpc_get_dev(port_num); 534 dev = ctcmpc_get_dev(port_num);
536 if (dev == NULL) 535 if (dev == NULL)
537 return; 536 return;
538 priv = dev->priv; 537 priv = dev->ml_priv;
539 grp = priv->mpcg; 538 grp = priv->mpcg;
540 539
541 CTCM_DBF_TEXT_(MPC_SETUP, CTC_DBF_DEBUG, 540 CTCM_DBF_TEXT_(MPC_SETUP, CTC_DBF_DEBUG,
@@ -571,7 +570,7 @@ void ctc_mpc_flow_control(int port_num, int flowc)
571 dev = ctcmpc_get_dev(port_num); 570 dev = ctcmpc_get_dev(port_num);
572 if (dev == NULL) 571 if (dev == NULL)
573 return; 572 return;
574 priv = dev->priv; 573 priv = dev->ml_priv;
575 grp = priv->mpcg; 574 grp = priv->mpcg;
576 575
577 CTCM_DBF_TEXT_(MPC_TRACE, CTC_DBF_DEBUG, 576 CTCM_DBF_TEXT_(MPC_TRACE, CTC_DBF_DEBUG,
@@ -620,7 +619,7 @@ static void mpc_rcvd_sweep_resp(struct mpcg_info *mpcginfo)
620{ 619{
621 struct channel *rch = mpcginfo->ch; 620 struct channel *rch = mpcginfo->ch;
622 struct net_device *dev = rch->netdev; 621 struct net_device *dev = rch->netdev;
623 struct ctcm_priv *priv = dev->priv; 622 struct ctcm_priv *priv = dev->ml_priv;
624 struct mpc_group *grp = priv->mpcg; 623 struct mpc_group *grp = priv->mpcg;
625 struct channel *ch = priv->channel[WRITE]; 624 struct channel *ch = priv->channel[WRITE];
626 625
@@ -651,7 +650,7 @@ static void mpc_rcvd_sweep_resp(struct mpcg_info *mpcginfo)
651static void ctcmpc_send_sweep_resp(struct channel *rch) 650static void ctcmpc_send_sweep_resp(struct channel *rch)
652{ 651{
653 struct net_device *dev = rch->netdev; 652 struct net_device *dev = rch->netdev;
654 struct ctcm_priv *priv = dev->priv; 653 struct ctcm_priv *priv = dev->ml_priv;
655 struct mpc_group *grp = priv->mpcg; 654 struct mpc_group *grp = priv->mpcg;
656 int rc = 0; 655 int rc = 0;
657 struct th_sweep *header; 656 struct th_sweep *header;
@@ -713,7 +712,7 @@ static void mpc_rcvd_sweep_req(struct mpcg_info *mpcginfo)
713{ 712{
714 struct channel *rch = mpcginfo->ch; 713 struct channel *rch = mpcginfo->ch;
715 struct net_device *dev = rch->netdev; 714 struct net_device *dev = rch->netdev;
716 struct ctcm_priv *priv = dev->priv; 715 struct ctcm_priv *priv = dev->ml_priv;
717 struct mpc_group *grp = priv->mpcg; 716 struct mpc_group *grp = priv->mpcg;
718 struct channel *ch = priv->channel[WRITE]; 717 struct channel *ch = priv->channel[WRITE];
719 718
@@ -847,7 +846,7 @@ static int mpcg_fsm_len = ARRAY_SIZE(mpcg_fsm);
847static void mpc_action_go_ready(fsm_instance *fsm, int event, void *arg) 846static void mpc_action_go_ready(fsm_instance *fsm, int event, void *arg)
848{ 847{
849 struct net_device *dev = arg; 848 struct net_device *dev = arg;
850 struct ctcm_priv *priv = dev->priv; 849 struct ctcm_priv *priv = dev->ml_priv;
851 struct mpc_group *grp = priv->mpcg; 850 struct mpc_group *grp = priv->mpcg;
852 851
853 if (grp == NULL) { 852 if (grp == NULL) {
@@ -891,7 +890,7 @@ static void mpc_action_go_ready(fsm_instance *fsm, int event, void *arg)
891void mpc_group_ready(unsigned long adev) 890void mpc_group_ready(unsigned long adev)
892{ 891{
893 struct net_device *dev = (struct net_device *)adev; 892 struct net_device *dev = (struct net_device *)adev;
894 struct ctcm_priv *priv = dev->priv; 893 struct ctcm_priv *priv = dev->ml_priv;
895 struct mpc_group *grp = priv->mpcg; 894 struct mpc_group *grp = priv->mpcg;
896 struct channel *ch = NULL; 895 struct channel *ch = NULL;
897 896
@@ -947,7 +946,7 @@ void mpc_group_ready(unsigned long adev)
947void mpc_channel_action(struct channel *ch, int direction, int action) 946void mpc_channel_action(struct channel *ch, int direction, int action)
948{ 947{
949 struct net_device *dev = ch->netdev; 948 struct net_device *dev = ch->netdev;
950 struct ctcm_priv *priv = dev->priv; 949 struct ctcm_priv *priv = dev->ml_priv;
951 struct mpc_group *grp = priv->mpcg; 950 struct mpc_group *grp = priv->mpcg;
952 951
953 if (grp == NULL) { 952 if (grp == NULL) {
@@ -1057,7 +1056,7 @@ done:
1057static void ctcmpc_unpack_skb(struct channel *ch, struct sk_buff *pskb) 1056static void ctcmpc_unpack_skb(struct channel *ch, struct sk_buff *pskb)
1058{ 1057{
1059 struct net_device *dev = ch->netdev; 1058 struct net_device *dev = ch->netdev;
1060 struct ctcm_priv *priv = dev->priv; 1059 struct ctcm_priv *priv = dev->ml_priv;
1061 struct mpc_group *grp = priv->mpcg; 1060 struct mpc_group *grp = priv->mpcg;
1062 struct pdu *curr_pdu; 1061 struct pdu *curr_pdu;
1063 struct mpcg_info *mpcginfo; 1062 struct mpcg_info *mpcginfo;
@@ -1255,7 +1254,7 @@ void ctcmpc_bh(unsigned long thischan)
1255 struct channel *ch = (struct channel *)thischan; 1254 struct channel *ch = (struct channel *)thischan;
1256 struct sk_buff *skb; 1255 struct sk_buff *skb;
1257 struct net_device *dev = ch->netdev; 1256 struct net_device *dev = ch->netdev;
1258 struct ctcm_priv *priv = dev->priv; 1257 struct ctcm_priv *priv = dev->ml_priv;
1259 struct mpc_group *grp = priv->mpcg; 1258 struct mpc_group *grp = priv->mpcg;
1260 1259
1261 CTCM_PR_DEBUG("%s cp:%i enter: %s() %s\n", 1260 CTCM_PR_DEBUG("%s cp:%i enter: %s() %s\n",
@@ -1377,7 +1376,7 @@ static void mpc_action_go_inop(fsm_instance *fi, int event, void *arg)
1377 BUG_ON(dev == NULL); 1376 BUG_ON(dev == NULL);
1378 CTCM_PR_DEBUG("Enter %s: %s\n", __func__, dev->name); 1377 CTCM_PR_DEBUG("Enter %s: %s\n", __func__, dev->name);
1379 1378
1380 priv = dev->priv; 1379 priv = dev->ml_priv;
1381 grp = priv->mpcg; 1380 grp = priv->mpcg;
1382 grp->flow_off_called = 0; 1381 grp->flow_off_called = 0;
1383 fsm_deltimer(&grp->timer); 1382 fsm_deltimer(&grp->timer);
@@ -1483,7 +1482,7 @@ static void mpc_action_timeout(fsm_instance *fi, int event, void *arg)
1483 1482
1484 BUG_ON(dev == NULL); 1483 BUG_ON(dev == NULL);
1485 1484
1486 priv = dev->priv; 1485 priv = dev->ml_priv;
1487 grp = priv->mpcg; 1486 grp = priv->mpcg;
1488 wch = priv->channel[WRITE]; 1487 wch = priv->channel[WRITE];
1489 rch = priv->channel[READ]; 1488 rch = priv->channel[READ];
@@ -1521,7 +1520,7 @@ void mpc_action_discontact(fsm_instance *fi, int event, void *arg)
1521 if (ch) { 1520 if (ch) {
1522 dev = ch->netdev; 1521 dev = ch->netdev;
1523 if (dev) { 1522 if (dev) {
1524 priv = dev->priv; 1523 priv = dev->ml_priv;
1525 if (priv) { 1524 if (priv) {
1526 CTCM_DBF_TEXT_(MPC_TRACE, CTC_DBF_NOTICE, 1525 CTCM_DBF_TEXT_(MPC_TRACE, CTC_DBF_NOTICE,
1527 "%s: %s: %s\n", 1526 "%s: %s: %s\n",
@@ -1569,7 +1568,7 @@ static int mpc_validate_xid(struct mpcg_info *mpcginfo)
1569{ 1568{
1570 struct channel *ch = mpcginfo->ch; 1569 struct channel *ch = mpcginfo->ch;
1571 struct net_device *dev = ch->netdev; 1570 struct net_device *dev = ch->netdev;
1572 struct ctcm_priv *priv = dev->priv; 1571 struct ctcm_priv *priv = dev->ml_priv;
1573 struct mpc_group *grp = priv->mpcg; 1572 struct mpc_group *grp = priv->mpcg;
1574 struct xid2 *xid = mpcginfo->xid; 1573 struct xid2 *xid = mpcginfo->xid;
1575 int rc = 0; 1574 int rc = 0;
@@ -1866,7 +1865,7 @@ static void mpc_action_doxid0(fsm_instance *fsm, int event, void *arg)
1866{ 1865{
1867 struct channel *ch = arg; 1866 struct channel *ch = arg;
1868 struct net_device *dev = ch->netdev; 1867 struct net_device *dev = ch->netdev;
1869 struct ctcm_priv *priv = dev->priv; 1868 struct ctcm_priv *priv = dev->ml_priv;
1870 struct mpc_group *grp = priv->mpcg; 1869 struct mpc_group *grp = priv->mpcg;
1871 1870
1872 CTCM_PR_DEBUG("Enter %s: cp=%i ch=0x%p id=%s\n", 1871 CTCM_PR_DEBUG("Enter %s: cp=%i ch=0x%p id=%s\n",
@@ -1906,7 +1905,7 @@ static void mpc_action_doxid0(fsm_instance *fsm, int event, void *arg)
1906static void mpc_action_doxid7(fsm_instance *fsm, int event, void *arg) 1905static void mpc_action_doxid7(fsm_instance *fsm, int event, void *arg)
1907{ 1906{
1908 struct net_device *dev = arg; 1907 struct net_device *dev = arg;
1909 struct ctcm_priv *priv = dev->priv; 1908 struct ctcm_priv *priv = dev->ml_priv;
1910 struct mpc_group *grp = NULL; 1909 struct mpc_group *grp = NULL;
1911 int direction; 1910 int direction;
1912 int send = 0; 1911 int send = 0;
@@ -1983,7 +1982,7 @@ static void mpc_action_rcvd_xid0(fsm_instance *fsm, int event, void *arg)
1983 struct mpcg_info *mpcginfo = arg; 1982 struct mpcg_info *mpcginfo = arg;
1984 struct channel *ch = mpcginfo->ch; 1983 struct channel *ch = mpcginfo->ch;
1985 struct net_device *dev = ch->netdev; 1984 struct net_device *dev = ch->netdev;
1986 struct ctcm_priv *priv = dev->priv; 1985 struct ctcm_priv *priv = dev->ml_priv;
1987 struct mpc_group *grp = priv->mpcg; 1986 struct mpc_group *grp = priv->mpcg;
1988 1987
1989 CTCM_PR_DEBUG("%s: ch-id:%s xid2:%i xid7:%i xidt_p2:%i \n", 1988 CTCM_PR_DEBUG("%s: ch-id:%s xid2:%i xid7:%i xidt_p2:%i \n",
@@ -2045,7 +2044,7 @@ static void mpc_action_rcvd_xid7(fsm_instance *fsm, int event, void *arg)
2045 struct mpcg_info *mpcginfo = arg; 2044 struct mpcg_info *mpcginfo = arg;
2046 struct channel *ch = mpcginfo->ch; 2045 struct channel *ch = mpcginfo->ch;
2047 struct net_device *dev = ch->netdev; 2046 struct net_device *dev = ch->netdev;
2048 struct ctcm_priv *priv = dev->priv; 2047 struct ctcm_priv *priv = dev->ml_priv;
2049 struct mpc_group *grp = priv->mpcg; 2048 struct mpc_group *grp = priv->mpcg;
2050 2049
2051 CTCM_PR_DEBUG("Enter %s: cp=%i ch=0x%p id=%s\n", 2050 CTCM_PR_DEBUG("Enter %s: cp=%i ch=0x%p id=%s\n",
@@ -2097,7 +2096,7 @@ static int mpc_send_qllc_discontact(struct net_device *dev)
2097 __u32 new_len = 0; 2096 __u32 new_len = 0;
2098 struct sk_buff *skb; 2097 struct sk_buff *skb;
2099 struct qllc *qllcptr; 2098 struct qllc *qllcptr;
2100 struct ctcm_priv *priv = dev->priv; 2099 struct ctcm_priv *priv = dev->ml_priv;
2101 struct mpc_group *grp = priv->mpcg; 2100 struct mpc_group *grp = priv->mpcg;
2102 2101
2103 CTCM_PR_DEBUG("%s: GROUP STATE: %s\n", 2102 CTCM_PR_DEBUG("%s: GROUP STATE: %s\n",
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-06 02:38:29 -0500