projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1f5a740
)
bonding: netpoll: remove unwanted slave_dev_support_netpoll()
author
dingtianhong
<
[email protected]
>
Fri, 21 Feb 2014 08:08:52 +0000
(16:08 +0800)
committer
David S. Miller
<
[email protected]
>
Mon, 24 Feb 2014 23:28:23 +0000
(18:28 -0500)
The __netpoll_setup() will check the slave's flag and ndo_poll_controller just
like the slave_dev_support_netpoll() does, and slave_dev_support_netpoll() was
not used by any place, so remove it.
Cc: Jay Vosburgh <
[email protected]
>
Cc: Veaceslav Falico <
[email protected]
>
Cc: Andy Gospodarek <
[email protected]
>
Signed-off-by: Ding Tianhong <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/bonding/bond_main.c
patch
|
blob
|
history
diff --git
a/drivers/net/bonding/bond_main.c
b/drivers/net/bonding/bond_main.c
index bd70bbc7992cfea6aaaf49333316d280e7d152ce..942eeb1c7794128b3aa0af238f329e9114b5edf3 100644
(file)
--- a/
drivers/net/bonding/bond_main.c
+++ b/
drivers/net/bonding/bond_main.c
@@
-942,14
+942,6
@@
static inline void slave_disable_netpoll(struct slave *slave)
slave->np = NULL;
__netpoll_free_async(np);
}
-static inline bool slave_dev_support_netpoll(struct net_device *slave_dev)
-{
- if (slave_dev->priv_flags & IFF_DISABLE_NETPOLL)
- return false;
- if (!slave_dev->netdev_ops->ndo_poll_controller)
- return false;
- return true;
-}
static void bond_poll_controller(struct net_device *bond_dev)
{