merge correctly while keeping Haiku specifics. Thanks Siarzhuk!

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28705 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval 2008-11-20 23:07:41 +00:00
parent e401039efa
commit 30ca128ee5

View File

@ -275,8 +275,8 @@ uint64_t ifmedia_baudrate(int);
/*
* Status bits
*/
#define IFM_AVALID 0x00000001 /* Active bit valid */
#define IFM_ACTIVE 0x00000002 /* Interface attached to working net */
#define IFM_AVALID 0x10000000 /* Active bit valid */
#define IFM_ACTIVE 0x00800000 /* same as Haiku's */
/* Mask of "status valid" bits, for ifconfig(8). */
#define IFM_STATUS_VALID IFM_AVALID