diff options
| author | Denis Vlasenko <vda@ilport.com.ua> | 2005-08-11 18:32:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2005-08-29 18:57:08 -0400 |
| commit | 0a242efc4fb859b2da506cdf8f3366231602e4ff (patch) | |
| tree | a4f4174ba8ccdedf892cc3358033b61e1a92babd /include | |
| parent | 5917ed961def82a4dba9198d11a75f79d115a8cb (diff) | |
[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.h | 14 |
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) | |||
| 699 | 699 | ||
| 700 | extern void __netdev_watchdog_up(struct net_device *dev); | 700 | extern void __netdev_watchdog_up(struct net_device *dev); |
| 701 | 701 | ||
| 702 | static inline void netif_carrier_on(struct net_device *dev) | 702 | extern void netif_carrier_on(struct net_device *dev); |
| 703 | { | ||
| 704 | if (test_and_clear_bit(__LINK_STATE_NOCARRIER, &dev->state)) | ||
| 705 | linkwatch_fire_event(dev); | ||
| 706 | if (netif_running(dev)) | ||
| 707 | __netdev_watchdog_up(dev); | ||
| 708 | } | ||
| 709 | 703 | ||
| 710 | static inline void netif_carrier_off(struct net_device *dev) | 704 | extern void netif_carrier_off(struct net_device *dev); |
| 711 | { | ||
| 712 | if (!test_and_set_bit(__LINK_STATE_NOCARRIER, &dev->state)) | ||
| 713 | linkwatch_fire_event(dev); | ||
| 714 | } | ||
| 715 | 705 | ||
| 716 | /* Hot-plugging. */ | 706 | /* Hot-plugging. */ |
| 717 | static inline int netif_device_present(struct net_device *dev) | 707 | static inline int netif_device_present(struct net_device *dev) |