summaryrefslogtreecommitdiff
path: root/target/linux/generic
diff options
context:
space:
mode:
authorjogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-05-20 16:57:00 +0000
committerjogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-05-20 16:57:00 +0000
commit68518e2d5f06865d48139460695523475f51c18c (patch)
tree21176a22fb7ce5de7fd0c39beb4f27f92126b291 /target/linux/generic
parent7912cc5393bc9706d26b5b403d99a1a0d2fb633c (diff)
kernel: update 3.9 to 3.9.3
Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36676 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-3.9/630-packet_socket_type.patch16
-rw-r--r--target/linux/generic/patches-3.9/840-rtc7301.patch2
-rw-r--r--target/linux/generic/patches-3.9/841-rtc_pt7c4338.patch2
-rw-r--r--target/linux/generic/patches-3.9/902-debloat_proc.patch2
4 files changed, 11 insertions, 11 deletions
diff --git a/target/linux/generic/patches-3.9/630-packet_socket_type.patch b/target/linux/generic/patches-3.9/630-packet_socket_type.patch
index 0671a28e9b..394eb2f50d 100644
--- a/target/linux/generic/patches-3.9/630-packet_socket_type.patch
+++ b/target/linux/generic/patches-3.9/630-packet_socket_type.patch
@@ -26,7 +26,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
#define PACKET_FANOUT_LB 1
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
-@@ -1273,6 +1273,7 @@ static int packet_rcv_spkt(struct sk_buf
+@@ -1266,6 +1266,7 @@ static int packet_rcv_spkt(struct sk_buf
{
struct sock *sk;
struct sockaddr_pkt *spkt;
@@ -34,7 +34,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
/*
* When we registered the protocol we saved the socket in the data
-@@ -1280,6 +1281,7 @@ static int packet_rcv_spkt(struct sk_buf
+@@ -1273,6 +1274,7 @@ static int packet_rcv_spkt(struct sk_buf
*/
sk = pt->af_packet_priv;
@@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
/*
* Yank back the headers [hope the device set this
-@@ -1292,7 +1294,7 @@ static int packet_rcv_spkt(struct sk_buf
+@@ -1285,7 +1287,7 @@ static int packet_rcv_spkt(struct sk_buf
* so that this procedure is noop.
*/
@@ -51,7 +51,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
goto out;
if (!net_eq(dev_net(dev), sock_net(sk)))
-@@ -1498,12 +1500,12 @@ static int packet_rcv(struct sk_buff *sk
+@@ -1491,12 +1493,12 @@ static int packet_rcv(struct sk_buff *sk
int skb_len = skb->len;
unsigned int snaplen, res;
@@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;
-@@ -1622,12 +1624,12 @@ static int tpacket_rcv(struct sk_buff *s
+@@ -1615,12 +1617,12 @@ static int tpacket_rcv(struct sk_buff *s
struct timespec ts;
struct skb_shared_hwtstamps *shhwtstamps = skb_hwtstamps(skb);
@@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;
-@@ -2539,6 +2541,7 @@ static int packet_create(struct net *net
+@@ -2532,6 +2534,7 @@ static int packet_create(struct net *net
spin_lock_init(&po->bind_lock);
mutex_init(&po->pg_vec_lock);
po->prot_hook.func = packet_rcv;
@@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
if (sock->type == SOCK_PACKET)
po->prot_hook.func = packet_rcv_spkt;
-@@ -3152,6 +3155,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -3145,6 +3148,16 @@ packet_setsockopt(struct socket *sock, i
po->tp_tx_has_off = !!val;
return 0;
}
@@ -108,7 +108,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
default:
return -ENOPROTOOPT;
}
-@@ -3206,6 +3219,13 @@ static int packet_getsockopt(struct sock
+@@ -3199,6 +3212,13 @@ static int packet_getsockopt(struct sock
case PACKET_VNET_HDR:
val = po->has_vnet_hdr;
break;
diff --git a/target/linux/generic/patches-3.9/840-rtc7301.patch b/target/linux/generic/patches-3.9/840-rtc7301.patch
index 2119f846cc..a84bf93de5 100644
--- a/target/linux/generic/patches-3.9/840-rtc7301.patch
+++ b/target/linux/generic/patches-3.9/840-rtc7301.patch
@@ -1,6 +1,6 @@
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
-@@ -843,6 +843,15 @@ config RTC_DRV_NUC900
+@@ -841,6 +841,15 @@ config RTC_DRV_NUC900
If you say yes here you get support for the RTC subsystem of the
NUC910/NUC920 used in embedded systems.
diff --git a/target/linux/generic/patches-3.9/841-rtc_pt7c4338.patch b/target/linux/generic/patches-3.9/841-rtc_pt7c4338.patch
index 7a5ebdc2d5..8ed968ed9c 100644
--- a/target/linux/generic/patches-3.9/841-rtc_pt7c4338.patch
+++ b/target/linux/generic/patches-3.9/841-rtc_pt7c4338.patch
@@ -1,6 +1,6 @@
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
-@@ -490,6 +490,15 @@ config RTC_DRV_RV3029C2
+@@ -488,6 +488,15 @@ config RTC_DRV_RV3029C2
This driver can also be built as a module. If so, the module
will be called rtc-rv3029c2.
diff --git a/target/linux/generic/patches-3.9/902-debloat_proc.patch b/target/linux/generic/patches-3.9/902-debloat_proc.patch
index de5b1c6fb8..948b73d0ef 100644
--- a/target/linux/generic/patches-3.9/902-debloat_proc.patch
+++ b/target/linux/generic/patches-3.9/902-debloat_proc.patch
@@ -173,7 +173,7 @@
goto err;
--- a/net/core/sock.c
+++ b/net/core/sock.c
-@@ -2857,6 +2857,8 @@ static __net_initdata struct pernet_oper
+@@ -2845,6 +2845,8 @@ static __net_initdata struct pernet_oper
static int __init proto_init(void)
{