Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 214333
b: refs/heads/master
c: f6c9322
h: refs/heads/master
i:
  214331: 9688f5e
v: v3
  • Loading branch information
Joe Perches authored and David S. Miller committed Sep 7, 2010
1 parent 08ab112 commit 83230d8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 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: b31fa5bad576cd8180a5ad70c648333b44320d44
refs/heads/master: f6c9322c3a0cd50a6996094327347c87cd2f4bd8
16 changes: 8 additions & 8 deletions trunk/net/caif/caif_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what,

switch (what) {
case NETDEV_REGISTER:
pr_info("register %s\n", dev->name);
netdev_info(dev, "register\n");
caifd = caif_device_alloc(dev);
if (caifd == NULL)
break;
Expand All @@ -227,13 +227,13 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what,
break;

case NETDEV_UP:
pr_info("up %s\n", dev->name);
netdev_info(dev, "up\n");
caifd = caif_get(dev);
if (caifd == NULL)
break;
caifdev = netdev_priv(dev);
if (atomic_read(&caifd->state) == NETDEV_UP) {
pr_info("%s already up\n", dev->name);
netdev_info(dev, "already up\n");
break;
}
atomic_set(&caifd->state, what);
Expand Down Expand Up @@ -274,7 +274,7 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what,
caifd = caif_get(dev);
if (caifd == NULL)
break;
pr_info("going down %s\n", dev->name);
netdev_info(dev, "going down\n");

if (atomic_read(&caifd->state) == NETDEV_GOING_DOWN ||
atomic_read(&caifd->state) == NETDEV_DOWN)
Expand All @@ -296,18 +296,18 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what,
caifd = caif_get(dev);
if (caifd == NULL)
break;
pr_info("down %s\n", dev->name);
netdev_info(dev, "down\n");
if (atomic_read(&caifd->in_use))
pr_warn("Unregistering an active CAIF device: %s\n",
dev->name);
netdev_warn(dev,
"Unregistering an active CAIF device\n");
cfcnfg_del_phy_layer(get_caif_conf(), &caifd->layer);
dev_put(dev);
atomic_set(&caifd->state, what);
break;

case NETDEV_UNREGISTER:
caifd = caif_get(dev);
pr_info("unregister %s\n", dev->name);
netdev_info(dev, "unregister\n");
atomic_set(&caifd->state, what);
caif_device_destroy(dev);
break;
Expand Down

0 comments on commit 83230d8

Please sign in to comment.