Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (82 commits)
  ipw2200: Call netif_*_queue() interfaces properly.
  netxen: Needs to include linux/vmalloc.h
  [netdrvr] atl1d: fix !CONFIG_PM build
  r6040: rework init_one error handling
  r6040: bump release number to 0.18
  r6040: handle RX fifo full and no descriptor interrupts
  r6040: change the default waiting time
  r6040: use definitions for magic values in descriptor status
  r6040: completely rework the RX path
  r6040: call napi_disable when puting down the interface and set lp->dev accordingly.
  mv643xx_eth: fix NETPOLL build
  r6040: rework the RX buffers allocation routine
  r6040: fix scheduling while atomic in r6040_tx_timeout
  r6040: fix null pointer access and tx timeouts
  r6040: prefix all functions with r6040
  rndis_host: support WM6 devices as modems
  at91_ether: use netstats in net_device structure
  sfc: Create one RX queue and interrupt per CPU package by default
  sfc: Use a separate workqueue for resets
  sfc: I2C adapter initialisation fixes
  ...

1 files changed, 28 insertions, 3 deletions

diff --git a/drivers/s390/net/ctcm_main.h b/drivers/s390/net/ctcm_main.h
index 95b0c0b6ebc6..a72e0feeb27f 100644
--- a/drivers/s390/net/ctcm_main.h
+++ b/drivers/s390/net/ctcm_main.h
@@ -22,9 +22,9 @@
 
 #define CTC_DRIVER_NAME "ctcm"
 #define CTC_DEVICE_NAME "ctc"
-#define CTC_DEVICE_GENE "ctc%d"
 #define MPC_DEVICE_NAME "mpc"
-#define MPC_DEVICE_GENE "mpc%d"
+#define CTC_DEVICE_GENE CTC_DEVICE_NAME "%d"
+#define MPC_DEVICE_GENE MPC_DEVICE_NAME "%d"
 
 #define CHANNEL_FLAGS_READ      0
 #define CHANNEL_FLAGS_WRITE     1
@@ -48,6 +48,30 @@
 #define ctcm_pr_err(fmt, arg...) printk(KERN_ERR fmt, ##arg)
 #define ctcm_pr_crit(fmt, arg...) printk(KERN_CRIT fmt, ##arg)
 
+#define CTCM_PR_DEBUG(fmt, arg...) \
+        do { \
+                if (do_debug) \
+                        printk(KERN_DEBUG fmt, ##arg); \
+        } while (0)
+
+#define CTCM_PR_DBGDATA(fmt, arg...) \
+        do { \
+                if (do_debug_data) \
+                        printk(KERN_DEBUG fmt, ##arg); \
+        } while (0)
+
+#define CTCM_D3_DUMP(buf, len) \
+        do { \
+                if (do_debug_data) \
+                        ctcmpc_dumpit(buf, len); \
+        } while (0)
+
+#define CTCM_CCW_DUMP(buf, len) \
+        do { \
+                if (do_debug_ccw) \
+                        ctcmpc_dumpit(buf, len); \
+        } while (0)
+
 /*
  * CCW commands, used in this driver.
  */
@@ -161,8 +185,9 @@ struct channel {
         fsm_instance *fsm;      /* finite state machine of this channel */
         struct net_device *netdev;      /* corresponding net_device */
         struct ctcm_profile prof;
-        unsigned char *trans_skb_data;
+        __u8 *trans_skb_data;
         __u16 logflags;
+        __u8  sense_rc; /* last unit check sense code report control */
 };
 
 struct ctcm_priv {