diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-02 02:36:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-02 02:36:47 +0000 |
| commit | 8624512aa908741ba2795200133eae0d7f4557ea (patch) | |
| tree | d5d3036fccf2604f4c98dedc11e8adb929d6b52e /include/net/atmclip.h | |
| parent | 7b8f5d6f1d45d9f9de1d26e7d3c32aa5af11b488 (diff) | |
Merge with 2.3.48.
Diffstat (limited to 'include/net/atmclip.h')
| -rw-r--r-- | include/net/atmclip.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/net/atmclip.h b/include/net/atmclip.h index edcae7c37..a568dd753 100644 --- a/include/net/atmclip.h +++ b/include/net/atmclip.h @@ -1,6 +1,6 @@ /* net/atm/atmarp.h - RFC1577 ATM ARP */ -/* Written 1995-1999 by Werner Almesberger, EPFL LRC/ICA */ +/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */ #ifndef _ATMCLIP_H @@ -11,6 +11,7 @@ #include <linux/atm.h> #include <linux/atmdev.h> #include <linux/atmarp.h> +#include <linux/spinlock.h> #include <net/neighbour.h> @@ -22,6 +23,7 @@ struct clip_vcc { struct atm_vcc *vcc; /* VCC descriptor */ struct atmarp_entry *entry; /* ATMARP table entry, NULL if IP addr. isn't known yet */ + int xoff; /* 1 if send buffer is full */ unsigned char encap; /* 0: NULL, 1: LLC/SNAP */ unsigned long last_use; /* last send or receive operation */ unsigned long idle_timeout; /* keep open idle for so many jiffies*/ @@ -48,8 +50,9 @@ struct atmarp_entry { struct clip_priv { char name[8]; /* interface name */ int number; /* for convenience ... */ + spinlock_t xoff_lock; /* ensures that pop is atomic (SMP) */ struct net_device_stats stats; - struct net_device *next; /* next CLIP interface */ + struct net_device *next; /* next CLIP interface */ }; |