1 files changed, 6 insertions, 6 deletions

diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index e333bc86bd39..415e117967c7 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -1834,7 +1834,7 @@ void inet_netconf_notify_devconf(struct net *net, int type, int ifindex,
         struct sk_buff *skb;
         int err = -ENOBUFS;
 
-        skb = nlmsg_new(inet_netconf_msgsize_devconf(type), GFP_ATOMIC);
+        skb = nlmsg_new(inet_netconf_msgsize_devconf(type), GFP_KERNEL);
         if (!skb)
                 goto errout;
 
@@ -1846,7 +1846,7 @@ void inet_netconf_notify_devconf(struct net *net, int type, int ifindex,
                 kfree_skb(skb);
                 goto errout;
         }
-        rtnl_notify(skb, net, 0, RTNLGRP_IPV4_NETCONF, NULL, GFP_ATOMIC);
+        rtnl_notify(skb, net, 0, RTNLGRP_IPV4_NETCONF, NULL, GFP_KERNEL);
         return;
 errout:
         if (err < 0)
@@ -1903,7 +1903,7 @@ static int inet_netconf_get_devconf(struct sk_buff *in_skb,
         }
 
         err = -ENOBUFS;
-        skb = nlmsg_new(inet_netconf_msgsize_devconf(NETCONFA_ALL), GFP_ATOMIC);
+        skb = nlmsg_new(inet_netconf_msgsize_devconf(NETCONFA_ALL), GFP_KERNEL);
         if (!skb)
                 goto errout;
 
@@ -2027,16 +2027,16 @@ static void inet_forward_change(struct net *net)
 
         for_each_netdev(net, dev) {
                 struct in_device *in_dev;
+
                 if (on)
                         dev_disable_lro(dev);
-                rcu_read_lock();
-                in_dev = __in_dev_get_rcu(dev);
+
+                in_dev = __in_dev_get_rtnl(dev);
                 if (in_dev) {
                         IN_DEV_CONF_SET(in_dev, FORWARDING, on);
                         inet_netconf_notify_devconf(net, NETCONFA_FORWARDING,
                                                     dev->ifindex, &in_dev->cnf);
                 }
-                rcu_read_unlock();
         }
 }