aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Hałasa <khc@pm.waw.pl>2009-01-08 13:46:54 -0500
committerDavid S. Miller <davem@davemloft.net>2009-01-21 17:03:35 -0500
commit7cdc15f5f9db71e9c92422918ab9f8df0d31f81f (patch)
tree779c7eb6d77a932580725eab0817b0c705bcdc9c
parenta962dc2520d85c278768f5f6028f300152fca7fa (diff)
WAN: Generic HDLC now uses IFF_WAN_HDLC private flag.
Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/wan/hdlc.c3
-rw-r--r--include/linux/if.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wan/hdlc.c b/drivers/net/wan/hdlc.c
index 1f2a140c9f7c..d83cd7884e05 100644
--- a/drivers/net/wan/hdlc.c
+++ b/drivers/net/wan/hdlc.c
@@ -106,7 +106,7 @@ static int hdlc_device_event(struct notifier_block *this, unsigned long event,
106 if (dev_net(dev) != &init_net) 106 if (dev_net(dev) != &init_net)
107 return NOTIFY_DONE; 107 return NOTIFY_DONE;
108 108
109 if (dev->get_stats != hdlc_get_stats) 109 if (!(dev->priv_flags & IFF_WAN_HDLC))
110 return NOTIFY_DONE; /* not an HDLC device */ 110 return NOTIFY_DONE; /* not an HDLC device */
111 111
112 if (event != NETDEV_CHANGE) 112 if (event != NETDEV_CHANGE)
@@ -235,6 +235,7 @@ static void hdlc_setup_dev(struct net_device *dev)
235 */ 235 */
236 dev->get_stats = hdlc_get_stats; 236 dev->get_stats = hdlc_get_stats;
237 dev->flags = IFF_POINTOPOINT | IFF_NOARP; 237 dev->flags = IFF_POINTOPOINT | IFF_NOARP;
238 dev->priv_flags = IFF_WAN_HDLC;
238 dev->mtu = HDLC_MAX_MTU; 239 dev->mtu = HDLC_MAX_MTU;
239 dev->type = ARPHRD_RAWHDLC; 240 dev->type = ARPHRD_RAWHDLC;
240 dev->hard_header_len = 16; 241 dev->hard_header_len = 16;
diff --git a/include/linux/if.h b/include/linux/if.h
index 2a6e29620a96..1108f3e099e3 100644
--- a/include/linux/if.h
+++ b/include/linux/if.h
@@ -66,6 +66,7 @@
66#define IFF_SLAVE_NEEDARP 0x40 /* need ARPs for validation */ 66#define IFF_SLAVE_NEEDARP 0x40 /* need ARPs for validation */
67#define IFF_ISATAP 0x80 /* ISATAP interface (RFC4214) */ 67#define IFF_ISATAP 0x80 /* ISATAP interface (RFC4214) */
68#define IFF_MASTER_ARPMON 0x100 /* bonding master, ARP mon in use */ 68#define IFF_MASTER_ARPMON 0x100 /* bonding master, ARP mon in use */
69#define IFF_WAN_HDLC 0x200 /* WAN HDLC device */
69 70
70#define IF_GET_IFACE 0x0001 /* for querying only */ 71#define IF_GET_IFACE 0x0001 /* for querying only */
71#define IF_GET_PROTO 0x0002 72#define IF_GET_PROTO 0x0002