diff options
| author | Justin Pettit <jpettit@nicira.com> | 2015-04-12 10:13:59 -0700 |
|---|---|---|
| committer | Justin Pettit <jpettit@nicira.com> | 2015-04-12 10:13:59 -0700 |
| commit | daaeeec0bd4348b1f6ac5ca5a302e57bd11cca01 (patch) | |
| tree | 5b34ccd589c61547044dfbfcf77636bfcd8ebb61 /lib/netdev-bsd.c | |
| parent | 717c7fc508044d08210c686c1e8576c29a108f86 (diff) | |
| parent | e8fe6ad03aa3d25b5ae99190d5aa065705a1b3c8 (diff) | |
| download | openvswitch-daaeeec0bd4348b1f6ac5ca5a302e57bd11cca01.tar.gz | |
Merge remote-tracking branch 'origin/master' into ovn
Conflicts:
tutorial/ovs-sandbox
Diffstat (limited to 'lib/netdev-bsd.c')
| -rw-r--r-- | lib/netdev-bsd.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/netdev-bsd.c b/lib/netdev-bsd.c index f97a5c35d..9ed2823b8 100644 --- a/lib/netdev-bsd.c +++ b/lib/netdev-bsd.c @@ -1785,7 +1785,7 @@ static int ifr_get_flags(const struct ifreq *ifr) { #ifdef HAVE_STRUCT_IFREQ_IFR_FLAGSHIGH - return (ifr->ifr_flagshigh << 16) | ifr->ifr_flags; + return (ifr->ifr_flagshigh << 16) | (ifr->ifr_flags & 0xffff); #else return ifr->ifr_flags; #endif @@ -1794,9 +1794,11 @@ ifr_get_flags(const struct ifreq *ifr) static void ifr_set_flags(struct ifreq *ifr, int flags) { - ifr->ifr_flags = flags; #ifdef HAVE_STRUCT_IFREQ_IFR_FLAGSHIGH + ifr->ifr_flags = flags & 0xffff; ifr->ifr_flagshigh = flags >> 16; +#else + ifr->ifr_flags = flags; #endif } |