From 88705399042e6f0a9222faa74fb01ca0af237088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20S=C3=B6ntgen?= Date: Sat, 22 Nov 2014 15:09:18 +0100 Subject: [PATCH] dde_linux: clean up lxip patches --- repos/dde_linux/patches/lxip_ip_config.patch | 13 +++++++++---- repos/dde_linux/patches/lxip_skbuff.patch | 13 +++++++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/repos/dde_linux/patches/lxip_ip_config.patch b/repos/dde_linux/patches/lxip_ip_config.patch index c95817dbe..febeb7bda 100644 --- a/repos/dde_linux/patches/lxip_ip_config.patch +++ b/repos/dde_linux/patches/lxip_ip_config.patch @@ -1,7 +1,12 @@ -diff -r d3a8e67b38cf net/ipv4/ipconfig.c ---- a/net/ipv4/ipconfig.c Fri Sep 20 12:18:22 2013 +0200 -+++ b/net/ipv4/ipconfig.c Fri Sep 20 12:18:56 2013 +0200 -@@ -1505,24 +1505,24 @@ +commit 3785e30c9833a908775a69c2961a3c1d6fe50d09 +Author: Sebastian Sumpf +Date: Mon Jun 2 13:25:30 2014 +0200 + + ip_config.patch + +--- a/net/ipv4/ipconfig.c ++++ b/net/ipv4/ipconfig.c +@@ -1516,24 +1516,24 @@ static int __init ip_auto_config(void) */ pr_info("IP-Config: Complete:\n"); diff --git a/repos/dde_linux/patches/lxip_skbuff.patch b/repos/dde_linux/patches/lxip_skbuff.patch index 3360a6ec4..a7464538d 100644 --- a/repos/dde_linux/patches/lxip_skbuff.patch +++ b/repos/dde_linux/patches/lxip_skbuff.patch @@ -1,7 +1,12 @@ -diff -r 6e1a0ab143a5 net/core/skbuff.c ---- a/net/core/skbuff.c Fri Oct 18 12:02:45 2013 +0200 -+++ b/net/core/skbuff.c Fri Oct 18 12:04:07 2013 +0200 -@@ -419,23 +419,9 @@ +commit 1843c9d95c0a7f6cf04357bf26633cfd2e5bdda4 +Author: Sebastian Sumpf +Date: Mon Jun 2 13:34:18 2014 +0200 + + skbuff.patch + +--- a/net/core/skbuff.c ++++ b/net/core/skbuff.c +@@ -414,23 +414,9 @@ struct sk_buff *__netdev_alloc_skb(struct net_device *dev, unsigned int fragsz = SKB_DATA_ALIGN(length + NET_SKB_PAD) + SKB_DATA_ALIGN(sizeof(struct skb_shared_info));