Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream

Conflicts:

	drivers/uwb/wlp/eda.c

1 files changed, 5 insertions, 2 deletions

diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h
index 0c9514de5df7..d0ed5226f8c4 100644
--- a/include/scsi/iscsi_if.h
+++ b/include/scsi/iscsi_if.h
@@ -333,8 +333,11 @@ enum iscsi_host_param {
 #define CAP_TEXT_NEGO           0x80
 #define CAP_MARKERS             0x100
 #define CAP_FW_DB               0x200
-#define CAP_SENDTARGETS_OFFLOAD 0x400
-#define CAP_DATA_PATH_OFFLOAD   0x800
+#define CAP_SENDTARGETS_OFFLOAD 0x400   /* offload discovery process */
+#define CAP_DATA_PATH_OFFLOAD   0x800   /* offload entire IO path */
+#define CAP_DIGEST_OFFLOAD      0x1000  /* offload hdr and data digests */
+#define CAP_PADDING_OFFLOAD     0x2000  /* offload padding insertion, removal,
+                                         and verification */
 
 /*
  * These flags describes reason of stop_conn() call