diff options
Diffstat (limited to 'net/atm')
-rw-r--r-- | net/atm/clip.c | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/net/atm/clip.c b/net/atm/clip.c index 49258eed936d..7ebb81a8bc08 100644 --- a/net/atm/clip.c +++ b/net/atm/clip.c | |||
@@ -443,7 +443,7 @@ static int clip_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
443 | } | 443 | } |
444 | clip_priv->stats.tx_packets++; | 444 | clip_priv->stats.tx_packets++; |
445 | clip_priv->stats.tx_bytes += skb->len; | 445 | clip_priv->stats.tx_bytes += skb->len; |
446 | (void)vcc->send(vcc, skb); | 446 | vcc->send(vcc, skb); |
447 | if (atm_may_send(vcc, 0)) { | 447 | if (atm_may_send(vcc, 0)) { |
448 | entry->vccs->xoff = 0; | 448 | entry->vccs->xoff = 0; |
449 | return 0; | 449 | return 0; |
@@ -620,26 +620,16 @@ static int clip_device_event(struct notifier_block *this, unsigned long event, | |||
620 | switch (event) { | 620 | switch (event) { |
621 | case NETDEV_UP: | 621 | case NETDEV_UP: |
622 | DPRINTK("clip_device_event NETDEV_UP\n"); | 622 | DPRINTK("clip_device_event NETDEV_UP\n"); |
623 | (void)to_atmarpd(act_up, PRIV(dev)->number, 0); | 623 | to_atmarpd(act_up, PRIV(dev)->number, 0); |
624 | break; | 624 | break; |
625 | case NETDEV_GOING_DOWN: | 625 | case NETDEV_GOING_DOWN: |
626 | DPRINTK("clip_device_event NETDEV_DOWN\n"); | 626 | DPRINTK("clip_device_event NETDEV_DOWN\n"); |
627 | (void)to_atmarpd(act_down, PRIV(dev)->number, 0); | 627 | to_atmarpd(act_down, PRIV(dev)->number, 0); |
628 | break; | 628 | break; |
629 | case NETDEV_CHANGE: | 629 | case NETDEV_CHANGE: |
630 | case NETDEV_CHANGEMTU: | 630 | case NETDEV_CHANGEMTU: |
631 | DPRINTK("clip_device_event NETDEV_CHANGE*\n"); | 631 | DPRINTK("clip_device_event NETDEV_CHANGE*\n"); |
632 | (void)to_atmarpd(act_change, PRIV(dev)->number, 0); | 632 | to_atmarpd(act_change, PRIV(dev)->number, 0); |
633 | break; | ||
634 | case NETDEV_REBOOT: | ||
635 | case NETDEV_REGISTER: | ||
636 | case NETDEV_DOWN: | ||
637 | DPRINTK("clip_device_event %ld\n", event); | ||
638 | /* ignore */ | ||
639 | break; | ||
640 | default: | ||
641 | printk(KERN_WARNING "clip_device_event: unknown event " | ||
642 | "%ld\n", event); | ||
643 | break; | 633 | break; |
644 | } | 634 | } |
645 | return NOTIFY_DONE; | 635 | return NOTIFY_DONE; |
@@ -666,17 +656,13 @@ static int clip_inet_event(struct notifier_block *this, unsigned long event, | |||
666 | 656 | ||
667 | 657 | ||
668 | static struct notifier_block clip_dev_notifier = { | 658 | static struct notifier_block clip_dev_notifier = { |
669 | clip_device_event, | 659 | .notifier_call = clip_device_event, |
670 | NULL, | ||
671 | 0 | ||
672 | }; | 660 | }; |
673 | 661 | ||
674 | 662 | ||
675 | 663 | ||
676 | static struct notifier_block clip_inet_notifier = { | 664 | static struct notifier_block clip_inet_notifier = { |
677 | clip_inet_event, | 665 | .notifier_call = clip_inet_event, |
678 | NULL, | ||
679 | 0 | ||
680 | }; | 666 | }; |
681 | 667 | ||
682 | 668 | ||