diff options
Diffstat (limited to 'net/atm/br2684.c')
-rw-r--r-- | net/atm/br2684.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/atm/br2684.c b/net/atm/br2684.c index 280de481edc7..ea9438fc6855 100644 --- a/net/atm/br2684.c +++ b/net/atm/br2684.c | |||
@@ -101,7 +101,7 @@ static LIST_HEAD(br2684_devs); | |||
101 | 101 | ||
102 | static inline struct br2684_dev *BRPRIV(const struct net_device *net_dev) | 102 | static inline struct br2684_dev *BRPRIV(const struct net_device *net_dev) |
103 | { | 103 | { |
104 | return (struct br2684_dev *)net_dev->priv; | 104 | return (struct br2684_dev *)netdev_priv(net_dev); |
105 | } | 105 | } |
106 | 106 | ||
107 | static inline struct net_device *list_entry_brdev(const struct list_head *le) | 107 | static inline struct net_device *list_entry_brdev(const struct list_head *le) |
@@ -698,12 +698,11 @@ static int br2684_seq_show(struct seq_file *seq, void *v) | |||
698 | br2684_devs); | 698 | br2684_devs); |
699 | const struct net_device *net_dev = brdev->net_dev; | 699 | const struct net_device *net_dev = brdev->net_dev; |
700 | const struct br2684_vcc *brvcc; | 700 | const struct br2684_vcc *brvcc; |
701 | DECLARE_MAC_BUF(mac); | ||
702 | 701 | ||
703 | seq_printf(seq, "dev %.16s: num=%d, mac=%s (%s)\n", | 702 | seq_printf(seq, "dev %.16s: num=%d, mac=%pM (%s)\n", |
704 | net_dev->name, | 703 | net_dev->name, |
705 | brdev->number, | 704 | brdev->number, |
706 | print_mac(mac, net_dev->dev_addr), | 705 | net_dev->dev_addr, |
707 | brdev->mac_was_set ? "set" : "auto"); | 706 | brdev->mac_was_set ? "set" : "auto"); |
708 | 707 | ||
709 | list_for_each_entry(brvcc, &brdev->brvccs, brvccs) { | 708 | list_for_each_entry(brvcc, &brdev->brvccs, brvccs) { |