Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 133835
b: refs/heads/master
c: 7cdc15f
h: refs/heads/master
i:
  133833: 51467cf
  133831: 9ad12b3
v: v3
  • Loading branch information
Krzysztof Hałasa authored and David S. Miller committed Jan 21, 2009
1 parent 9367e94 commit afeb6b0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 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: a962dc2520d85c278768f5f6028f300152fca7fa
refs/heads/master: 7cdc15f5f9db71e9c92422918ab9f8df0d31f81f
3 changes: 2 additions & 1 deletion trunk/drivers/net/wan/hdlc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions trunk/include/linux/if.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit afeb6b0

Please sign in to comment.