diff options
-rw-r--r-- | net/ipv4/ip_sockglue.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index 8aa87c19fa00..5343d9ac510b 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c | |||
@@ -445,11 +445,6 @@ out: | |||
445 | } | 445 | } |
446 | 446 | ||
447 | 447 | ||
448 | static void opt_kfree_rcu(struct rcu_head *head) | ||
449 | { | ||
450 | kfree(container_of(head, struct ip_options_rcu, rcu)); | ||
451 | } | ||
452 | |||
453 | /* | 448 | /* |
454 | * Socket option code for IP. This is the end of the line after any | 449 | * Socket option code for IP. This is the end of the line after any |
455 | * TCP,UDP etc options on an IP socket. | 450 | * TCP,UDP etc options on an IP socket. |
@@ -525,7 +520,7 @@ static int do_ip_setsockopt(struct sock *sk, int level, | |||
525 | } | 520 | } |
526 | rcu_assign_pointer(inet->inet_opt, opt); | 521 | rcu_assign_pointer(inet->inet_opt, opt); |
527 | if (old) | 522 | if (old) |
528 | call_rcu(&old->rcu, opt_kfree_rcu); | 523 | kfree_rcu(old, rcu); |
529 | break; | 524 | break; |
530 | } | 525 | } |
531 | case IP_PKTINFO: | 526 | case IP_PKTINFO: |