summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2002-03-17 18:15:57 -0800
committerLinus Torvalds <torvalds@home.transmeta.com>2002-03-17 18:15:57 -0800
commitccd6307fddcde4b730a5cb09bea7c603396d3899 (patch)
tree48b6f4cb0da9341eed442425acf4a1c85a25d5df /include/linux
parentadd0f8637b6781505fa48e07a81bcb4dbc136382 (diff)
parent855c2e681718ea51900d53e0f8e89060f8f40e6a (diff)
Merge bk://ppc.bkbits.net/for-linus-ppc
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/if_wanpipe.h1
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)