aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/bonding')
-rw-r--r--drivers/net/bonding/bond_main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 5be34b72a048..95a6ca7d9e51 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -922,12 +922,12 @@ static inline int slave_enable_netpoll(struct slave *slave)
922 struct netpoll *np; 922 struct netpoll *np;
923 int err = 0; 923 int err = 0;
924 924
925 np = kzalloc(sizeof(*np), GFP_ATOMIC); 925 np = kzalloc(sizeof(*np), GFP_KERNEL);
926 err = -ENOMEM; 926 err = -ENOMEM;
927 if (!np) 927 if (!np)
928 goto out; 928 goto out;
929 929
930 err = __netpoll_setup(np, slave->dev, GFP_ATOMIC); 930 err = __netpoll_setup(np, slave->dev);
931 if (err) { 931 if (err) {
932 kfree(np); 932 kfree(np);
933 goto out; 933 goto out;
@@ -962,7 +962,7 @@ static void bond_netpoll_cleanup(struct net_device *bond_dev)
962 slave_disable_netpoll(slave); 962 slave_disable_netpoll(slave);
963} 963}
964 964
965static int bond_netpoll_setup(struct net_device *dev, struct netpoll_info *ni, gfp_t gfp) 965static int bond_netpoll_setup(struct net_device *dev, struct netpoll_info *ni)
966{ 966{
967 struct bonding *bond = netdev_priv(dev); 967 struct bonding *bond = netdev_priv(dev);
968 struct list_head *iter; 968 struct list_head *iter;