commit 7c99cdc147f040aff8066619385d8c759ef3e9fa Author: Jan Rękorajski <bagg...@pld-linux.org> Date: Sun Nov 13 14:31:02 2016 +0100
- fix pointer incompatibility errors kernel-atmdd.patch | 8 ++++---- kernel-pom-ng-IPV4OPTSSTRIP.patch | 27 +++++++++------------------ kernel-virtio-gl-accel.patch | 2 +- 3 files changed, 14 insertions(+), 23 deletions(-) --- diff --git a/kernel-atmdd.patch b/kernel-atmdd.patch index 71fbbc8..a380fce 100644 --- a/kernel-atmdd.patch +++ b/kernel-atmdd.patch @@ -170,8 +170,8 @@ diff -urN linux-2.4.25/drivers/atm/atmdd.c linux-2.4.25-atmdd/drivers/atm/atmdd. +static int myatmdd_open(struct atm_vcc *vcc); +static void myatmdd_close(struct atm_vcc *vcc); +static int myatmdd_ioctl(struct atm_dev *dev, unsigned int cmd,void *arg); -+static int myatmdd_setsockopt(struct atm_vcc *vcc,int level,int optname, void *optval,int optlen); -+static int myatmdd_getsockopt(struct atm_vcc *vcc,int level,int optname, void *optval,int optlen); ++static int myatmdd_setsockopt(struct atm_vcc *vcc,int level,int optname, void __user *optval,unsigned int optlen); ++static int myatmdd_getsockopt(struct atm_vcc *vcc,int level,int optname, void __user *optval,int optlen); +static int myatmdd_send(struct atm_vcc *vcc,struct sk_buff *skb); +static int myatmdd_change_qos(struct atm_vcc *vcc,struct atm_qos *qos,int flgs); +static int myatmdd_proc_read(struct atm_dev *dev,loff_t *pos,char *page); @@ -789,12 +789,12 @@ diff -urN linux-2.4.25/drivers/atm/atmdd.c linux-2.4.25-atmdd/drivers/atm/atmdd. + return -EINVAL; +} + -+static int myatmdd_getsockopt(struct atm_vcc *vcc,int level,int optname, void *optval,int optlen) ++static int myatmdd_getsockopt(struct atm_vcc *vcc,int level,int optname, void __user *optval,int optlen) +{ + return -EINVAL; +} + -+static int myatmdd_setsockopt(struct atm_vcc *vcc,int level,int optname, void *optval,int optlen) ++static int myatmdd_setsockopt(struct atm_vcc *vcc,int level,int optname, void __user *optval,unsigned int optlen) +{ + return -EINVAL; +} diff --git a/kernel-pom-ng-IPV4OPTSSTRIP.patch b/kernel-pom-ng-IPV4OPTSSTRIP.patch index de73b89..f5c608f 100644 --- a/kernel-pom-ng-IPV4OPTSSTRIP.patch +++ b/kernel-pom-ng-IPV4OPTSSTRIP.patch @@ -30,7 +30,7 @@ diff -NurpP --minimal linux-2.6.21.b/net/ipv4/netfilter/Kconfig linux-2.6.21.a/n diff -NurpP --minimal linux-2.6.21.b/net/ipv4/netfilter/ipt_IPV4OPTSSTRIP.c linux-2.6.21.a/net/ipv4/netfilter/ipt_IPV4OPTSSTRIP.c --- linux-2.6.21.b/net/ipv4/netfilter/ipt_IPV4OPTSSTRIP.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.21.a/net/ipv4/netfilter/ipt_IPV4OPTSSTRIP.c 2007-05-30 11:18:08.000000000 +0200 -@@ -0,0 +1,84 @@ +@@ -0,0 +1,75 @@ +/** + * Strip all IP options in the IP packet header. + * @@ -50,30 +50,25 @@ diff -NurpP --minimal linux-2.6.21.b/net/ipv4/netfilter/ipt_IPV4OPTSSTRIP.c linu +MODULE_LICENSE("GPL"); + +static unsigned int -+target(struct sk_buff *skb, -+ const struct net_device *in, -+ const struct net_device *out, -+ unsigned int hooknum, -+ const struct xt_target *target, -+ const void *targinfo) ++target(struct sk_buff *skb, const struct xt_action_param *par) +{ + struct iphdr *iph; + struct ip_options *opt; -+ sk_buff_data_t optiph; ++ unsigned char *optiph; + int l; + + if (!skb_make_writable(skb, skb->len)) + return NF_DROP; + + iph = ip_hdr(skb); -+ optiph = skb->network_header; -+ l = ((struct ip_options *)(&(IPCB(skb)->opt)))->optlen; + + /* if no options in packet then nothing to clear. */ + if (iph->ihl * 4 == sizeof(struct iphdr)) + return XT_CONTINUE; + + /* else clear all options */ ++ optiph = skb_network_header(skb); ++ l = ((struct ip_options *)(&(IPCB(skb)->opt)))->optlen; + memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options)); + memset(optiph+sizeof(struct iphdr), IPOPT_NOOP, l); + opt = &(IPCB(skb)->opt); @@ -82,15 +77,11 @@ diff -NurpP --minimal linux-2.6.21.b/net/ipv4/netfilter/ipt_IPV4OPTSSTRIP.c linu + return XT_CONTINUE; +} + -+static bool -+checkentry(const char *tablename, -+ const void *e, -+ const struct xt_target *target, -+ void *targinfo, -+ unsigned int hook_mask) ++static int ++checkentry(const struct xt_tgchk_param *par) +{ -+ if (strcmp(tablename, "mangle")) { -+ printk(KERN_WARNING "IPV4OPTSSTRIP: can only be called from \"mangle\" table, not \"%s\"\n", tablename); ++ if (strcmp(par->table, "mangle")) { ++ printk(KERN_WARNING "IPV4OPTSSTRIP: can only be called from \"mangle\" table, not \"%s\"\n", par->table); + return 0; + } + /* nothing else to check because no parameters */ diff --git a/kernel-virtio-gl-accel.patch b/kernel-virtio-gl-accel.patch index c539b57..c1f825a 100644 --- a/kernel-virtio-gl-accel.patch +++ b/kernel-virtio-gl-accel.patch @@ -245,7 +245,7 @@ index 0000000..8882bda + return 0; +} + -+static int glmem_fsync(struct file *filp, int datasync) ++static int glmem_fsync(struct file *filp, loff_t unused1, loff_t unused2, int datasync) +{ + struct virtio_gl_data *gldata = to_virtio_gl_data(filp); + ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/7c99cdc147f040aff8066619385d8c759ef3e9fa _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit