diff options
author | 2005-06-04 23:11:28 +0200 | |
---|---|---|
committer | Jeff Garzik | 2005-06-04 23:11:28 +0200 |
commit | 140fedb5f2efd1f23b26afb2d812004556ba9515 (patch) | |
tree | e645668185518a7947c3cd71b203efaa89c2332b /include | |
parent | Automatic merge of /spare/repo/netdev-2.6 branch we18 (diff) | |
parent | [netdrvrs] Use netif_carrier_* instead of IFF_RUNNING (diff) | |
download | kernel-qcow2-linux-140fedb5f2efd1f23b26afb2d812004556ba9515.tar.gz kernel-qcow2-linux-140fedb5f2efd1f23b26afb2d812004556ba9515.tar.xz kernel-qcow2-linux-140fedb5f2efd1f23b26afb2d812004556ba9515.zip |
Automatic merge of /spare/repo/netdev-2.6 branch iff-running
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/if.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/if.h b/include/linux/if.h index d73a9d62f208..ce627d9092ef 100644 --- a/include/linux/if.h +++ b/include/linux/if.h @@ -33,7 +33,7 @@ #define IFF_LOOPBACK 0x8 /* is a loopback net */ #define IFF_POINTOPOINT 0x10 /* interface is has p-p link */ #define IFF_NOTRAILERS 0x20 /* avoid use of trailers */ -#define IFF_RUNNING 0x40 /* resources allocated */ +#define IFF_RUNNING 0x40 /* interface running and carrier ok */ #define IFF_NOARP 0x80 /* no ARP protocol */ #define IFF_PROMISC 0x100 /* receive all packets */ #define IFF_ALLMULTI 0x200 /* receive all multicast packets*/ |