diff options
| author |   James Morris <james.l.morris@oracle.com> | 2016-07-07 10:15:34 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2016-07-07 10:15:34 +1000 |
| commit | d011a4d861ce583466a8ae72a0c8e7f51c8cba4e (patch) | |
| tree | 1ff8dfe7d486f5648e69ee85e54cde1987d8296a /net/ipv6/ipv6_sockglue.c | |
| parent | ima: extend the measurement entry specific pcr (diff) | |
| parent | netlabel: Implement CALIPSO config functions for SMACK. (diff) | |
| download | linux-dev-d011a4d861ce583466a8ae72a0c8e7f51c8cba4e.tar.xz linux-dev-d011a4d861ce583466a8ae72a0c8e7f51c8cba4e.zip | |
Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/selinux into next
Diffstat (limited to 'net/ipv6/ipv6_sockglue.c')
| -rw-r--r-- | net/ipv6/ipv6_sockglue.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index a9895e15ee9c..5330262ab673 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c @@ -98,7 +98,6 @@ int ip6_ra_control(struct sock *sk, int sel) return 0; } -static struct ipv6_txoptions *ipv6_update_options(struct sock *sk, struct ipv6_txoptions *opt) { |