diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-01-07 18:51:13 -0500 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-01-07 18:51:13 -0500 |
| commit | abaee091a18c19ccd86feb1c8374585d82e96777 (patch) | |
| tree | 01602bae73e1278c3d98dafe1c269049927c58ce /include/linux/ipv6.h | |
| parent | a2746fb16e41b7c8f02aa4d2605ecce97abbebbd (diff) | |
| parent | 3f8d6f2a0797e8c650a47e5c1b5c2601a46f4293 (diff) | |
Merge branch 'jejb-scsi' into misc
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 0ef2a97ccdb5..402753bccafa 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h | |||
| @@ -227,7 +227,7 @@ struct ipv6_pinfo { | |||
| 227 | struct ipv6_ac_socklist *ipv6_ac_list; | 227 | struct ipv6_ac_socklist *ipv6_ac_list; |
| 228 | struct ipv6_fl_socklist __rcu *ipv6_fl_list; | 228 | struct ipv6_fl_socklist __rcu *ipv6_fl_list; |
| 229 | 229 | ||
| 230 | struct ipv6_txoptions *opt; | 230 | struct ipv6_txoptions __rcu *opt; |
| 231 | struct sk_buff *pktoptions; | 231 | struct sk_buff *pktoptions; |
| 232 | struct sk_buff *rxpmtu; | 232 | struct sk_buff *rxpmtu; |
| 233 | struct inet6_cork cork; | 233 | struct inet6_cork cork; |