diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-07-23 00:47:29 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-07-23 00:47:29 -0400 |
| commit | bd072111e7319d90a7b8127f91c2806b9a6f279e (patch) | |
| tree | 1686978814a2387ebfc16f9f5778a7f0caaf319b /include/linux/if.h | |
| parent | 24d01c0681bfbc10a99304c48a89ad213d2d7a4b (diff) | |
| parent | 4be3bd7849165e7efa6b0b35a23d6a3598d97465 (diff) | |
Merge commit 'v2.6.31-rc4' into next
Diffstat (limited to 'include/linux/if.h')
| -rw-r--r-- | include/linux/if.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/if.h b/include/linux/if.h index 1108f3e099e3..b9a6229f3be7 100644 --- a/include/linux/if.h +++ b/include/linux/if.h | |||
| @@ -67,6 +67,9 @@ | |||
| 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 | #define IFF_WAN_HDLC 0x200 /* WAN HDLC device */ |
| 70 | #define IFF_XMIT_DST_RELEASE 0x400 /* dev_hard_start_xmit() is allowed to | ||
| 71 | * release skb->dst | ||
| 72 | */ | ||
| 70 | 73 | ||
| 71 | #define IF_GET_IFACE 0x0001 /* for querying only */ | 74 | #define IF_GET_IFACE 0x0001 /* for querying only */ |
| 72 | #define IF_GET_PROTO 0x0002 | 75 | #define IF_GET_PROTO 0x0002 |