patch-2.4.27 linux-2.4.27/drivers/s390/net/qeth.c
Next file: linux-2.4.27/drivers/s390/s390io.c
Previous file: linux-2.4.27/drivers/s390/net/netiucv.c
Back to the patch index
Back to the overall index
- Lines: 48
- Date:
2004-08-07 16:26:05.482380800 -0700
- Orig file:
linux-2.4.26/drivers/s390/net/qeth.c
- Orig date:
2003-08-25 04:44:42.000000000 -0700
diff -urN linux-2.4.26/drivers/s390/net/qeth.c linux-2.4.27/drivers/s390/net/qeth.c
@@ -9792,7 +9792,7 @@
int pos=0,end_pos;
char dbf_text[15];
- if (*offset>0) return user_len;
+ if (*offset) return user_len;
buffer=vmalloc(__max(user_len+1,QETH_DBF_MISC_LEN));
if (buffer == NULL)
return -ENOMEM;
@@ -10308,14 +10308,16 @@
{
loff_t len;
tempinfo_t *p_info = (tempinfo_t *) file->private_data;
+ loff_t n = *offset;
+ unsigned long pos = n;
- if (*offset >= p_info->len) {
+ if (pos != n || pos >= p_info->len) {
return 0;
} else {
- len = __min(user_len, (p_info->len - *offset));
- if (copy_to_user (user_buf, &(p_info->data[*offset]), len))
+ len = __min(user_len, (p_info->len - pos));
+ if (copy_to_user (user_buf, &(p_info->data[pos]), len))
return -EFAULT;
- (*offset) += len;
+ *offset = pos + len;
return len;
}
}
@@ -10350,7 +10352,7 @@
qeth_card_t *card;
#define BUFFER_LEN (10+32+1+5+1+DEV_NAME_LEN+1)
- if (*offset>0) return user_len;
+ if (*offset) return user_len;
buffer=vmalloc(__max(__max(user_len+1,BUFFER_LEN),QETH_DBF_MISC_LEN));
if (buffer == NULL)
@@ -10474,7 +10476,7 @@
PRINT_ERR("unknown ipato information command\n");
out:
vfree(buffer);
- *offset = *offset + user_len;
+ *offset = user_len;
#undef BUFFER_LEN
return user_len;
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)