v3 ethtool: add ntuple flow specifier data to network flow classifier

[mirror_ubuntu-artful-kernel.git] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index 5212447c86e72b44a8ab91fabb05781b1a5026d0..575c84f2af19a4191d67a5d998f07c94d1995d7f 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -2643,13 +2643,13 @@ static int ethtool_ioctl(struct net *net, struct compat_ifreq __user *ifr32)
                return -EFAULT;
 
        if (convert_in) {
-               /* We expect there to be holes between fs.m_u and
+               /* We expect there to be holes between fs.m_ext and
                 * fs.ring_cookie and at the end of fs, but nowhere else.
                 */
-               BUILD_BUG_ON(offsetof(struct compat_ethtool_rxnfc, fs.m_u) +
-                            sizeof(compat_rxnfc->fs.m_u) !=
-                            offsetof(struct ethtool_rxnfc, fs.m_u) +
-                            sizeof(rxnfc->fs.m_u));
+               BUILD_BUG_ON(offsetof(struct compat_ethtool_rxnfc, fs.m_ext) +
+                            sizeof(compat_rxnfc->fs.m_ext) !=
+                            offsetof(struct ethtool_rxnfc, fs.m_ext) +
+                            sizeof(rxnfc->fs.m_ext));
                BUILD_BUG_ON(
                        offsetof(struct compat_ethtool_rxnfc, fs.location) -
                        offsetof(struct compat_ethtool_rxnfc, fs.ring_cookie) !=
@@ -2657,7 +2657,7 @@ static int ethtool_ioctl(struct net *net, struct compat_ifreq __user *ifr32)
                        offsetof(struct ethtool_rxnfc, fs.ring_cookie));
 
                if (copy_in_user(rxnfc, compat_rxnfc,
-                                (void *)(&rxnfc->fs.m_u + 1) -
+                                (void *)(&rxnfc->fs.m_ext + 1) -
                                 (void *)rxnfc) ||
                    copy_in_user(&rxnfc->fs.ring_cookie,
                                 &compat_rxnfc->fs.ring_cookie,
@@ -2674,7 +2674,7 @@ static int ethtool_ioctl(struct net *net, struct compat_ifreq __user *ifr32)
 
        if (convert_out) {
                if (copy_in_user(compat_rxnfc, rxnfc,
-                                (const void *)(&rxnfc->fs.m_u + 1) -
+                                (const void *)(&rxnfc->fs.m_ext + 1) -
                                 (const void *)rxnfc) ||
                    copy_in_user(&compat_rxnfc->fs.ring_cookie,
                                 &rxnfc->fs.ring_cookie,