Deleted Added
full compact
29c29
< * $FreeBSD: head/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c 164410 2006-11-19 15:42:48Z syrinx $
---
> * $FreeBSD: head/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c 164997 2006-12-07 22:36:17Z syrinx $
676a677
> int ret;
745a747,751
> case LEAF_dot1dStpVersion:
> value->v.integer = bif->stp_version;
> break;
> case LEAF_dot1dStpTxHoldCount:
> value->v.integer = bif->tx_hold_count;
757,758c763
< if (bridge_set_priority(bif, value->v.integer) < 0)
< return (SNMP_ERR_GENERR);
---
> ret = bridge_set_priority(bif, value->v.integer);
763,764c768
< if (bridge_set_maxage(bif, value->v.integer) < 0)
< return (SNMP_ERR_GENERR);
---
> ret = bridge_set_maxage(bif, value->v.integer);
769,770c773
< if (bridge_set_hello_time(bif, value->v.integer) < 0)
< return (SNMP_ERR_GENERR);
---
> ret = bridge_set_hello_time(bif, value->v.integer);
775,776c778
< if (bridge_set_forward_delay(bif, value->v.integer) < 0)
< return (SNMP_ERR_GENERR);
---
> ret = bridge_set_forward_delay(bif, value->v.integer);
778a781,790
> case LEAF_dot1dStpVersion:
> ctx->scratch->int1 = bif->stp_version;
> ret = bridge_set_stp_version(bif, value->v.integer);
> break;
>
> case LEAF_dot1dStpTxHoldCount:
> ctx->scratch->int1 = bif->tx_hold_count;
> ret = bridge_set_tx_hold_count(bif, value->v.integer);
> break;
>
789a802,803
> default:
> return (SNMP_ERR_NOSUCHNAME);
791a806,809
> if (ret == -2)
> return (SNMP_ERR_WRONG_VALUE);
> else if (ret < 0)
> return (SNMP_ERR_GENERR);
797c815
< (void) bridge_set_priority(bif, ctx->scratch->int1);
---
> bridge_set_priority(bif, ctx->scratch->int1);
800c818
< (void) bridge_set_maxage(bif, ctx->scratch->int1);
---
> bridge_set_maxage(bif, ctx->scratch->int1);
803c821
< (void) bridge_set_hello_time(bif, ctx->scratch->int1);
---
> bridge_set_hello_time(bif, ctx->scratch->int1);
806,807c824
< (void) bridge_set_forward_delay(bif,
< ctx->scratch->int1);
---
> bridge_set_forward_delay(bif, ctx->scratch->int1);
808a826,831
> case LEAF_dot1dStpVersion:
> bridge_set_stp_version(bif, ctx->scratch->int1);
> break;
> case LEAF_dot1dStpTxHoldCount:
> bridge_set_tx_hold_count(bif, ctx->scratch->int1);
> break;
857c880
< (void) bridge_set_aging_time(bif, ctx->scratch->int1);
---
> bridge_set_aging_time(bif, ctx->scratch->int1);
1183a1207,1216
> case LEAF_begemotBridgeStpVersion:
> ctx->scratch->int1 = bif->stp_version;
> ret = bridge_set_stp_version(bif, val->v.integer);
> break;
>
> case LEAF_begemotBridgeStpTxHoldCount:
> ctx->scratch->int1 = bif->tx_hold_count;
> ret = bridge_set_tx_hold_count(bif, val->v.integer);
> break;
>
1222a1256,1263
>
> case LEAF_begemotBridgeStpVersion:
> bridge_set_stp_version(bif, ctx->scratch->int1);
> break;
>
> case LEAF_begemotBridgeStpTxHoldCount:
> bridge_set_tx_hold_count(bif, ctx->scratch->int1);
> break;
1286a1328,1335
>
> case LEAF_begemotBridgeStpVersion:
> val->v.integer = bif->stp_version;
> break;
>
> case LEAF_begemotBridgeStpTxHoldCount:
> val->v.integer = bif->tx_hold_count;
> break;