summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDenis Vlasenko2005-08-12 00:32:53 +0200
committerDavid S. Miller2005-08-30 00:57:08 +0200
commit0a242efc4fb859b2da506cdf8f3366231602e4ff (patch)
treea4f4174ba8ccdedf892cc3358033b61e1a92babd /include
parent[NETFILTER]: Fix NF_QUEUE_NR() macro (diff)
downloadkernel-qcow2-linux-0a242efc4fb859b2da506cdf8f3366231602e4ff.tar.gz
kernel-qcow2-linux-0a242efc4fb859b2da506cdf8f3366231602e4ff.tar.xz
kernel-qcow2-linux-0a242efc4fb859b2da506cdf8f3366231602e4ff.zip
[NET]: Deinline netif_carrier_{on,off}().
# grep -r 'netif_carrier_o[nf]' linux-2.6.12 | wc -l 246 # size vmlinux.org vmlinux.carrier text data bss dec hex filename 4339634 1054414 259296 5653344 564360 vmlinux.org 4337710 1054414 259296 5651420 563bdc vmlinux.carrier And this ain't an allyesconfig kernel! Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/linux/netdevice.h14
1 files changed, 2 insertions, 12 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 296cf93a65e0..d8e52edfd526 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -699,19 +699,9 @@ static inline int netif_carrier_ok(const struct net_device *dev)
extern void __netdev_watchdog_up(struct net_device *dev);
-static inline void netif_carrier_on(struct net_device *dev)
-{
- if (test_and_clear_bit(__LINK_STATE_NOCARRIER, &dev->state))
- linkwatch_fire_event(dev);
- if (netif_running(dev))
- __netdev_watchdog_up(dev);
-}
+extern void netif_carrier_on(struct net_device *dev);
-static inline void netif_carrier_off(struct net_device *dev)
-{
- if (!test_and_set_bit(__LINK_STATE_NOCARRIER, &dev->state))
- linkwatch_fire_event(dev);
-}
+extern void netif_carrier_off(struct net_device *dev);
/* Hot-plugging. */
static inline int netif_device_present(struct net_device *dev)