diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-01-14 22:25:14 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-01-14 22:25:14 +0800 |
| commit | f90ae1b62bedd8b57966a7be68855f2d43170db6 (patch) | |
| tree | dc332d18219749a17b163d740b8713be5e8d940b /include/linux/ipv6.h | |
| parent | 346a8beb760237fb0fed811045ec92c799f48d54 (diff) | |
| parent | 60917545df1ffc7f918550512dc4a14758f74784 (diff) | |
Merge remote-tracking branch 'lts/linux-3.18.y' into linux-linaro-lsk-v3.18lsk-v3.18-16.01
Diffstat (limited to 'include/linux/ipv6.h')
| -rw-r--r-- | include/linux/ipv6.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index ff560537dd61..2725b03b4ae2 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h @@ -212,7 +212,7 @@ struct ipv6_pinfo { struct ipv6_ac_socklist *ipv6_ac_list; struct ipv6_fl_socklist __rcu *ipv6_fl_list; - struct ipv6_txoptions *opt; + struct ipv6_txoptions __rcu *opt; struct sk_buff *pktoptions; struct sk_buff *rxpmtu; struct { |