2 files changed, 1 insertions, 4 deletions

diff --git a/Documentation/networking/operstates.txt b/Documentation/networking/operstates.txt
index c9074f9b78bb..1a77a3cfae54 100644
--- a/Documentation/networking/operstates.txt
+++ b/Documentation/networking/operstates.txt
@@ -38,9 +38,6 @@ ifinfomsg::if_flags & IFF_LOWER_UP:
 ifinfomsg::if_flags & IFF_DORMANT:
  Driver has signaled netif_dormant_on()
 
-These interface flags can also be queried without netlink using the
-SIOCGIFFLAGS ioctl.
-
 TLV IFLA_OPERSTATE
 
 contains RFC2863 state of the interface in numeric representation:
diff --git a/net/core/dev.c b/net/core/dev.c
index 11560e3258b5..a09bf658970f 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4209,7 +4209,7 @@ static int dev_ifsioc_locked(struct net *net, struct ifreq *ifr, unsigned int cm
 
         switch (cmd) {
                 case SIOCGIFFLAGS:      /* Get interface flags */
-                        ifr->ifr_flags = dev_get_flags(dev);
+                        ifr->ifr_flags = (short) dev_get_flags(dev);
                         return 0;
 
                 case SIOCGIFMETRIC:     /* Get the metric on the interface