summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--staging/layer1.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/staging/layer1.c b/staging/layer1.c
index bf00a52..ecba7fc 100644
--- a/staging/layer1.c
+++ b/staging/layer1.c
@@ -105,7 +105,11 @@ int send_eth(void)
{
bytestring_s = str2hex (argval, bytestring, MAX_PAYLOAD_SIZE);
}
-
+ else
+ {
+ bytestring_s = str2hex (tx.arg_string, bytestring, MAX_PAYLOAD_SIZE);
+ }
+
// Set the flags to shorten subsequent decisions:
src = strlen(tx.eth_src_txt);
dst = strlen(tx.eth_dst_txt);
igration code - Patch series to close callback races for OPEN, LAYOUTGET and LAYOUTRETURN - Silence WARN_ON when NFSv4.1 over RDMA is in use - Fix a LAYOUTCOMMIT race in the pNFS/blocks client - Fix pNFS timeout issues when the DS fails" * tag 'nfs-for-4.8-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: NFSv4.x: Fix a refcount leak in nfs_callback_up_net NFS4: Avoid migration loops pNFS/flexfiles: Fix an Oopsable condition when connection to the DS fails NFSv4.1: Remove obsolete and incorrrect assignment in nfs4_callback_sequence NFSv4.1: Close callback races for OPEN, LAYOUTGET and LAYOUTRETURN NFSv4.1: Defer bumping the slot sequence number until we free the slot NFSv4.1: Delay callback processing when there are referring triples NFSv4.1: Fix Oopsable condition in server callback races SUNRPC: Silence WARN_ON when NFSv4.1 over RDMA is in use pnfs/blocklayout: update last_write_offset atomically with extents pNFS: The client must not do I/O to the DS if it's lease has expired pNFS: Handle NFS4ERR_OLD_STATEID correctly in LAYOUTSTAT calls pNFS/flexfiles: Set reasonable default retrans values for the data channel NFS: Allow the mount option retrans=0 pNFS/flexfiles: Fix layoutstat periodic reporting
Diffstat