Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 25839
b: refs/heads/master
c: 5ff765f
h: refs/heads/master
i:
  25837: decb7ac
  25835: 169d864
  25831: dc7b7a3
  25823: 58be248
v: v3
  • Loading branch information
Stephen Hemminger authored and David S. Miller committed Apr 14, 2006
1 parent cf46272 commit e3e9459
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 21 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: dcdb02752ff13a64433c36f2937a58d93ae7a19e
refs/heads/master: 5ff765f3d0b9367319d29ab0c0f55349da2fd53e
26 changes: 6 additions & 20 deletions trunk/net/atm/clip.c
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ static int clip_start_xmit(struct sk_buff *skb, struct net_device *dev)
}
clip_priv->stats.tx_packets++;
clip_priv->stats.tx_bytes += skb->len;
(void)vcc->send(vcc, skb);
vcc->send(vcc, skb);
if (atm_may_send(vcc, 0)) {
entry->vccs->xoff = 0;
return 0;
Expand Down Expand Up @@ -620,26 +620,16 @@ static int clip_device_event(struct notifier_block *this, unsigned long event,
switch (event) {
case NETDEV_UP:
DPRINTK("clip_device_event NETDEV_UP\n");
(void)to_atmarpd(act_up, PRIV(dev)->number, 0);
to_atmarpd(act_up, PRIV(dev)->number, 0);
break;
case NETDEV_GOING_DOWN:
DPRINTK("clip_device_event NETDEV_DOWN\n");
(void)to_atmarpd(act_down, PRIV(dev)->number, 0);
to_atmarpd(act_down, PRIV(dev)->number, 0);
break;
case NETDEV_CHANGE:
case NETDEV_CHANGEMTU:
DPRINTK("clip_device_event NETDEV_CHANGE*\n");
(void)to_atmarpd(act_change, PRIV(dev)->number, 0);
break;
case NETDEV_REBOOT:
case NETDEV_REGISTER:
case NETDEV_DOWN:
DPRINTK("clip_device_event %ld\n", event);
/* ignore */
break;
default:
printk(KERN_WARNING "clip_device_event: unknown event "
"%ld\n", event);
to_atmarpd(act_change, PRIV(dev)->number, 0);
break;
}
return NOTIFY_DONE;
Expand All @@ -666,17 +656,13 @@ static int clip_inet_event(struct notifier_block *this, unsigned long event,


static struct notifier_block clip_dev_notifier = {
clip_device_event,
NULL,
0
.notifier_call = clip_device_event,
};



static struct notifier_block clip_inet_notifier = {
clip_inet_event,
NULL,
0
.notifier_call = clip_inet_event,
};


Expand Down

0 comments on commit e3e9459

Please sign in to comment.