diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-08-15 02:51:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-08-15 02:51:28 -0700 |
| commit | 414214686bdf5d4704026572737d1fc0ebc768a8 (patch) | |
| tree | 0381e82fc30b335dd0b4b8a37f62b6813925b45c /include/linux | |
| parent | 496084cb8bb78efc5ecc1dca593386d46bfe994b (diff) | |
| parent | 0ccca8d5c70cd9e8585e15a19dadc345ca15dbfb (diff) | |
Merge http://linux-isdn.bkbits.net/linux-2.5.isdn
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/isdn.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/isdn.h b/include/linux/isdn.h index 9544c782d17d..213d2cbc24f4 100644 --- a/include/linux/isdn.h +++ b/include/linux/isdn.h @@ -317,6 +317,7 @@ typedef struct isdn_net_local_s { /* 0 = Transparent */ int huptimer; /* Timeout-counter for auto-hangup */ int charge; /* Counter for charging units */ + int charge_state; /* ChargeInfo state machine */ ulong chargetime; /* Timer for Charging info */ int hupflags; /* Flags for charge-unit-hangup: */ /* bit0: chargeint is invalid */ @@ -329,6 +330,7 @@ typedef struct isdn_net_local_s { int onum; /* Flag: at least 1 outgoing number */ int cps; /* current speed of this interface */ int transcount; /* byte-counter for cps-calculation */ + int last_jiffies; /* when transcount was reset */ int sqfull; /* Flag: netdev-queue overloaded */ ulong sqfull_stamp; /* Start-Time of overload */ ulong slavedelay; /* Dynamic bundling delaytime */ |