Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=83b496e928dbd38104bfb107230cc88751b09d89
Commit:     83b496e928dbd38104bfb107230cc88751b09d89
Parent:     1f8481d19af005c469ee50cf972486240905585e
Author:     Patrick McHardy <[EMAIL PROTECTED]>
AuthorDate: Tue May 22 17:00:01 2007 -0700
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Tue May 22 17:00:01 2007 -0700

    [RTNETLINK]: Allow changing of subsets of netdevice flags in rtnl_setlink
    
    rtnl_setlink doesn't allow to change subsets of the flags, just to override
    the set entirely by a new one. This means that for simply setting a device
    up or down userspace first needs to query the current flags, change it and
    send the changed flags back, which is racy and needlessly complicated.
    
    Mask the flags using ifi_change since this is what it is intended for.
    For backwards compatibility treat ifi_change == 0 as ~0 (even though it
    seems quite unlikely that anyone has been using this so far).
    
    Signed-off-by: Patrick McHardy <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 net/core/rtnetlink.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 8c971a2..1a6c5b9 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -689,8 +689,15 @@ static int rtnl_setlink(struct sk_buff *skb, struct 
nlmsghdr *nlh, void *arg)
        }
 
 
-       if (ifm->ifi_flags)
-               dev_change_flags(dev, ifm->ifi_flags);
+       if (ifm->ifi_flags || ifm->ifi_change) {
+               unsigned int flags = ifm->ifi_flags;
+
+               /* bugwards compatibility: ifi_change == 0 is treated as ~0 */
+               if (ifm->ifi_change)
+                       flags = (flags & ifm->ifi_change) |
+                               (dev->flags & ~ifm->ifi_change);
+               dev_change_flags(dev, flags);
+       }
 
        if (tb[IFLA_TXQLEN])
                dev->tx_queue_len = nla_get_u32(tb[IFLA_TXQLEN]);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to