Merge branch 'upstream-fixes' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into tmp

3 files changed, 19 insertions, 7 deletions

diff --git a/drivers/net/ixgb/ixgb_hw.c b/drivers/net/ixgb/ixgb_hw.c
index f7fa10e47fa2..2b1515574faf 100644
--- a/drivers/net/ixgb/ixgb_hw.c
+++ b/drivers/net/ixgb/ixgb_hw.c
@@ -236,6 +236,17 @@ ixgb_identify_phy(struct ixgb_hw *hw)
                 DEBUGOUT("Identified G6104 optics\n");
                 phy_type = ixgb_phy_type_g6104;
                 break;
+        case IXGB_DEVICE_ID_82597EX_CX4:
+                DEBUGOUT("Identified CX4\n");
+                xpak_vendor = ixgb_identify_xpak_vendor(hw);
+                if (xpak_vendor == ixgb_xpak_vendor_intel) {
+                        DEBUGOUT("Identified TXN17201 optics\n");
+                        phy_type = ixgb_phy_type_txn17201;
+                } else {
+                        DEBUGOUT("Identified G6005 optics\n");
+                        phy_type = ixgb_phy_type_g6005;
+                }
+                break;
         default:
                 DEBUGOUT("Unknown physical layer module\n");
                 phy_type = ixgb_phy_type_unknown;
diff --git a/drivers/net/ixgb/ixgb_ids.h b/drivers/net/ixgb/ixgb_ids.h
index 40a085f94c7b..9fd61189b4b2 100644
--- a/drivers/net/ixgb/ixgb_ids.h
+++ b/drivers/net/ixgb/ixgb_ids.h
@@ -45,6 +45,7 @@
 
 #define IXGB_DEVICE_ID_82597EX_CX4   0x109E
 #define IXGB_SUBDEVICE_ID_A00C  0xA00C
+#define IXGB_SUBDEVICE_ID_A01C  0xA01C
 
 #endif /* #ifndef _IXGB_IDS_H_ */
 /* End of File */
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index 5bff05f9757b..346273d42f97 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -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