|
@@ -4459,7 +4459,7 @@ static void dev_change_rx_flags(struct net_device *dev, int flags)
|
|
|
|
|
|
static int __dev_set_promiscuity(struct net_device *dev, int inc)
|
|
|
{
|
|
|
- unsigned short old_flags = dev->flags;
|
|
|
+ unsigned int old_flags = dev->flags;
|
|
|
uid_t uid;
|
|
|
gid_t gid;
|
|
|
|
|
@@ -4516,7 +4516,7 @@ static int __dev_set_promiscuity(struct net_device *dev, int inc)
|
|
|
*/
|
|
|
int dev_set_promiscuity(struct net_device *dev, int inc)
|
|
|
{
|
|
|
- unsigned short old_flags = dev->flags;
|
|
|
+ unsigned int old_flags = dev->flags;
|
|
|
int err;
|
|
|
|
|
|
err = __dev_set_promiscuity(dev, inc);
|
|
@@ -4543,7 +4543,7 @@ EXPORT_SYMBOL(dev_set_promiscuity);
|
|
|
|
|
|
int dev_set_allmulti(struct net_device *dev, int inc)
|
|
|
{
|
|
|
- unsigned short old_flags = dev->flags;
|
|
|
+ unsigned int old_flags = dev->flags;
|
|
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
@@ -4646,7 +4646,7 @@ EXPORT_SYMBOL(dev_get_flags);
|
|
|
|
|
|
int __dev_change_flags(struct net_device *dev, unsigned int flags)
|
|
|
{
|
|
|
- int old_flags = dev->flags;
|
|
|
+ unsigned int old_flags = dev->flags;
|
|
|
int ret;
|
|
|
|
|
|
ASSERT_RTNL();
|
|
@@ -4729,10 +4729,10 @@ void __dev_notify_flags(struct net_device *dev, unsigned int old_flags)
|
|
|
* Change settings on device based state flags. The flags are
|
|
|
* in the userspace exported format.
|
|
|
*/
|
|
|
-int dev_change_flags(struct net_device *dev, unsigned flags)
|
|
|
+int dev_change_flags(struct net_device *dev, unsigned int flags)
|
|
|
{
|
|
|
- int ret, changes;
|
|
|
- int old_flags = dev->flags;
|
|
|
+ int ret;
|
|
|
+ unsigned int changes, old_flags = dev->flags;
|
|
|
|
|
|
ret = __dev_change_flags(dev, flags);
|
|
|
if (ret < 0)
|