remove socketvar.h, add more selective includes

This commit is contained in:
kmacy 2008-07-31 20:28:58 +00:00
parent 3bdaf5becf
commit cedc71acdf
4 changed files with 15 additions and 6 deletions

View File

@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
#endif #endif
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/socketvar.h>
#include <net/if.h> #include <net/if.h>
#include <net/ethernet.h> #include <net/ethernet.h>
#include <net/if_vlan_var.h> #include <net/if_vlan_var.h>

View File

@ -37,8 +37,12 @@ __FBSDID("$FreeBSD$");
#include <sys/lock.h> #include <sys/lock.h>
#include <sys/mbuf.h> #include <sys/mbuf.h>
#include <sys/mutex.h> #include <sys/mutex.h>
#include <sys/sockopt.h>
#include <sys/sockstate.h>
#include <sys/sockbuf.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/socketvar.h>
#include <sys/syslog.h> #include <sys/syslog.h>
#include <net/if.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 mbuf *m;
struct cpl_pass_open_req *req; struct cpl_pass_open_req *req;
struct tom_data *d = TOM_DATA(dev); struct tom_data *d = TOM_DATA(dev);
struct inpcb *inp = sotoinpcb(so); struct inpcb *inp = so_sotoinpcb(so);
struct listen_ctx *ctx; struct listen_ctx *ctx;
if (!TOM_TUNABLE(dev, activated)) 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->tom_data = d;
ctx->lso = so; 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); LIST_INIT(&ctx->synq_head);
stid = cxgb_alloc_stid(d->cdev, d->client, ctx); stid = cxgb_alloc_stid(d->cdev, d->client, ctx);

View File

@ -41,8 +41,10 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h> #include <sys/kernel.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <sys/mbuf.h> #include <sys/mbuf.h>
#include <sys/sockopt.h>
#include <sys/sockbuf.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/socketvar.h>
#include <net/if.h> #include <net/if.h>
#include <net/if_types.h> #include <net/if_types.h>

View File

@ -39,10 +39,14 @@ __FBSDID("$FreeBSD$");
#include <sys/mbuf.h> #include <sys/mbuf.h>
#include <sys/module.h> #include <sys/module.h>
#include <sys/mutex.h> #include <sys/mutex.h>
#include <sys/sockopt.h>
#include <sys/sockstate.h>
#include <sys/sockbuf.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <sys/syslog.h> #include <sys/syslog.h>
#include <sys/socketvar.h>
#include <net/if.h> #include <net/if.h>
#include <net/route.h> #include <net/route.h>