diff options
Diffstat (limited to 'drivers/net/wan')
| -rw-r--r-- | drivers/net/wan/hdlc_cisco.c | 11 | ||||
| -rw-r--r-- | drivers/net/wan/x25_asy.c | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/drivers/net/wan/hdlc_cisco.c b/drivers/net/wan/hdlc_cisco.c index 61d8f6389c64..a030f5aa6b95 100644 --- a/drivers/net/wan/hdlc_cisco.c +++ b/drivers/net/wan/hdlc_cisco.c @@ -193,16 +193,15 @@ static int cisco_rx(struct sk_buff *skb) mask = ~cpu_to_be32(0); /* is the mask correct? */ if (in_dev != NULL) { - struct in_ifaddr **ifap = &in_dev->ifa_list; + const struct in_ifaddr *ifa; - while (*ifap != NULL) { + in_dev_for_each_ifa_rcu(ifa, in_dev) { if (strcmp(dev->name, - (*ifap)->ifa_label) == 0) { - addr = (*ifap)->ifa_local; - mask = (*ifap)->ifa_mask; + ifa->ifa_label) == 0) { + addr = ifa->ifa_local; + mask = ifa->ifa_mask; break; } - ifap = &(*ifap)->ifa_next; } cisco_keepalive_send(dev, CISCO_ADDR_REPLY, diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c index d78bc838d631..914be5847386 100644 --- a/drivers/net/wan/x25_asy.c +++ b/drivers/net/wan/x25_asy.c @@ -602,8 +602,8 @@ static void x25_asy_close_tty(struct tty_struct *tty) err = lapb_unregister(sl->dev); if (err != LAPB_OK) - pr_err("x25_asy_close: lapb_unregister error: %d\n", - err); + pr_err("%s: lapb_unregister error: %d\n", + __func__, err); tty->disc_data = NULL; sl->tty = NULL; |