← Back to branch summary

~ubuntu-branches/ubuntu/quantal/open-vm-tools/quantal-201210021442

« back to all changes in this revision

Viewing changes to modules/solaris/vmxnet3/vmxnet3_solaris.h

  • Committer: Bazaar Package Importer
  • Author(s): Serge Hallyn
  • Date: 2011-03-31 14:20:05 UTC
  • mfrom: (1.4.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20110331142005-3n9red91p7ogkweo
Tags: 2011.03.28-387002-0ubuntu1
https://launchpad.net/bugs/727342
https://launchpad.net/bugs/332323
https://launchpad.net/bugs/332323
* Merge latest upstream git tag.  This has the unlocked_ioctl change
  needed to fix dkms build failures (LP: #727342)
* Changes in debian/rules:
  - work around a bug in toolbox/Makefile, where install-exec-hook is
    not happening.  This needs to get fixed the right way.
  - don't install 'vmware-user' which seems to no longer exist
  - move /etc/xdg into open-vm-toolbox (which should be done using .install)
* debian/open-vm-tools.init: add 'modprobe [-r] vmblock'. (LP: #332323)
* debian/rules and debian/open-vm-toolbox.lintian-overrides:
  - Make vmware-user-suid-wrapper suid-root (LP: #332323)

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/solaris/vmxnet3/vmxnet3_solaris.h
39
39
#include <sys/strsubr.h>
40
40
#include <sys/pattr.h>
41
41
#include <sys/mac.h>
 
42
#include <sys/sockio.h>
42
43
#ifdef OPEN_SOLARIS
43
44
#  include <sys/mac_provider.h>
44
45
#endif
115
116
   Vmxnet3_RxQueueCtrl *sharedCtrl;
116
117
} vmxnet3_rxqueue_t;
117
118
 
 
119
 
118
120
typedef struct vmxnet3_softc_t {
119
121
   dev_info_t          *dip;
120
122
   int                  instance;
126
128
 
127
129
   boolean_t            devEnabled;
128
130
   uint8_t              macaddr[6];
 
131
   uint32_t             cur_mtu;
129
132
   link_state_t         linkState;
130
133
   uint64_t             linkSpeed;
131
134
   vmxnet3_dmabuf_t     sharedData;
134
137
   kmutex_t             intrLock;
135
138
   int                  intrType;
136
139
   int                  intrMaskMode;
 
140
   int                  intrCap;
137
141
   ddi_intr_handle_t    intrHandle;
138
142
   ddi_taskq_t         *resetTask;
139
143
 
176
180
 
177
181
/* Logging stuff */
178
182
#define VMXNET3_LOG(Level, Device, Format, Args...)   \
179
 
   cmn_err(Level, VMXNET3_MODNAME "%d: " Format,      \
 
183
   cmn_err(Level, VMXNET3_MODNAME ":%d: " Format,      \
180
184
           Device->instance, ##Args);
181
185
 
182
186
#define VMXNET3_WARN(Device, Format, Args...)         \
183
187
   VMXNET3_LOG(CE_WARN, Device, Format, ##Args)
184
188
 
 
189
#define VMXNET3_DEBUG_LEVEL 2
185
190
#ifdef VMXNET3_DEBUG_LEVEL
186
191
#define VMXNET3_DEBUG(Device, Level, Format, Args...) \
187
192
   do {                                               \