Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-2.6] / drivers / net / cxgb3 / cxgb3_ioctl.h

diff --git a/drivers/net/cxgb3/cxgb3_ioctl.h b/drivers/net/cxgb3/cxgb3_ioctl.h
index a94281861a663dcb12f06f372b54c725aff99e16..68200a14065ebc12b07879f4ecde8f491aa9570e 100644 (file)
--- 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 {
@@ -101,6 +90,7 @@ struct ch_qset_params {
        int32_t fl_size[2];
        int32_t intr_lat;
        int32_t polling;
+       int32_t lro;
        int32_t cong_thres;
 };