Remove deprecated patches.

This commit is contained in:
Igor Pecovnik 2017-07-06 22:23:23 +02:00
parent 76dfbec67f
commit 3c2347bc3b
2 changed files with 0 additions and 42 deletions

View file

@ -1,15 +0,0 @@
diff --git a/drivers/clk/sunxi-ng/ccu-sun6i-a31.c b/drivers/clk/sunxi-ng/ccu-sun6i-a31.c
old mode 100644
new mode 100755
index 8ca07fe..0cca360
--- a/drivers/clk/sunxi-ng/ccu-sun6i-a31.c
+++ b/drivers/clk/sunxi-ng/ccu-sun6i-a31.c
@@ -556,7 +556,7 @@ static SUNXI_CCU_M_WITH_MUX_GATE(lcd0_ch1_clk, "lcd0-ch1", lcd_ch1_parents,
0x12c, 0, 4, 24, 3, BIT(31),
CLK_SET_RATE_PARENT);
static SUNXI_CCU_M_WITH_MUX_GATE(lcd1_ch1_clk, "lcd1-ch1", lcd_ch1_parents,
- 0x12c, 0, 4, 24, 3, BIT(31),
+ 0x130, 0, 4, 24, 3, BIT(31),
CLK_SET_RATE_PARENT);
static const char * const csi_sclk_parents[] = { "pll-video0", "pll-video1",

View file

@ -1,27 +0,0 @@
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index b1e24446..0693ab61 100644
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -222,6 +222,7 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
int assoclen;
int extralen;
int tailen;
+ int esph_offset;
__be64 seqno;
__u8 proto = *skb_mac_header(skb);
@@ -392,12 +393,13 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
}
cow:
+ esph_offset = (unsigned char *)esph - skb_transport_header(skb);
err = skb_cow_data(skb, tailen, &trailer);
if (err < 0)
goto error;
nfrags = err;
tail = skb_tail_pointer(trailer);
- esph = ip_esp_hdr(skb);
+ esph = (struct ip_esp_hdr *)(skb_transport_header(skb) + esph_offset);
skip_cow:
esp_output_fill_trailer(tail, tfclen, plen, proto);