Merge branch 'upstream-fixes' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into tmp
This commit is contained in:
@@ -36,7 +36,7 @@ static char ixgb_driver_string[] = "Intel(R) PRO/10GbE Network Driver";
|
||||
#else
|
||||
#define DRIVERNAPI "-NAPI"
|
||||
#endif
|
||||
#define DRV_VERSION "1.0.109-k2"DRIVERNAPI
|
||||
#define DRV_VERSION "1.0.109-k4"DRIVERNAPI
|
||||
char ixgb_driver_version[] = DRV_VERSION;
|
||||
static char ixgb_copyright[] = "Copyright (c) 1999-2006 Intel Corporation.";
|
||||
|
||||
@@ -140,12 +140,12 @@ module_param(debug, int, 0);
|
||||
MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
|
||||
|
||||
/* some defines for controlling descriptor fetches in h/w */
|
||||
#define RXDCTL_WTHRESH_DEFAULT 16 /* chip writes back at this many or RXT0 */
|
||||
#define RXDCTL_PTHRESH_DEFAULT 0 /* chip considers prefech below
|
||||
* this */
|
||||
#define RXDCTL_HTHRESH_DEFAULT 0 /* chip will only prefetch if tail
|
||||
* is pushed this many descriptors
|
||||
* from head */
|
||||
#define RXDCTL_WTHRESH_DEFAULT 15 /* chip writes back at this many or RXT0 */
|
||||
#define RXDCTL_PTHRESH_DEFAULT 0 /* chip considers prefech below
|
||||
* this */
|
||||
#define RXDCTL_HTHRESH_DEFAULT 0 /* chip will only prefetch if tail
|
||||
* is pushed this many descriptors
|
||||
* from head */
|
||||
|
||||
/**
|
||||
* ixgb_init_module - Driver Registration Routine
|
||||
|
Reference in New Issue
Block a user