aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChangli Gao <xiaosuo@gmail.com>2011-03-02 18:26:21 +0000
committerDavid S. Miller <davem@davemloft.net>2011-03-07 15:45:07 -0800
commitcca134fe784a01cf4eb9f0621b0104591b7ddfba (patch)
treefd273d10393538a13be950a97073c4ea8126ae26
parentMerge branch 'davem-next.r8169' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6 (diff)
downloadlinux-dev-cca134fe784a01cf4eb9f0621b0104591b7ddfba.tar.xz
linux-dev-cca134fe784a01cf4eb9f0621b0104591b7ddfba.zip
bonding: remove the unused dummy functions when net poll controller isn't enabled
These two functions are only used when net poll controller is enabled. Signed-off-by: Changli Gao <xiaosuo@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/bonding/bond_main.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 0592e6da15a6..912b416b7573 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1380,14 +1380,6 @@ static inline void slave_disable_netpoll(struct slave *slave)
static void bond_netpoll_cleanup(struct net_device *bond_dev)
{
}
-static int bond_netpoll_setup(struct net_device *dev, struct netpoll_info *ni)
-{
- return 0;
-}
-static struct netpoll_info *bond_netpoll_info(struct bonding *bond)
-{
- return NULL;
-}
#endif
/*---------------------------------- IOCTL ----------------------------------*/