Merge commit 'v2.6.29-rc2' into x86/mm

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/scsi/libiscsi_tcp.c b/drivers/scsi/libiscsi_tcp.c
index a745f91d2928..e7705d3532c9 100644
--- a/drivers/scsi/libiscsi_tcp.c
+++ b/drivers/scsi/libiscsi_tcp.c
@@ -177,7 +177,6 @@ int iscsi_tcp_segment_done(struct iscsi_tcp_conn *tcp_conn,
                            struct iscsi_segment *segment, int recv,
                            unsigned copied)
 {
-        static unsigned char padbuf[ISCSI_PAD_LEN];
         struct scatterlist sg;
         unsigned int pad;
 
@@ -233,7 +232,7 @@ int iscsi_tcp_segment_done(struct iscsi_tcp_conn *tcp_conn,
                         debug_tcp("consume %d pad bytes\n", pad);
                         segment->total_size += pad;
                         segment->size = pad;
-                        segment->data = padbuf;
+                        segment->data = segment->padbuf;
                         return 0;
                 }
         }