diff options
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/atmclip.h | 1 | ||||
-rw-r--r-- | include/net/irda/irlan_common.h | 1 | ||||
-rw-r--r-- | include/net/sock.h | 31 | ||||
-rw-r--r-- | include/net/tcp.h | 8 |
4 files changed, 35 insertions, 6 deletions
diff --git a/include/net/atmclip.h b/include/net/atmclip.h index a568dd753..28d0584c4 100644 --- a/include/net/atmclip.h +++ b/include/net/atmclip.h @@ -48,7 +48,6 @@ 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; diff --git a/include/net/irda/irlan_common.h b/include/net/irda/irlan_common.h index 67cc761c8..af897c754 100644 --- a/include/net/irda/irlan_common.h +++ b/include/net/irda/irlan_common.h @@ -164,7 +164,6 @@ struct irlan_cb { queue_t q; /* Must be first */ int magic; - char ifname[9]; struct net_device dev; /* Ethernet device structure*/ struct enet_statistics stats; diff --git a/include/net/sock.h b/include/net/sock.h index afeb31bea..c0451c111 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -66,6 +66,11 @@ #endif #endif +#if defined(CONFIG_PPPOE) || defined(CONFIG_PPPOE_MODULE) +#include <linux/if_pppox.h> +#include <linux/ppp_channel.h> /* struct ppp_channel */ +#endif + #if defined(CONFIG_IPX) || defined(CONFIG_IPX_MODULE) #if defined(CONFIG_SPX) || defined(CONFIG_SPX_MODULE) #include <net/spx.h> @@ -102,6 +107,7 @@ struct atm_vcc; struct unix_opt { struct unix_address *addr; struct dentry * dentry; + struct vfsmount * mnt; struct semaphore readsem; struct sock * other; struct sock ** list; @@ -204,6 +210,28 @@ struct inet_opt }; #endif +#if defined(CONFIG_PPPOE) || defined (CONFIG_PPPOE_MODULE) +struct pppoe_opt +{ + struct net_device *dev; /* device associated with socket*/ + struct pppoe_addr pa; /* what this socket is bound to*/ + struct sockaddr_pppox relay; /* what socket data will be + relayed to (PPPoE relaying) */ +}; + +struct pppox_opt +{ + struct ppp_channel chan; + struct sock *sk; + struct pppox_opt *next; /* for hash table */ + union { + struct pppoe_opt pppoe; + } proto; +}; +#define pppoe_dev proto.pppoe.dev +#define pppoe_pa proto.pppoe.pa +#define pppoe_relay proto.pppoe.relay +#endif /* This defines a selective acknowledgement block. */ struct tcp_sack_block { @@ -584,6 +612,9 @@ struct sock { #if defined(CONFIG_ROSE) || defined(CONFIG_ROSE_MODULE) rose_cb *rose; #endif +#if defined(CONFIG_PPPOE) || defined(CONFIG_PPPOE_MODULE) + struct pppox_opt *pppox; +#endif #ifdef CONFIG_NETLINK struct netlink_opt *af_netlink; #endif diff --git a/include/net/tcp.h b/include/net/tcp.h index aeae81501..65fb19289 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -1079,7 +1079,7 @@ static __inline__ int tcp_snd_test(struct tcp_opt *tp, struct sk_buff *skb, static __inline__ void tcp_check_probe_timer(struct sock *sk, struct tcp_opt *tp) { - if (!tp->packets_out && !tp->probe_timer.prev) + if (!tp->packets_out && !timer_pending(&tp->probe_timer)) tcp_reset_xmit_timer(sk, TCP_TIME_PROBE0, tp->rto); } @@ -1505,13 +1505,13 @@ static inline int tcp_timer_is_set(struct sock *sk, int what) switch (what) { case TCP_TIME_RETRANS: - ret = tp->retransmit_timer.prev != NULL; + ret = timer_pending(&tp->retransmit_timer); break; case TCP_TIME_DACK: - ret = tp->delack_timer.prev != NULL; + ret = timer_pending(&tp->delack_timer); break; case TCP_TIME_PROBE0: - ret = tp->probe_timer.prev != NULL; + ret = timer_pending(&tp->probe_timer); break; default: ret = 0; |