| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 1 | The element skc_v6_daddr (in struct sock_common) is defined in |
| 2 | kernel source only when CONFIG_IPV6 is enabled. Hence, access |
| 3 | sk_v6_daddr element (i.e __sk_common.skc_v6_daddr) only when CONFIG_IPV6 |
| 4 | is defined; to fix below error in world build: |
| 5 | |
| 6 | -- snip -- |
| 7 | /home/jenkins/oe/world/shr-core/tmp-glibc/work-shared/qemux86/kernel-source/include/net/sock.h:330:33: error: 'struct sock_common' has no member named 'skc_v6_daddr' |
| 8 | -- CUT -- |
| 9 | |
| 10 | Upstream-Status: Pending |
| 11 | |
| 12 | Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> |
| 13 | |
| 14 | --- iscsitarget-1.4.20.3+svn502_org/kernel/conn.c 2015-12-29 21:57:50.547932217 -0800 |
| 15 | +++ iscsitarget-1.4.20.3+svn502/kernel/conn.c 2015-12-29 22:47:25.254657627 -0800 |
| 16 | @@ -46,10 +46,12 @@ void conn_info_show(struct seq_file *seq |
| 17 | snprintf(buf, sizeof(buf), |
| 18 | "%pI4", &inet_sk(sk)->inet_daddr); |
| 19 | break; |
| 20 | +#if defined(CONFIG_IPV6) |
| 21 | case AF_INET6: |
| 22 | snprintf(buf, sizeof(buf), "[%pI6]", |
| 23 | &(sk)->sk_v6_daddr); |
| 24 | break; |
| 25 | +#endif /* defined(CONFIG_IPV6) */ |
| 26 | default: |
| 27 | break; |
| 28 | } |