diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2004-01-06 05:09:37 -0800 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2004-01-06 05:09:37 -0800 |
| commit | 239f727a99fb0569bdcee5cf0fb9716cd2d457dc (patch) | |
| tree | 6a81d6bec13c16d2f6115a48d72df39d0e5a7da0 /include/net | |
| parent | 0c8ad9d059408e60916b8c974e1f20655c2b1810 (diff) | |
| parent | 53b78d22d516fa23f50f250cfaf6057f1824c6bc (diff) | |
Merge nuts.ninka.net:/disk1/davem/BK/network-2.6
into nuts.ninka.net:/disk1/davem/BK/net-2.6
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/ipv6.h | 7 | ||||
| -rw-r--r-- | include/net/irda/ircomm_tty.h | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index 18020987d369..6ac444968292 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -329,13 +329,6 @@ extern int ip6_nd_hdr(struct sock *sk, struct in6_addr *daddr, int proto, int len); -extern int ip6_build_xmit(struct sock *sk, - inet_getfrag_t getfrag, - const void *data, - struct flowi *fl, - unsigned length, - struct ipv6_txoptions *opt, - int hlimit, int flags); extern int ip6_find_1stfragopt(struct sk_buff *skb, u8 **nexthdr); extern int ip6_append_data(struct sock *sk, diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h index dbb43c14934d..b1f19269c026 100644 --- a/include/net/irda/ircomm_tty.h +++ b/include/net/irda/ircomm_tty.h @@ -52,6 +52,11 @@ /* Same for payload size. See qos.c for the smallest max data size */ #define IRCOMM_TTY_DATA_UNINITIALISED (64 - IRCOMM_TTY_HDR_UNINITIALISED) +/* Those are really defined in include/linux/serial.h - Jean II */ +#define ASYNC_B_INITIALIZED 31 /* Serial port was initialized */ +#define ASYNC_B_NORMAL_ACTIVE 29 /* Normal device is active */ +#define ASYNC_B_CLOSING 27 /* Serial port is closing */ + /* * IrCOMM TTY driver state */ @@ -75,7 +80,7 @@ struct ircomm_tty_cb { LOCAL_FLOW flow; /* IrTTP flow status */ int line; - __u32 flags; + volatile unsigned long flags; __u8 dlsap_sel; __u8 slsap_sel; |