From afeb6b0b9f764bfd064b7d8abbf2eee7e8fa33ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Ha=C5=82asa?= Date: Thu, 8 Jan 2009 19:46:54 +0100 Subject: [PATCH] --- yaml --- r: 133835 b: refs/heads/master c: 7cdc15f5f9db71e9c92422918ab9f8df0d31f81f h: refs/heads/master i: 133833: 51467cf8a9ec0a93b34f34a672196a28f4bba569 133831: 9ad12b35599a889fffa0bb26fb00cfa294e51252 v: v3 --- [refs] | 2 +- trunk/drivers/net/wan/hdlc.c | 3 ++- trunk/include/linux/if.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 898bb0b6ce08..0db27770ca14 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a962dc2520d85c278768f5f6028f300152fca7fa +refs/heads/master: 7cdc15f5f9db71e9c92422918ab9f8df0d31f81f diff --git a/trunk/drivers/net/wan/hdlc.c b/trunk/drivers/net/wan/hdlc.c index 1f2a140c9f7c..d83cd7884e05 100644 --- a/trunk/drivers/net/wan/hdlc.c +++ b/trunk/drivers/net/wan/hdlc.c @@ -106,7 +106,7 @@ static int hdlc_device_event(struct notifier_block *this, unsigned long event, if (dev_net(dev) != &init_net) return NOTIFY_DONE; - if (dev->get_stats != hdlc_get_stats) + if (!(dev->priv_flags & IFF_WAN_HDLC)) return NOTIFY_DONE; /* not an HDLC device */ if (event != NETDEV_CHANGE) @@ -235,6 +235,7 @@ static void hdlc_setup_dev(struct net_device *dev) */ dev->get_stats = hdlc_get_stats; dev->flags = IFF_POINTOPOINT | IFF_NOARP; + dev->priv_flags = IFF_WAN_HDLC; dev->mtu = HDLC_MAX_MTU; dev->type = ARPHRD_RAWHDLC; dev->hard_header_len = 16; diff --git a/trunk/include/linux/if.h b/trunk/include/linux/if.h index 2a6e29620a96..1108f3e099e3 100644 --- a/trunk/include/linux/if.h +++ b/trunk/include/linux/if.h @@ -66,6 +66,7 @@ #define IFF_SLAVE_NEEDARP 0x40 /* need ARPs for validation */ #define IFF_ISATAP 0x80 /* ISATAP interface (RFC4214) */ #define IFF_MASTER_ARPMON 0x100 /* bonding master, ARP mon in use */ +#define IFF_WAN_HDLC 0x200 /* WAN HDLC device */ #define IF_GET_IFACE 0x0001 /* for querying only */ #define IF_GET_PROTO 0x0002