Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 0a242efc4fb859b2da506cdf8f3366231602e4ff

Authored by Denis Vlasenko
Committed by David S. Miller
1 parent 5917ed961d
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 2 changed files with 18 additions and 12 deletions Side-by-side Diff

include/linux/netdevice.h
Diff comments   View file @ 0a242ef
... ... @@ -699,19 +699,9 @@
699 699  
700 700 extern void __netdev_watchdog_up(struct net_device *dev);
701 701  
702   -static inline 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   -}
  702 +extern void netif_carrier_on(struct net_device *dev);
709 703  
710   -static inline 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   -}
  704 +extern void netif_carrier_off(struct net_device *dev);
715 705  
716 706 /* Hot-plugging. */
717 707 static inline int netif_device_present(struct net_device *dev)
net/sched/sch_generic.c
Diff comments   View file @ 0a242ef
... ... @@ -238,6 +238,20 @@
238 238 spin_unlock_bh(&dev->xmit_lock);
239 239 }
240 240  
  241 +void netif_carrier_on(struct net_device *dev)
  242 +{
  243 + if (test_and_clear_bit(__LINK_STATE_NOCARRIER, &dev->state))
  244 + linkwatch_fire_event(dev);
  245 + if (netif_running(dev))
  246 + __netdev_watchdog_up(dev);
  247 +}
  248 +
  249 +void netif_carrier_off(struct net_device *dev)
  250 +{
  251 + if (!test_and_set_bit(__LINK_STATE_NOCARRIER, &dev->state))
  252 + linkwatch_fire_event(dev);
  253 +}
  254 +
241 255 /* "NOOP" scheduler: the best scheduler, recommended for all interfaces
242 256 under all circumstances. It is difficult to invent anything faster or
243 257 cheaper.
... ... @@ -600,6 +614,8 @@
600 614 }
601 615  
602 616 EXPORT_SYMBOL(__netdev_watchdog_up);
  617 +EXPORT_SYMBOL(netif_carrier_on);
  618 +EXPORT_SYMBOL(netif_carrier_off);
603 619 EXPORT_SYMBOL(noop_qdisc);
604 620 EXPORT_SYMBOL(noop_qdisc_ops);
605 621 EXPORT_SYMBOL(qdisc_create_dflt);