diff options
| author | kmacy <kmacy@FreeBSD.org> | 2008-07-31 20:28:58 +0000 |
|---|---|---|
| committer | kmacy <kmacy@FreeBSD.org> | 2008-07-31 20:28:58 +0000 |
| commit | cedc71acdf0c941097e8a942130421658ae7bf48 (patch) | |
| tree | cdba355540eb154a9e804b73b6c01a773df824b2 /sys/dev/cxgb/ulp | |
| parent | 3bdaf5becf92a80bf4532a43163b41c1aca24d62 (diff) | |
| download | FreeBSD-src-cedc71acdf0c941097e8a942130421658ae7bf48.zip FreeBSD-src-cedc71acdf0c941097e8a942130421658ae7bf48.tar.gz | |
remove socketvar.h, add more selective includes
Diffstat (limited to 'sys/dev/cxgb/ulp')
| -rw-r--r-- | sys/dev/cxgb/ulp/tom/cxgb_l2t.c | 1 | ||||
| -rw-r--r-- | sys/dev/cxgb/ulp/tom/cxgb_listen.c | 10 | ||||
| -rw-r--r-- | sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c | 4 | ||||
| -rw-r--r-- | sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c | 6 |
4 files changed, 15 insertions, 6 deletions
diff --git a/sys/dev/cxgb/ulp/tom/cxgb_l2t.c b/sys/dev/cxgb/ulp/tom/cxgb_l2t.c index ab5fbe7..15aa167 100644 --- a/sys/dev/cxgb/ulp/tom/cxgb_l2t.c +++ b/sys/dev/cxgb/ulp/tom/cxgb_l2t.c @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$"); #endif #include <sys/socket.h> -#include <sys/socketvar.h> #include <net/if.h> #include <net/ethernet.h> #include <net/if_vlan_var.h> diff --git a/sys/dev/cxgb/ulp/tom/cxgb_listen.c b/sys/dev/cxgb/ulp/tom/cxgb_listen.c index 1d15cf2..45bf757 100644 --- a/sys/dev/cxgb/ulp/tom/cxgb_listen.c +++ b/sys/dev/cxgb/ulp/tom/cxgb_listen.c @@ -37,8 +37,12 @@ __FBSDID("$FreeBSD$"); #include <sys/lock.h> #include <sys/mbuf.h> #include <sys/mutex.h> + +#include <sys/sockopt.h> +#include <sys/sockstate.h> +#include <sys/sockbuf.h> + #include <sys/socket.h> -#include <sys/socketvar.h> #include <sys/syslog.h> #include <net/if.h> @@ -235,7 +239,7 @@ t3_listen_start(struct toedev *dev, struct socket *so, struct t3cdev *cdev) struct mbuf *m; struct cpl_pass_open_req *req; struct tom_data *d = TOM_DATA(dev); - struct inpcb *inp = sotoinpcb(so); + struct inpcb *inp = so_sotoinpcb(so); struct listen_ctx *ctx; if (!TOM_TUNABLE(dev, activated)) @@ -252,7 +256,7 @@ t3_listen_start(struct toedev *dev, struct socket *so, struct t3cdev *cdev) ctx->tom_data = d; ctx->lso = so; - ctx->ulp_mode = TOM_TUNABLE(dev, ddp) && !(so->so_options & SO_NO_DDP) ? ULP_MODE_TCPDDP : 0; + ctx->ulp_mode = TOM_TUNABLE(dev, ddp) && !(so_options_get(so) & SO_NO_DDP) ? ULP_MODE_TCPDDP : 0; LIST_INIT(&ctx->synq_head); stid = cxgb_alloc_stid(d->cdev, d->client, ctx); diff --git a/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c b/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c index b61e1ac..171cf2e 100644 --- a/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c +++ b/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c @@ -41,8 +41,10 @@ __FBSDID("$FreeBSD$"); #include <sys/kernel.h> #include <sys/sysctl.h> #include <sys/mbuf.h> +#include <sys/sockopt.h> +#include <sys/sockbuf.h> + #include <sys/socket.h> -#include <sys/socketvar.h> #include <net/if.h> #include <net/if_types.h> diff --git a/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c b/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c index 1490bfb..a2bcde5 100644 --- a/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c +++ b/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c @@ -39,10 +39,14 @@ __FBSDID("$FreeBSD$"); #include <sys/mbuf.h> #include <sys/module.h> #include <sys/mutex.h> + +#include <sys/sockopt.h> +#include <sys/sockstate.h> +#include <sys/sockbuf.h> #include <sys/socket.h> #include <sys/sysctl.h> + #include <sys/syslog.h> -#include <sys/socketvar.h> #include <net/if.h> #include <net/route.h> |
