Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (52 commits)
  netxen: do_rom_fast_write error handling
  natsemi: Fix detection of vanilla natsemi cards
  net: remove a collection of unneeded #undef REALLY_SLOW_IO stuff
  chelsio: Fix non-NAPI compile
  cxgb3 - Feed Rx free list with pages
  cxgb3 - Recovery from HW starvation of response queue entries.
  cxgb3 - Unmap offload packets when they are freed
  cxgb3 - FW version update
  cxgb3 - private ioctl cleanup
  cxgb3 - manage sysfs attributes per port
  S2IO: Restoring the mac address in s2io_reset
  S2IO: Avoid printing the Enhanced statistics for Xframe I card.
  S2IO: Making LED off during LINK_DOWN notification.
  S2IO: Added a loadable parameter to enable or disable vlan stripping in frame.
  S2IO: Optimized the delay to wait for command completion
  S2IO: Fixes for MSI and MSIX
  qla3xxx: Bumping driver version number
  qla3xxx: Kernic Panic on pSeries under stress conditions
  qla3xxx: bugfix tx reset after stress conditions.
  qla3xxx: Check return code from pci_map_single() in ql_release_to_lrg_buf_free_list(), ql_populate_free_queue(), ql_alloc_large_buffers(), and ql3xxx_send()
  ...

1 files changed, 11 insertions, 22 deletions

diff --git a/drivers/net/cxgb3/cxgb3_ioctl.h b/drivers/net/cxgb3/cxgb3_ioctl.h
index a94281861a66..0a82fcddf2d8 100644
--- a/drivers/net/cxgb3/cxgb3_ioctl.h
+++ b/drivers/net/cxgb3/cxgb3_ioctl.h
@@ -36,28 +36,17 @@
  * Ioctl commands specific to this driver.
  */
 enum {
-        CHELSIO_SETREG = 1024,
-        CHELSIO_GETREG,
-        CHELSIO_SETTPI,
-        CHELSIO_GETTPI,
-        CHELSIO_GETMTUTAB,
-        CHELSIO_SETMTUTAB,
-        CHELSIO_GETMTU,
-        CHELSIO_SET_PM,
-        CHELSIO_GET_PM,
-        CHELSIO_GET_TCAM,
-        CHELSIO_SET_TCAM,
-        CHELSIO_GET_TCB,
-        CHELSIO_GET_MEM,
-        CHELSIO_LOAD_FW,
-        CHELSIO_GET_PROTO,
-        CHELSIO_SET_PROTO,
-        CHELSIO_SET_TRACE_FILTER,
-        CHELSIO_SET_QSET_PARAMS,
-        CHELSIO_GET_QSET_PARAMS,
-        CHELSIO_SET_QSET_NUM,
-        CHELSIO_GET_QSET_NUM,
-        CHELSIO_SET_PKTSCHED,
+        CHELSIO_GETMTUTAB               = 1029,
+        CHELSIO_SETMTUTAB               = 1030,
+        CHELSIO_SET_PM                  = 1032,
+        CHELSIO_GET_PM                  = 1033,
+        CHELSIO_GET_MEM                 = 1038,
+        CHELSIO_LOAD_FW                 = 1041,
+        CHELSIO_SET_TRACE_FILTER        = 1044,
+        CHELSIO_SET_QSET_PARAMS         = 1045,
+        CHELSIO_GET_QSET_PARAMS         = 1046,
+        CHELSIO_SET_QSET_NUM            = 1047,
+        CHELSIO_GET_QSET_NUM            = 1048,
 };
 
 struct ch_reg {