Merge with /home/shaggy/git/linus-clean/

1 files changed, 4 insertions, 3 deletions

diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c
index 34b3bb8684..0fb513a34d 100644
--- a/net/ipx/af_ipx.c
+++ b/net/ipx/af_ipx.c
@@ -29,6 +29,7 @@
  */
 
 #include <linux/config.h>
+#include <linux/capability.h>
 #include <linux/errno.h>
 #include <linux/if_arp.h>
 #include <linux/if_ether.h>
@@ -75,7 +76,7 @@ static struct datalink_proto *pEII_datalink;
 static struct datalink_proto *p8023_datalink;
 static struct datalink_proto *pSNAP_datalink;
 
-static struct proto_ops ipx_dgram_ops;
+static const struct proto_ops ipx_dgram_ops;
 
 LIST_HEAD(ipx_interfaces);
 DEFINE_SPINLOCK(ipx_interfaces_lock);
@@ -1884,7 +1885,7 @@ static int ipx_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                 rc = -EINVAL;
                 break;
         default:
-                rc = dev_ioctl(cmd, argp);
+                rc = -ENOIOCTLCMD;
                 break;
         }
 
@@ -1901,7 +1902,7 @@ static struct net_proto_family ipx_family_ops = {
         .owner          = THIS_MODULE,
 };
 
-static struct proto_ops SOCKOPS_WRAPPED(ipx_dgram_ops) = {
+static const struct proto_ops SOCKOPS_WRAPPED(ipx_dgram_ops) = {
         .family         = PF_IPX,
         .owner          = THIS_MODULE,
         .release        = ipx_release,