diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-03-17 18:06:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-03-17 18:06:55 -0800 |
| commit | 855c2e681718ea51900d53e0f8e89060f8f40e6a (patch) | |
| tree | af6f416783a5b59723166e13832e4bf7a2d42912 /include/linux | |
| parent | 0b2e8f296ddf468918463779974ef88f5f9d42d7 (diff) | |
| parent | 5942e595876eb5c1a98242b38f2b770adc1330d7 (diff) | |
Merge master.kernel.org:/home/davem/BK/net-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/if_wanpipe.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/if_wanpipe.h b/include/linux/if_wanpipe.h index 544d818d9f73..c4cd29a162fe 100644 --- a/include/linux/if_wanpipe.h +++ b/include/linux/if_wanpipe.h @@ -122,6 +122,7 @@ struct wanpipe_opt unsigned poll_cnt; unsigned char force; /* Used to force sock release */ atomic_t packet_sent; + unsigned short num; }; #define wp_sk(__sk) ((struct wanpipe_opt *)(__sk)->protinfo) |