mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-23 13:41:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

iscsi-scst: Kernel 3.13 build fix (merge r5182 from trunk)

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.2.x@5376 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2014-03-25 16:38:25 +00:00
parent 1e80077c6a
commit c75dcab46d
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
iscsi-scst/kernel/conn.c
View File

@@ -100,9 +100,12 @@ void conn_info_show(struct seq_file *seq, struct iscsi_session *session)
snprintf(buf, sizeof(buf),
"[%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x]",
NIP6(inet6_sk(sk)->daddr));
#else
#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
snprintf(buf, sizeof(buf), "[%p6]",
&inet6_sk(sk)->daddr);
#else
snprintf(buf, sizeof(buf), "[%p6]",
&sk->sk_v6_daddr);
#endif
break;
default:
@@ -164,8 +167,11 @@ static ssize_t iscsi_get_initiator_ip(struct iscsi_conn *conn,
"[%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x]",
NIP6(inet6_sk(sk)->daddr));
#else
pos = scnprintf(buf, size, "[%p6]",
&inet6_sk(sk)->daddr);
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
pos = scnprintf(buf, size, "[%p6]", &inet6_sk(sk)->daddr);
#else
pos = scnprintf(buf, size, "[%p6]", &sk->sk_v6_daddr);
#endif
#endif
break;
default: