Skip to content

L
linux
Commit 3c09e264 authored by Ursula Braun's avatar Ursula Braun Committed by David S. Miller
Browse files
Options

ctcm: rename READ/WRITE defines to avoid redefinitions 

READ/WRITE seems to be a bit too generic for defines in a device
driver. Just rename them to CTCM_READ/CTCM_WRITE to avoid warnings.
Signed-off-by: default avatarUrsula Braun <ursula.braun@de.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 319cb083
Hide whitespace changes
Inline Side-by-side
Showing with 118 additions and 110 deletions
drivers/s390/net/ctcm_fsms.c
View file @ 3c09e264
...@@ -454,7 +454,7 @@ static void chx_firstio(fsm_instance *fi, int event, void *arg) ...@@ -454,7 +454,7 @@ static void chx_firstio(fsm_instance *fi, int event, void *arg)
if ((fsmstate == CTC_STATE_SETUPWAIT) && if ((fsmstate == CTC_STATE_SETUPWAIT) &&
(ch->protocol == CTCM_PROTO_OS390)) { (ch->protocol == CTCM_PROTO_OS390)) {
/* OS/390 resp. z/OS */ /* OS/390 resp. z/OS */
if (CHANNEL_DIRECTION(ch->flags) == READ) { if (CHANNEL_DIRECTION(ch->flags) == CTCM_READ) {
*((__u16 *)ch->trans_skb->data) = CTCM_INITIAL_BLOCKLEN; *((__u16 *)ch->trans_skb->data) = CTCM_INITIAL_BLOCKLEN;
fsm_addtimer(&ch->timer, CTCM_TIME_5_SEC, fsm_addtimer(&ch->timer, CTCM_TIME_5_SEC,
CTC_EVENT_TIMER, ch); CTC_EVENT_TIMER, ch);
...@@ -472,14 +472,14 @@ static void chx_firstio(fsm_instance *fi, int event, void *arg) ...@@ -472,14 +472,14 @@ static void chx_firstio(fsm_instance *fi, int event, void *arg)
* if in compatibility mode, since VM TCP delays the initial * if in compatibility mode, since VM TCP delays the initial
* frame until it has some data to send. * frame until it has some data to send.
*/ */
if ((CHANNEL_DIRECTION(ch->flags) == WRITE) || if ((CHANNEL_DIRECTION(ch->flags) == CTCM_WRITE) ||
(ch->protocol != CTCM_PROTO_S390)) (ch->protocol != CTCM_PROTO_S390))
fsm_addtimer(&ch->timer, CTCM_TIME_5_SEC, CTC_EVENT_TIMER, ch); fsm_addtimer(&ch->timer, CTCM_TIME_5_SEC, CTC_EVENT_TIMER, ch);
*((__u16 *)ch->trans_skb->data) = CTCM_INITIAL_BLOCKLEN; *((__u16 *)ch->trans_skb->data) = CTCM_INITIAL_BLOCKLEN;
ch->ccw[1].count = 2; /* Transfer only length */ ch->ccw[1].count = 2; /* Transfer only length */
fsm_newstate(fi, (CHANNEL_DIRECTION(ch->flags) == READ) fsm_newstate(fi, (CHANNEL_DIRECTION(ch->flags) == CTCM_READ)
? CTC_STATE_RXINIT : CTC_STATE_TXINIT); ? CTC_STATE_RXINIT : CTC_STATE_TXINIT);
rc = ccw_device_start(ch->cdev, &ch->ccw[0], rc = ccw_device_start(ch->cdev, &ch->ccw[0],
(unsigned long)ch, 0xff, 0); (unsigned long)ch, 0xff, 0);
...@@ -495,7 +495,7 @@ static void chx_firstio(fsm_instance *fi, int event, void *arg) ...@@ -495,7 +495,7 @@ static void chx_firstio(fsm_instance *fi, int event, void *arg)
* reply from VM TCP which brings up the RX channel to it's * reply from VM TCP which brings up the RX channel to it's
* final state. * final state.
*/ */
if ((CHANNEL_DIRECTION(ch->flags) == READ) && if ((CHANNEL_DIRECTION(ch->flags) == CTCM_READ) &&
(ch->protocol == CTCM_PROTO_S390)) { (ch->protocol == CTCM_PROTO_S390)) {
struct net_device *dev = ch->netdev; struct net_device *dev = ch->netdev;
struct ctcm_priv *priv = dev->ml_priv; struct ctcm_priv *priv = dev->ml_priv;
...@@ -600,15 +600,15 @@ static void ctcm_chx_start(fsm_instance *fi, int event, void *arg) ...@@ -600,15 +600,15 @@ static void ctcm_chx_start(fsm_instance *fi, int event, void *arg)
int rc; int rc;
CTCM_DBF_TEXT_(SETUP, CTC_DBF_INFO, "%s(%s): %s", CTCM_DBF_TEXT_(SETUP, CTC_DBF_INFO, "%s(%s): %s",
CTCM_FUNTAIL, ch->id, CTCM_FUNTAIL, ch->id,
(CHANNEL_DIRECTION(ch->flags) == READ) ? "RX" : "TX"); (CHANNEL_DIRECTION(ch->flags) == CTCM_READ) ? "RX" : "TX");
if (ch->trans_skb != NULL) { if (ch->trans_skb != NULL) {
clear_normalized_cda(&ch->ccw[1]); clear_normalized_cda(&ch->ccw[1]);
dev_kfree_skb(ch->trans_skb); dev_kfree_skb(ch->trans_skb);
ch->trans_skb = NULL; ch->trans_skb = NULL;
} }
if (CHANNEL_DIRECTION(ch->flags) == READ) { if (CHANNEL_DIRECTION(ch->flags) == CTCM_READ) {
ch->ccw[1].cmd_code = CCW_CMD_READ; ch->ccw[1].cmd_code = CCW_CMD_READ;
ch->ccw[1].flags = CCW_FLAG_SLI; ch->ccw[1].flags = CCW_FLAG_SLI;
ch->ccw[1].count = 0; ch->ccw[1].count = 0;
...@@ -622,7 +622,8 @@ static void ctcm_chx_start(fsm_instance *fi, int event, void *arg) ...@@ -622,7 +622,8 @@ static void ctcm_chx_start(fsm_instance *fi, int event, void *arg)
"%s(%s): %s trans_skb alloc delayed " "%s(%s): %s trans_skb alloc delayed "
"until first transfer", "until first transfer",
CTCM_FUNTAIL, ch->id, CTCM_FUNTAIL, ch->id,
(CHANNEL_DIRECTION(ch->flags) == READ) ? "RX" : "TX"); (CHANNEL_DIRECTION(ch->flags) == CTCM_READ) ?
"RX" : "TX");
} }
ch->ccw[0].cmd_code = CCW_CMD_PREPARE; ch->ccw[0].cmd_code = CCW_CMD_PREPARE;
ch->ccw[0].flags = CCW_FLAG_SLI | CCW_FLAG_CC; ch->ccw[0].flags = CCW_FLAG_SLI | CCW_FLAG_CC;
...@@ -720,7 +721,7 @@ static void ctcm_chx_cleanup(fsm_instance *fi, int state, ...@@ -720,7 +721,7 @@ static void ctcm_chx_cleanup(fsm_instance *fi, int state,
ch->th_seg = 0x00; ch->th_seg = 0x00;
ch->th_seq_num = 0x00; ch->th_seq_num = 0x00;
if (CHANNEL_DIRECTION(ch->flags) == READ) { if (CHANNEL_DIRECTION(ch->flags) == CTCM_READ) {
skb_queue_purge(&ch->io_queue); skb_queue_purge(&ch->io_queue);
fsm_event(priv->fsm, DEV_EVENT_RXDOWN, dev); fsm_event(priv->fsm, DEV_EVENT_RXDOWN, dev);
} else { } else {
...@@ -799,7 +800,8 @@ static void ctcm_chx_setuperr(fsm_instance *fi, int event, void *arg) ...@@ -799,7 +800,8 @@ static void ctcm_chx_setuperr(fsm_instance *fi, int event, void *arg)
fsm_newstate(fi, CTC_STATE_STARTRETRY); fsm_newstate(fi, CTC_STATE_STARTRETRY);
fsm_deltimer(&ch->timer); fsm_deltimer(&ch->timer);
fsm_addtimer(&ch->timer, CTCM_TIME_5_SEC, CTC_EVENT_TIMER, ch); fsm_addtimer(&ch->timer, CTCM_TIME_5_SEC, CTC_EVENT_TIMER, ch);
if (!IS_MPC(ch) && (CHANNEL_DIRECTION(ch->flags) == READ)) { if (!IS_MPC(ch) &&
(CHANNEL_DIRECTION(ch->flags) == CTCM_READ)) {
int rc = ccw_device_halt(ch->cdev, (unsigned long)ch); int rc = ccw_device_halt(ch->cdev, (unsigned long)ch);
if (rc != 0) if (rc != 0)
ctcm_ccw_check_rc(ch, rc, ctcm_ccw_check_rc(ch, rc,
...@@ -811,10 +813,10 @@ static void ctcm_chx_setuperr(fsm_instance *fi, int event, void *arg) ...@@ -811,10 +813,10 @@ static void ctcm_chx_setuperr(fsm_instance *fi, int event, void *arg)
CTCM_DBF_TEXT_(ERROR, CTC_DBF_CRIT, CTCM_DBF_TEXT_(ERROR, CTC_DBF_CRIT,
"%s(%s) : %s error during %s channel setup state=%s\n", "%s(%s) : %s error during %s channel setup state=%s\n",
CTCM_FUNTAIL, dev->name, ctc_ch_event_names[event], CTCM_FUNTAIL, dev->name, ctc_ch_event_names[event],
(CHANNEL_DIRECTION(ch->flags) == READ) ? "RX" : "TX", (CHANNEL_DIRECTION(ch->flags) == CTCM_READ) ? "RX" : "TX",
fsm_getstate_str(fi)); fsm_getstate_str(fi));
if (CHANNEL_DIRECTION(ch->flags) == READ) { if (CHANNEL_DIRECTION(ch->flags) == CTCM_READ) {
fsm_newstate(fi, CTC_STATE_RXERR); fsm_newstate(fi, CTC_STATE_RXERR);
fsm_event(priv->fsm, DEV_EVENT_RXDOWN, dev); fsm_event(priv->fsm, DEV_EVENT_RXDOWN, dev);
} else { } else {
...@@ -945,7 +947,7 @@ static void ctcm_chx_rxdisc(fsm_instance *fi, int event, void *arg) ...@@ -945,7 +947,7 @@ static void ctcm_chx_rxdisc(fsm_instance *fi, int event, void *arg)
fsm_event(priv->fsm, DEV_EVENT_TXDOWN, dev); fsm_event(priv->fsm, DEV_EVENT_TXDOWN, dev);
fsm_newstate(fi, CTC_STATE_DTERM); fsm_newstate(fi, CTC_STATE_DTERM);
ch2 = priv->channel[WRITE]; ch2 = priv->channel[CTCM_WRITE];
fsm_newstate(ch2->fsm, CTC_STATE_DTERM); fsm_newstate(ch2->fsm, CTC_STATE_DTERM);
ccw_device_halt(ch->cdev, (unsigned long)ch); ccw_device_halt(ch->cdev, (unsigned long)ch);
...@@ -1074,13 +1076,13 @@ static void ctcm_chx_iofatal(fsm_instance *fi, int event, void *arg) ...@@ -1074,13 +1076,13 @@ static void ctcm_chx_iofatal(fsm_instance *fi, int event, void *arg)
fsm_deltimer(&ch->timer); fsm_deltimer(&ch->timer);
CTCM_DBF_TEXT_(ERROR, CTC_DBF_ERROR, CTCM_DBF_TEXT_(ERROR, CTC_DBF_ERROR,
"%s: %s: %s unrecoverable channel error", "%s: %s: %s unrecoverable channel error",
CTCM_FUNTAIL, ch->id, rd == READ ? "RX" : "TX"); CTCM_FUNTAIL, ch->id, rd == CTCM_READ ? "RX" : "TX");
if (IS_MPC(ch)) { if (IS_MPC(ch)) {
priv->stats.tx_dropped++; priv->stats.tx_dropped++;
priv->stats.tx_errors++; priv->stats.tx_errors++;
} }
if (rd == READ) { if (rd == CTCM_READ) {
fsm_newstate(fi, CTC_STATE_RXERR); fsm_newstate(fi, CTC_STATE_RXERR);
fsm_event(priv->fsm, DEV_EVENT_RXDOWN, dev); fsm_event(priv->fsm, DEV_EVENT_RXDOWN, dev);
} else { } else {
...@@ -1503,7 +1505,7 @@ static void ctcmpc_chx_firstio(fsm_instance *fi, int event, void *arg) ...@@ -1503,7 +1505,7 @@ static void ctcmpc_chx_firstio(fsm_instance *fi, int event, void *arg)
switch (fsm_getstate(fi)) { switch (fsm_getstate(fi)) {
case CTC_STATE_STARTRETRY: case CTC_STATE_STARTRETRY:
case CTC_STATE_SETUPWAIT: case CTC_STATE_SETUPWAIT:
if (CHANNEL_DIRECTION(ch->flags) == READ) { if (CHANNEL_DIRECTION(ch->flags) == CTCM_READ) {
ctcmpc_chx_rxidle(fi, event, arg); ctcmpc_chx_rxidle(fi, event, arg);
} else { } else {
fsm_newstate(fi, CTC_STATE_TXIDLE); fsm_newstate(fi, CTC_STATE_TXIDLE);
...@@ -1514,7 +1516,7 @@ static void ctcmpc_chx_firstio(fsm_instance *fi, int event, void *arg) ...@@ -1514,7 +1516,7 @@ static void ctcmpc_chx_firstio(fsm_instance *fi, int event, void *arg)
break; break;
}; };
fsm_newstate(fi, (CHANNEL_DIRECTION(ch->flags) == READ) fsm_newstate(fi, (CHANNEL_DIRECTION(ch->flags) == CTCM_READ)
? CTC_STATE_RXINIT : CTC_STATE_TXINIT); ? CTC_STATE_RXINIT : CTC_STATE_TXINIT);
done: done:
...@@ -1753,8 +1755,8 @@ static void ctcmpc_chx_send_sweep(fsm_instance *fsm, int event, void *arg) ...@@ -1753,8 +1755,8 @@ static void ctcmpc_chx_send_sweep(fsm_instance *fsm, int event, void *arg)
struct net_device *dev = ach->netdev; struct net_device *dev = ach->netdev;
struct ctcm_priv *priv = dev->ml_priv; struct ctcm_priv *priv = dev->ml_priv;
struct mpc_group *grp = priv->mpcg; struct mpc_group *grp = priv->mpcg;
struct channel *wch = priv->channel[WRITE]; struct channel *wch = priv->channel[CTCM_WRITE];
struct channel *rch = priv->channel[READ]; struct channel *rch = priv->channel[CTCM_READ];
struct sk_buff *skb; struct sk_buff *skb;
struct th_sweep *header; struct th_sweep *header;
int rc = 0; int rc = 0;
...@@ -2070,7 +2072,7 @@ static void dev_action_start(fsm_instance *fi, int event, void *arg) ...@@ -2070,7 +2072,7 @@ static void dev_action_start(fsm_instance *fi, int event, void *arg)
fsm_newstate(fi, DEV_STATE_STARTWAIT_RXTX); fsm_newstate(fi, DEV_STATE_STARTWAIT_RXTX);
if (IS_MPC(priv)) if (IS_MPC(priv))
priv->mpcg->channels_terminating = 0; priv->mpcg->channels_terminating = 0;
for (direction = READ; direction <= WRITE; direction++) { for (direction = CTCM_READ; direction <= CTCM_WRITE; direction++) {
struct channel *ch = priv->channel[direction]; struct channel *ch = priv->channel[direction];
fsm_event(ch->fsm, CTC_EVENT_START, ch); fsm_event(ch->fsm, CTC_EVENT_START, ch);
} }
...@@ -2092,7 +2094,7 @@ static void dev_action_stop(fsm_instance *fi, int event, void *arg) ...@@ -2092,7 +2094,7 @@ static void dev_action_stop(fsm_instance *fi, int event, void *arg)
CTCMY_DBF_DEV_NAME(SETUP, dev, ""); CTCMY_DBF_DEV_NAME(SETUP, dev, "");
fsm_newstate(fi, DEV_STATE_STOPWAIT_RXTX); fsm_newstate(fi, DEV_STATE_STOPWAIT_RXTX);
for (direction = READ; direction <= WRITE; direction++) { for (direction = CTCM_READ; direction <= CTCM_WRITE; direction++) {
struct channel *ch = priv->channel[direction]; struct channel *ch = priv->channel[direction];
fsm_event(ch->fsm, CTC_EVENT_STOP, ch); fsm_event(ch->fsm, CTC_EVENT_STOP, ch);
ch->th_seq_num = 0x00; ch->th_seq_num = 0x00;
...@@ -2183,11 +2185,11 @@ static void dev_action_chup(fsm_instance *fi, int event, void *arg) ...@@ -2183,11 +2185,11 @@ static void dev_action_chup(fsm_instance *fi, int event, void *arg)
if (IS_MPC(priv)) { if (IS_MPC(priv)) {
if (event == DEV_EVENT_RXUP) if (event == DEV_EVENT_RXUP)
mpc_channel_action(priv->channel[READ], mpc_channel_action(priv->channel[CTCM_READ],
READ, MPC_CHANNEL_ADD); CTCM_READ, MPC_CHANNEL_ADD);
else else
mpc_channel_action(priv->channel[WRITE], mpc_channel_action(priv->channel[CTCM_WRITE],
WRITE, MPC_CHANNEL_ADD); CTCM_WRITE, MPC_CHANNEL_ADD);
} }
} }
...@@ -2239,11 +2241,11 @@ static void dev_action_chdown(fsm_instance *fi, int event, void *arg) ...@@ -2239,11 +2241,11 @@ static void dev_action_chdown(fsm_instance *fi, int event, void *arg)
} }
if (IS_MPC(priv)) { if (IS_MPC(priv)) {
if (event == DEV_EVENT_RXDOWN) if (event == DEV_EVENT_RXDOWN)
mpc_channel_action(priv->channel[READ], mpc_channel_action(priv->channel[CTCM_READ],
READ, MPC_CHANNEL_REMOVE); CTCM_READ, MPC_CHANNEL_REMOVE);
else else
mpc_channel_action(priv->channel[WRITE], mpc_channel_action(priv->channel[CTCM_WRITE],
WRITE, MPC_CHANNEL_REMOVE); CTCM_WRITE, MPC_CHANNEL_REMOVE);
} }
} }
......
drivers/s390/net/ctcm_main.c
View file @ 3c09e264
...@@ -267,7 +267,7 @@ static struct channel *channel_get(enum ctcm_channel_types type, ...@@ -267,7 +267,7 @@ static struct channel *channel_get(enum ctcm_channel_types type,
else { else {
ch->flags |= CHANNEL_FLAGS_INUSE; ch->flags |= CHANNEL_FLAGS_INUSE;
ch->flags &= ~CHANNEL_FLAGS_RWMASK; ch->flags &= ~CHANNEL_FLAGS_RWMASK;
ch->flags |= (direction == WRITE) ch->flags |= (direction == CTCM_WRITE)
? CHANNEL_FLAGS_WRITE : CHANNEL_FLAGS_READ; ? CHANNEL_FLAGS_WRITE : CHANNEL_FLAGS_READ;
fsm_newstate(ch->fsm, CTC_STATE_STOPPED); fsm_newstate(ch->fsm, CTC_STATE_STOPPED);
} }
...@@ -388,7 +388,8 @@ int ctcm_ch_alloc_buffer(struct channel *ch) ...@@ -388,7 +388,8 @@ int ctcm_ch_alloc_buffer(struct channel *ch)
CTCM_DBF_TEXT_(ERROR, CTC_DBF_ERROR, CTCM_DBF_TEXT_(ERROR, CTC_DBF_ERROR,
"%s(%s): %s trans_skb allocation error", "%s(%s): %s trans_skb allocation error",
CTCM_FUNTAIL, ch->id, CTCM_FUNTAIL, ch->id,
(CHANNEL_DIRECTION(ch->flags) == READ) ? "RX" : "TX"); (CHANNEL_DIRECTION(ch->flags) == CTCM_READ) ?
"RX" : "TX");
return -ENOMEM; return -ENOMEM;
} }
...@@ -399,7 +400,8 @@ int ctcm_ch_alloc_buffer(struct channel *ch) ...@@ -399,7 +400,8 @@ int ctcm_ch_alloc_buffer(struct channel *ch)
CTCM_DBF_TEXT_(ERROR, CTC_DBF_ERROR, CTCM_DBF_TEXT_(ERROR, CTC_DBF_ERROR,
"%s(%s): %s set norm_cda failed", "%s(%s): %s set norm_cda failed",
CTCM_FUNTAIL, ch->id, CTCM_FUNTAIL, ch->id,
(CHANNEL_DIRECTION(ch->flags) == READ) ? "RX" : "TX"); (CHANNEL_DIRECTION(ch->flags) == CTCM_READ) ?
"RX" : "TX");
return -ENOMEM; return -ENOMEM;
} }
...@@ -603,14 +605,14 @@ static void ctcmpc_send_sweep_req(struct channel *rch) ...@@ -603,14 +605,14 @@ static void ctcmpc_send_sweep_req(struct channel *rch)
priv = dev->ml_priv; priv = dev->ml_priv;
grp = priv->mpcg; grp = priv->mpcg;
ch = priv->channel[WRITE]; ch = priv->channel[CTCM_WRITE];
/* sweep processing is not complete until response and request */ /* sweep processing is not complete until response and request */
/* has completed for all read channels in group */ /* has completed for all read channels in group */
if (grp->in_sweep == 0) { if (grp->in_sweep == 0) {
grp->in_sweep = 1; grp->in_sweep = 1;
grp->sweep_rsp_pend_num = grp->active_channels[READ]; grp->sweep_rsp_pend_num = grp->active_channels[CTCM_READ];
grp->sweep_req_pend_num = grp->active_channels[READ]; grp->sweep_req_pend_num = grp->active_channels[CTCM_READ];
} }
sweep_skb = __dev_alloc_skb(MPC_BUFSIZE_DEFAULT, GFP_ATOMIC|GFP_DMA); sweep_skb = __dev_alloc_skb(MPC_BUFSIZE_DEFAULT, GFP_ATOMIC|GFP_DMA);
...@@ -911,7 +913,7 @@ static int ctcm_tx(struct sk_buff *skb, struct net_device *dev) ...@@ -911,7 +913,7 @@ static int ctcm_tx(struct sk_buff *skb, struct net_device *dev)
return NETDEV_TX_BUSY; return NETDEV_TX_BUSY;
dev->trans_start = jiffies; dev->trans_start = jiffies;
if (ctcm_transmit_skb(priv->channel[WRITE], skb) != 0) if (ctcm_transmit_skb(priv->channel[CTCM_WRITE], skb) != 0)
return NETDEV_TX_BUSY; return NETDEV_TX_BUSY;
return NETDEV_TX_OK; return NETDEV_TX_OK;
} }
...@@ -994,7 +996,7 @@ static int ctcmpc_tx(struct sk_buff *skb, struct net_device *dev) ...@@ -994,7 +996,7 @@ static int ctcmpc_tx(struct sk_buff *skb, struct net_device *dev)
} }
dev->trans_start = jiffies; dev->trans_start = jiffies;
if (ctcmpc_transmit_skb(priv->channel[WRITE], skb) != 0) { if (ctcmpc_transmit_skb(priv->channel[CTCM_WRITE], skb) != 0) {
CTCM_DBF_TEXT_(MPC_ERROR, CTC_DBF_ERROR, CTCM_DBF_TEXT_(MPC_ERROR, CTC_DBF_ERROR,
"%s(%s): device error - dropped", "%s(%s): device error - dropped",
CTCM_FUNTAIL, dev->name); CTCM_FUNTAIL, dev->name);
...@@ -1035,7 +1037,7 @@ static int ctcm_change_mtu(struct net_device *dev, int new_mtu) ...@@ -1035,7 +1037,7 @@ static int ctcm_change_mtu(struct net_device *dev, int new_mtu)
return -EINVAL; return -EINVAL;
priv = dev->ml_priv; priv = dev->ml_priv;
max_bufsize = priv->channel[READ]->max_bufsize; max_bufsize = priv->channel[CTCM_READ]->max_bufsize;
if (IS_MPC(priv)) { if (IS_MPC(priv)) {
if (new_mtu > max_bufsize - TH_HEADER_LENGTH) if (new_mtu > max_bufsize - TH_HEADER_LENGTH)
...@@ -1226,10 +1228,10 @@ static void ctcm_irq_handler(struct ccw_device *cdev, ...@@ -1226,10 +1228,10 @@ static void ctcm_irq_handler(struct ccw_device *cdev,
priv = dev_get_drvdata(&cgdev->dev); priv = dev_get_drvdata(&cgdev->dev);
/* Try to extract channel from driver data. */ /* Try to extract channel from driver data. */
if (priv->channel[READ]->cdev == cdev) if (priv->channel[CTCM_READ]->cdev == cdev)
ch = priv->channel[READ]; ch = priv->channel[CTCM_READ];
else if (priv->channel[WRITE]->cdev == cdev) else if (priv->channel[CTCM_WRITE]->cdev == cdev)
ch = priv->channel[WRITE]; ch = priv->channel[CTCM_WRITE];
else { else {
dev_err(&cdev->dev, dev_err(&cdev->dev,
"%s: Internal error: Can't determine channel for " "%s: Internal error: Can't determine channel for "
...@@ -1587,13 +1589,13 @@ static int ctcm_new_device(struct ccwgroup_device *cgdev) ...@@ -1587,13 +1589,13 @@ static int ctcm_new_device(struct ccwgroup_device *cgdev)
goto out_ccw2; goto out_ccw2;
} }
for (direction = READ; direction <= WRITE; direction++) { for (direction = CTCM_READ; direction <= CTCM_WRITE; direction++) {
priv->channel[direction] = priv->channel[direction] =
channel_get(type, direction == READ ? read_id : write_id, channel_get(type, direction == CTCM_READ ?
direction); read_id : write_id, direction);
if (priv->channel[direction] == NULL) { if (priv->channel[direction] == NULL) {
if (direction == WRITE) if (direction == CTCM_WRITE)
channel_free(priv->channel[READ]); channel_free(priv->channel[CTCM_READ]);
goto out_dev; goto out_dev;
} }
priv->channel[direction]->netdev = dev; priv->channel[direction]->netdev = dev;
...@@ -1617,13 +1619,13 @@ static int ctcm_new_device(struct ccwgroup_device *cgdev) ...@@ -1617,13 +1619,13 @@ static int ctcm_new_device(struct ccwgroup_device *cgdev)
dev_info(&dev->dev, dev_info(&dev->dev,
"setup OK : r/w = %s/%s, protocol : %d\n", "setup OK : r/w = %s/%s, protocol : %d\n",
priv->channel[READ]->id, priv->channel[CTCM_READ]->id,
priv->channel[WRITE]->id, priv->protocol); priv->channel[CTCM_WRITE]->id, priv->protocol);
CTCM_DBF_TEXT_(SETUP, CTC_DBF_INFO, CTCM_DBF_TEXT_(SETUP, CTC_DBF_INFO,
"setup(%s) OK : r/w = %s/%s, protocol : %d", dev->name, "setup(%s) OK : r/w = %s/%s, protocol : %d", dev->name,
priv->channel[READ]->id, priv->channel[CTCM_READ]->id,
priv->channel[WRITE]->id, priv->protocol); priv->channel[CTCM_WRITE]->id, priv->protocol);
return 0; return 0;
out_unregister: out_unregister:
...@@ -1635,10 +1637,10 @@ static int ctcm_new_device(struct ccwgroup_device *cgdev) ...@@ -1635,10 +1637,10 @@ static int ctcm_new_device(struct ccwgroup_device *cgdev)
out_ccw1: out_ccw1:
ccw_device_set_offline(cgdev->cdev[0]); ccw_device_set_offline(cgdev->cdev[0]);
out_remove_channel2: out_remove_channel2:
readc = channel_get(type, read_id, READ); readc = channel_get(type, read_id, CTCM_READ);
channel_remove(readc); channel_remove(readc);
out_remove_channel1: out_remove_channel1:
writec = channel_get(type, write_id, WRITE); writec = channel_get(type, write_id, CTCM_WRITE);
channel_remove(writec); channel_remove(writec);
out_err_result: out_err_result:
return result; return result;
...@@ -1660,19 +1662,19 @@ static int ctcm_shutdown_device(struct ccwgroup_device *cgdev) ...@@ -1660,19 +1662,19 @@ static int ctcm_shutdown_device(struct ccwgroup_device *cgdev)
if (!priv) if (!priv)
return -ENODEV; return -ENODEV;
if (priv->channel[READ]) { if (priv->channel[CTCM_READ]) {
dev = priv->channel[READ]->netdev; dev = priv->channel[CTCM_READ]->netdev;
CTCM_DBF_DEV(SETUP, dev, ""); CTCM_DBF_DEV(SETUP, dev, "");
/* Close the device */ /* Close the device */
ctcm_close(dev); ctcm_close(dev);
dev->flags &= ~IFF_RUNNING; dev->flags &= ~IFF_RUNNING;
ctcm_remove_attributes(&cgdev->dev); ctcm_remove_attributes(&cgdev->dev);
channel_free(priv->channel[READ]); channel_free(priv->channel[CTCM_READ]);
} else } else
dev = NULL; dev = NULL;
if (priv->channel[WRITE]) if (priv->channel[CTCM_WRITE])
channel_free(priv->channel[WRITE]); channel_free(priv->channel[CTCM_WRITE]);
if (dev) { if (dev) {
unregister_netdev(dev); unregister_netdev(dev);
...@@ -1685,11 +1687,11 @@ static int ctcm_shutdown_device(struct ccwgroup_device *cgdev) ...@@ -1685,11 +1687,11 @@ static int ctcm_shutdown_device(struct ccwgroup_device *cgdev)
ccw_device_set_offline(cgdev->cdev[1]); ccw_device_set_offline(cgdev->cdev[1]);
ccw_device_set_offline(cgdev->cdev[0]); ccw_device_set_offline(cgdev->cdev[0]);
if (priv->channel[READ]) if (priv->channel[CTCM_READ])
channel_remove(priv->channel[READ]); channel_remove(priv->channel[CTCM_READ]);
if (priv->channel[WRITE]) if (priv->channel[CTCM_WRITE])
channel_remove(priv->channel[WRITE]); channel_remove(priv->channel[CTCM_WRITE]);
priv->channel[READ] = priv->channel[WRITE] = NULL; priv->channel[CTCM_READ] = priv->channel[CTCM_WRITE] = NULL;
return 0; return 0;
...@@ -1720,11 +1722,11 @@ static int ctcm_pm_suspend(struct ccwgroup_device *gdev) ...@@ -1720,11 +1722,11 @@ static int ctcm_pm_suspend(struct ccwgroup_device *gdev)
if (gdev->state == CCWGROUP_OFFLINE) if (gdev->state == CCWGROUP_OFFLINE)
return 0; return 0;
netif_device_detach(priv->channel[READ]->netdev); netif_device_detach(priv->channel[CTCM_READ]->netdev);
ctcm_close(priv->channel[READ]->netdev); ctcm_close(priv->channel[CTCM_READ]->netdev);
if (!wait_event_timeout(priv->fsm->wait_q, if (!wait_event_timeout(priv->fsm->wait_q,
fsm_getstate(priv->fsm) == DEV_STATE_STOPPED, CTCM_TIME_5_SEC)) { fsm_getstate(priv->fsm) == DEV_STATE_STOPPED, CTCM_TIME_5_SEC)) {
netif_device_attach(priv->channel[READ]->netdev); netif_device_attach(priv->channel[CTCM_READ]->netdev);
return -EBUSY; return -EBUSY;
} }
ccw_device_set_offline(gdev->cdev[1]); ccw_device_set_offline(gdev->cdev[1]);
...@@ -1745,9 +1747,9 @@ static int ctcm_pm_resume(struct ccwgroup_device *gdev) ...@@ -1745,9 +1747,9 @@ static int ctcm_pm_resume(struct ccwgroup_device *gdev)
rc = ccw_device_set_online(gdev->cdev[0]); rc = ccw_device_set_online(gdev->cdev[0]);
if (rc) if (rc)
goto err_out; goto err_out;
ctcm_open(priv->channel[READ]->netdev); ctcm_open(priv->channel[CTCM_READ]->netdev);
err_out: err_out:
netif_device_attach(priv->channel[READ]->netdev); netif_device_attach(priv->channel[CTCM_READ]->netdev);
return rc; return rc;
} }
......
drivers/s390/net/ctcm_main.h
View file @ 3c09e264
...@@ -111,8 +111,8 @@ enum ctcm_channel_types { ...@@ -111,8 +111,8 @@ enum ctcm_channel_types {
#define CTCM_INITIAL_BLOCKLEN 2 #define CTCM_INITIAL_BLOCKLEN 2
#define READ 0 #define CTCM_READ 0
#define WRITE 1 #define CTCM_WRITE 1
#define CTCM_ID_SIZE 20+3 #define CTCM_ID_SIZE 20+3
......
drivers/s390/net/ctcm_mpc.c
View file @ 3c09e264
...@@ -419,8 +419,8 @@ void ctc_mpc_establish_connectivity(int port_num, ...@@ -419,8 +419,8 @@ void ctc_mpc_establish_connectivity(int port_num,
return; return;
priv = dev->ml_priv; priv = dev->ml_priv;
grp = priv->mpcg; grp = priv->mpcg;
rch = priv->channel[READ]; rch = priv->channel[CTCM_READ];
wch = priv->channel[WRITE]; wch = priv->channel[CTCM_WRITE];
CTCM_DBF_TEXT_(MPC_SETUP, CTC_DBF_INFO, CTCM_DBF_TEXT_(MPC_SETUP, CTC_DBF_INFO,
"%s(%s): state=%s", "%s(%s): state=%s",
...@@ -578,7 +578,7 @@ void ctc_mpc_flow_control(int port_num, int flowc) ...@@ -578,7 +578,7 @@ void ctc_mpc_flow_control(int port_num, int flowc)
"%s: %s: flowc = %d", "%s: %s: flowc = %d",
CTCM_FUNTAIL, dev->name, flowc); CTCM_FUNTAIL, dev->name, flowc);
rch = priv->channel[READ]; rch = priv->channel[CTCM_READ];
mpcg_state = fsm_getstate(grp->fsm); mpcg_state = fsm_getstate(grp->fsm);
switch (flowc) { switch (flowc) {
...@@ -622,7 +622,7 @@ static void mpc_rcvd_sweep_resp(struct mpcg_info *mpcginfo) ...@@ -622,7 +622,7 @@ static void mpc_rcvd_sweep_resp(struct mpcg_info *mpcginfo)
struct net_device *dev = rch->netdev; struct net_device *dev = rch->netdev;
struct ctcm_priv *priv = dev->ml_priv; struct ctcm_priv *priv = dev->ml_priv;
struct mpc_group *grp = priv->mpcg; struct mpc_group *grp = priv->mpcg;
struct channel *ch = priv->channel[WRITE]; struct channel *ch = priv->channel[CTCM_WRITE];
CTCM_PR_DEBUG("%s: ch=0x%p id=%s\n", __func__, ch, ch->id); CTCM_PR_DEBUG("%s: ch=0x%p id=%s\n", __func__, ch, ch->id);
CTCM_D3_DUMP((char *)mpcginfo->sweep, TH_SWEEP_LENGTH); CTCM_D3_DUMP((char *)mpcginfo->sweep, TH_SWEEP_LENGTH);
...@@ -656,7 +656,7 @@ static void ctcmpc_send_sweep_resp(struct channel *rch) ...@@ -656,7 +656,7 @@ static void ctcmpc_send_sweep_resp(struct channel *rch)
int rc = 0; int rc = 0;
struct th_sweep *header; struct th_sweep *header;
struct sk_buff *sweep_skb; struct sk_buff *sweep_skb;
struct channel *ch = priv->channel[WRITE]; struct channel *ch = priv->channel[CTCM_WRITE];
CTCM_PR_DEBUG("%s: ch=0x%p id=%s\n", __func__, rch, rch->id); CTCM_PR_DEBUG("%s: ch=0x%p id=%s\n", __func__, rch, rch->id);
...@@ -712,7 +712,7 @@ static void mpc_rcvd_sweep_req(struct mpcg_info *mpcginfo) ...@@ -712,7 +712,7 @@ static void mpc_rcvd_sweep_req(struct mpcg_info *mpcginfo)
struct net_device *dev = rch->netdev; struct net_device *dev = rch->netdev;
struct ctcm_priv *priv = dev->ml_priv; struct ctcm_priv *priv = dev->ml_priv;
struct mpc_group *grp = priv->mpcg; struct mpc_group *grp = priv->mpcg;
struct channel *ch = priv->channel[WRITE]; struct channel *ch = priv->channel[CTCM_WRITE];
if (do_debug) if (do_debug)
CTCM_DBF_TEXT_(MPC_TRACE, CTC_DBF_DEBUG, CTCM_DBF_TEXT_(MPC_TRACE, CTC_DBF_DEBUG,
...@@ -721,8 +721,8 @@ static void mpc_rcvd_sweep_req(struct mpcg_info *mpcginfo) ...@@ -721,8 +721,8 @@ static void mpc_rcvd_sweep_req(struct mpcg_info *mpcginfo)
if (grp->in_sweep == 0) { if (grp->in_sweep == 0) {
grp->in_sweep = 1; grp->in_sweep = 1;
ctcm_test_and_set_busy(dev); ctcm_test_and_set_busy(dev);
grp->sweep_req_pend_num = grp->active_channels[READ]; grp->sweep_req_pend_num = grp->active_channels[CTCM_READ];
grp->sweep_rsp_pend_num = grp->active_channels[READ]; grp->sweep_rsp_pend_num = grp->active_channels[CTCM_READ];
} }
CTCM_D3_DUMP((char *)mpcginfo->sweep, TH_SWEEP_LENGTH); CTCM_D3_DUMP((char *)mpcginfo->sweep, TH_SWEEP_LENGTH);
...@@ -906,14 +906,14 @@ void mpc_group_ready(unsigned long adev) ...@@ -906,14 +906,14 @@ void mpc_group_ready(unsigned long adev)
fsm_newstate(grp->fsm, MPCG_STATE_READY); fsm_newstate(grp->fsm, MPCG_STATE_READY);
/* Put up a read on the channel */ /* Put up a read on the channel */
ch = priv->channel[READ]; ch = priv->channel[CTCM_READ];
ch->pdu_seq = 0; ch->pdu_seq = 0;
CTCM_PR_DBGDATA("ctcmpc: %s() ToDCM_pdu_seq= %08x\n" , CTCM_PR_DBGDATA("ctcmpc: %s() ToDCM_pdu_seq= %08x\n" ,
__func__, ch->pdu_seq); __func__, ch->pdu_seq);
ctcmpc_chx_rxidle(ch->fsm, CTC_EVENT_START, ch); ctcmpc_chx_rxidle(ch->fsm, CTC_EVENT_START, ch);
/* Put the write channel in idle state */ /* Put the write channel in idle state */
ch = priv->channel[WRITE]; ch = priv->channel[CTCM_WRITE];
if (ch->collect_len > 0) { if (ch->collect_len > 0) {
spin_lock(&ch->collect_lock); spin_lock(&ch->collect_lock);
ctcm_purge_skb_queue(&ch->collect_queue); ctcm_purge_skb_queue(&ch->collect_queue);
...@@ -960,7 +960,8 @@ void mpc_channel_action(struct channel *ch, int direction, int action) ...@@ -960,7 +960,8 @@ void mpc_channel_action(struct channel *ch, int direction, int action)
"%s: %i / Grp:%s total_channels=%i, active_channels: " "%s: %i / Grp:%s total_channels=%i, active_channels: "
"read=%i, write=%i\n", __func__, action, "read=%i, write=%i\n", __func__, action,
fsm_getstate_str(grp->fsm), grp->num_channel_paths, fsm_getstate_str(grp->fsm), grp->num_channel_paths,
grp->active_channels[READ], grp->active_channels[WRITE]); grp->active_channels[CTCM_READ],
grp->active_channels[CTCM_WRITE]);
if ((action == MPC_CHANNEL_ADD) && (ch->in_mpcgroup == 0)) { if ((action == MPC_CHANNEL_ADD) && (ch->in_mpcgroup == 0)) {
grp->num_channel_paths++; grp->num_channel_paths++;
...@@ -994,10 +995,11 @@ void mpc_channel_action(struct channel *ch, int direction, int action) ...@@ -994,10 +995,11 @@ void mpc_channel_action(struct channel *ch, int direction, int action)
grp->xid_skb->data, grp->xid_skb->data,
grp->xid_skb->len); grp->xid_skb->len);
ch->xid->xid2_dlc_type = ((CHANNEL_DIRECTION(ch->flags) == READ) ch->xid->xid2_dlc_type =
((CHANNEL_DIRECTION(ch->flags) == CTCM_READ)
? XID2_READ_SIDE : XID2_WRITE_SIDE); ? XID2_READ_SIDE : XID2_WRITE_SIDE);
if (CHANNEL_DIRECTION(ch->flags) == WRITE) if (CHANNEL_DIRECTION(ch->flags) == CTCM_WRITE)
ch->xid->xid2_buf_len = 0x00; ch->xid->xid2_buf_len = 0x00;
ch->xid_skb->data = ch->xid_skb_data; ch->xid_skb->data = ch->xid_skb_data;
...@@ -1006,8 +1008,8 @@ void mpc_channel_action(struct channel *ch, int direction, int action) ...@@ -1006,8 +1008,8 @@ void mpc_channel_action(struct channel *ch, int direction, int action)
fsm_newstate(ch->fsm, CH_XID0_PENDING); fsm_newstate(ch->fsm, CH_XID0_PENDING);
if ((grp->active_channels[READ] > 0) && if ((grp->active_channels[CTCM_READ] > 0) &&
(grp->active_channels[WRITE] > 0) && (grp->active_channels[CTCM_WRITE] > 0) &&
(fsm_getstate(grp->fsm) < MPCG_STATE_XID2INITW)) { (fsm_getstate(grp->fsm) < MPCG_STATE_XID2INITW)) {
fsm_newstate(grp->fsm, MPCG_STATE_XID2INITW); fsm_newstate(grp->fsm, MPCG_STATE_XID2INITW);
CTCM_DBF_TEXT_(MPC_SETUP, CTC_DBF_NOTICE, CTCM_DBF_TEXT_(MPC_SETUP, CTC_DBF_NOTICE,
...@@ -1027,10 +1029,10 @@ void mpc_channel_action(struct channel *ch, int direction, int action) ...@@ -1027,10 +1029,10 @@ void mpc_channel_action(struct channel *ch, int direction, int action)
if (grp->channels_terminating) if (grp->channels_terminating)
goto done; goto done;
if (((grp->active_channels[READ] == 0) && if (((grp->active_channels[CTCM_READ] == 0) &&
(grp->active_channels[WRITE] > 0)) (grp->active_channels[CTCM_WRITE] > 0))
|| ((grp->active_channels[WRITE] == 0) && || ((grp->active_channels[CTCM_WRITE] == 0) &&
(grp->active_channels[READ] > 0))) (grp->active_channels[CTCM_READ] > 0)))
fsm_event(grp->fsm, MPCG_EVENT_INOP, dev); fsm_event(grp->fsm, MPCG_EVENT_INOP, dev);
} }
done: done:
...@@ -1038,7 +1040,8 @@ void mpc_channel_action(struct channel *ch, int direction, int action) ...@@ -1038,7 +1040,8 @@ void mpc_channel_action(struct channel *ch, int direction, int action)
"exit %s: %i / Grp:%s total_channels=%i, active_channels: " "exit %s: %i / Grp:%s total_channels=%i, active_channels: "
"read=%i, write=%i\n", __func__, action, "read=%i, write=%i\n", __func__, action,
fsm_getstate_str(grp->fsm), grp->num_channel_paths, fsm_getstate_str(grp->fsm), grp->num_channel_paths,
grp->active_channels[READ], grp->active_channels[WRITE]); grp->active_channels[CTCM_READ],
grp->active_channels[CTCM_WRITE]);
CTCM_PR_DEBUG("exit %s: ch=0x%p id=%s\n", __func__, ch, ch->id); CTCM_PR_DEBUG("exit %s: ch=0x%p id=%s\n", __func__, ch, ch->id);
} }
...@@ -1392,8 +1395,8 @@ static void mpc_action_go_inop(fsm_instance *fi, int event, void *arg) ...@@ -1392,8 +1395,8 @@ static void mpc_action_go_inop(fsm_instance *fi, int event, void *arg)
(grp->port_persist == 0)) (grp->port_persist == 0))
fsm_deltimer(&priv->restart_timer); fsm_deltimer(&priv->restart_timer);
wch = priv->channel[WRITE]; wch = priv->channel[CTCM_WRITE];
rch = priv->channel[READ]; rch = priv->channel[CTCM_READ];
switch (grp->saved_state) { switch (grp->saved_state) {
case MPCG_STATE_RESET: case MPCG_STATE_RESET:
...@@ -1480,8 +1483,8 @@ static void mpc_action_timeout(fsm_instance *fi, int event, void *arg) ...@@ -1480,8 +1483,8 @@ static void mpc_action_timeout(fsm_instance *fi, int event, void *arg)
priv = dev->ml_priv; priv = dev->ml_priv;
grp = priv->mpcg; grp = priv->mpcg;
wch = priv->channel[WRITE]; wch = priv->channel[CTCM_WRITE];
rch = priv->channel[READ]; rch = priv->channel[CTCM_READ];
switch (fsm_getstate(grp->fsm)) { switch (fsm_getstate(grp->fsm)) {
case MPCG_STATE_XID2INITW: case MPCG_STATE_XID2INITW:
...@@ -1586,7 +1589,7 @@ static int mpc_validate_xid(struct mpcg_info *mpcginfo) ...@@ -1586,7 +1589,7 @@ static int mpc_validate_xid(struct mpcg_info *mpcginfo)
CTCM_D3_DUMP((char *)xid, XID2_LENGTH); CTCM_D3_DUMP((char *)xid, XID2_LENGTH);
/*the received direction should be the opposite of ours */ /*the received direction should be the opposite of ours */
if (((CHANNEL_DIRECTION(ch->flags) == READ) ? XID2_WRITE_SIDE : if (((CHANNEL_DIRECTION(ch->flags) == CTCM_READ) ? XID2_WRITE_SIDE :
XID2_READ_SIDE) != xid->xid2_dlc_type) { XID2_READ_SIDE) != xid->xid2_dlc_type) {
rc = 2; rc = 2;
/* XID REJECTED: r/w channel pairing mismatch */ /* XID REJECTED: r/w channel pairing mismatch */
...@@ -1912,7 +1915,7 @@ static void mpc_action_doxid7(fsm_instance *fsm, int event, void *arg) ...@@ -1912,7 +1915,7 @@ static void mpc_action_doxid7(fsm_instance *fsm, int event, void *arg)
if (grp == NULL) if (grp == NULL)
return; return;
for (direction = READ; direction <= WRITE; direction++) { for (direction = CTCM_READ; direction <= CTCM_WRITE; direction++) {
struct channel *ch = priv->channel[direction]; struct channel *ch = priv->channel[direction];
struct xid2 *thisxid = ch->xid; struct xid2 *thisxid = ch->xid;
ch->xid_skb->data = ch->xid_skb_data; ch->xid_skb->data = ch->xid_skb_data;
...@@ -2152,14 +2155,15 @@ static int mpc_send_qllc_discontact(struct net_device *dev) ...@@ -2152,14 +2155,15 @@ static int mpc_send_qllc_discontact(struct net_device *dev)
return -ENOMEM; return -ENOMEM;
} }
*((__u32 *)skb_push(skb, 4)) = priv->channel[READ]->pdu_seq; *((__u32 *)skb_push(skb, 4)) =
priv->channel[READ]->pdu_seq++; priv->channel[CTCM_READ]->pdu_seq;
priv->channel[CTCM_READ]->pdu_seq++;
CTCM_PR_DBGDATA("ctcmpc: %s ToDCM_pdu_seq= %08x\n", CTCM_PR_DBGDATA("ctcmpc: %s ToDCM_pdu_seq= %08x\n",
__func__, priv->channel[READ]->pdu_seq); __func__, priv->channel[CTCM_READ]->pdu_seq);
/* receipt of CC03 resets anticipated sequence number on /* receipt of CC03 resets anticipated sequence number on
receiving side */ receiving side */
priv->channel[READ]->pdu_seq = 0x00; priv->channel[CTCM_READ]->pdu_seq = 0x00;
skb_reset_mac_header(skb); skb_reset_mac_header(skb);
skb->dev = dev; skb->dev = dev;
skb->protocol = htons(ETH_P_SNAP); skb->protocol = htons(ETH_P_SNAP);
......
drivers/s390/net/ctcm_sysfs.c
View file @ 3c09e264
...@@ -38,8 +38,8 @@ static ssize_t ctcm_buffer_write(struct device *dev, ...@@ -38,8 +38,8 @@ static ssize_t ctcm_buffer_write(struct device *dev,
int bs1; int bs1;
struct ctcm_priv *priv = dev_get_drvdata(dev); struct ctcm_priv *priv = dev_get_drvdata(dev);
if (!(priv && priv->channel[READ] && ndev = priv->channel[CTCM_READ]->netdev;
(ndev = priv->channel[READ]->netdev))) { if (!(priv && priv->channel[CTCM_READ] && ndev)) {
CTCM_DBF_TEXT(SETUP, CTC_DBF_ERROR, "bfnondev"); CTCM_DBF_TEXT(SETUP, CTC_DBF_ERROR, "bfnondev");
return -ENODEV; return -ENODEV;
} }
...@@ -55,12 +55,12 @@ static ssize_t ctcm_buffer_write(struct device *dev, ...@@ -55,12 +55,12 @@ static ssize_t ctcm_buffer_write(struct device *dev,
(bs1 < (ndev->mtu + LL_HEADER_LENGTH + 2))) (bs1 < (ndev->mtu + LL_HEADER_LENGTH + 2)))
goto einval; goto einval;
priv->channel[READ]->max_bufsize = bs1; priv->channel[CTCM_READ]->max_bufsize = bs1;
priv->channel[WRITE]->max_bufsize = bs1; priv->channel[CTCM_WRITE]->max_bufsize = bs1;
if (!(ndev->flags & IFF_RUNNING)) if (!(ndev->flags & IFF_RUNNING))
ndev->mtu = bs1 - LL_HEADER_LENGTH - 2; ndev->mtu = bs1 - LL_HEADER_LENGTH - 2;
priv->channel[READ]->flags |= CHANNEL_FLAGS_BUFSIZE_CHANGED; priv->channel[CTCM_READ]->flags |= CHANNEL_FLAGS_BUFSIZE_CHANGED;
priv->channel[WRITE]->flags |= CHANNEL_FLAGS_BUFSIZE_CHANGED; priv->channel[CTCM_WRITE]->flags |= CHANNEL_FLAGS_BUFSIZE_CHANGED;
CTCM_DBF_DEV(SETUP, ndev, buf); CTCM_DBF_DEV(SETUP, ndev, buf);
return count; return count;
...@@ -85,9 +85,9 @@ static void ctcm_print_statistics(struct ctcm_priv *priv) ...@@ -85,9 +85,9 @@ static void ctcm_print_statistics(struct ctcm_priv *priv)
p += sprintf(p, " Device FSM state: %s\n", p += sprintf(p, " Device FSM state: %s\n",
fsm_getstate_str(priv->fsm)); fsm_getstate_str(priv->fsm));
p += sprintf(p, " RX channel FSM state: %s\n", p += sprintf(p, " RX channel FSM state: %s\n",
fsm_getstate_str(priv->channel[READ]->fsm)); fsm_getstate_str(priv->channel[CTCM_READ]->fsm));
p += sprintf(p, " TX channel FSM state: %s\n", p += sprintf(p, " TX channel FSM state: %s\n",
fsm_getstate_str(priv->channel[WRITE]->fsm)); fsm_getstate_str(priv->channel[CTCM_WRITE]->fsm));
p += sprintf(p, " Max. TX buffer used: %ld\n", p += sprintf(p, " Max. TX buffer used: %ld\n",
priv->channel[WRITE]->prof.maxmulti); priv->channel[WRITE]->prof.maxmulti);
p += sprintf(p, " Max. chained SKBs: %ld\n", p += sprintf(p, " Max. chained SKBs: %ld\n",
...@@ -102,7 +102,7 @@ static void ctcm_print_statistics(struct ctcm_priv *priv) ...@@ -102,7 +102,7 @@ static void ctcm_print_statistics(struct ctcm_priv *priv)
priv->channel[WRITE]->prof.tx_time); priv->channel[WRITE]->prof.tx_time);
printk(KERN_INFO "Statistics for %s:\n%s", printk(KERN_INFO "Statistics for %s:\n%s",
priv->channel[WRITE]->netdev->name, sbuf); priv->channel[CTCM_WRITE]->netdev->name, sbuf);
kfree(sbuf); kfree(sbuf);
return; return;
} }
...@@ -125,7 +125,7 @@ static ssize_t stats_write(struct device *dev, struct device_attribute *attr, ...@@ -125,7 +125,7 @@ static ssize_t stats_write(struct device *dev, struct device_attribute *attr,
return -ENODEV; return -ENODEV;
/* Reset statistics */ /* Reset statistics */
memset(&priv->channel[WRITE]->prof, 0, memset(&priv->channel[WRITE]->prof, 0,
sizeof(priv->channel[WRITE]->prof)); sizeof(priv->channel[CTCM_WRITE]->prof));
return count; return count;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7