aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.39
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2011-08-16 22:04:10 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2011-08-16 22:04:10 +0000
commit09b1073f9b401f17c05a0ab4ba0493d13f110ec9 (patch)
treec6675a970207d8a40ac9314609c3d1e97c260f9b /target/linux/generic/patches-2.6.39
parent3e94ee96425e0f311fb8e35749386b04053173ea (diff)
downloadupstream-09b1073f9b401f17c05a0ab4ba0493d13f110ec9.tar.gz
upstream-09b1073f9b401f17c05a0ab4ba0493d13f110ec9.tar.bz2
upstream-09b1073f9b401f17c05a0ab4ba0493d13f110ec9.zip
kernel: update kernel to version 2.6.39.4
SVN-Revision: 28022
Diffstat (limited to 'target/linux/generic/patches-2.6.39')
-rw-r--r--target/linux/generic/patches-2.6.39/630-packet_socket_type.patch6
-rw-r--r--target/linux/generic/patches-2.6.39/642-bridge_port_isolate.patch2
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-2.6.39/630-packet_socket_type.patch b/target/linux/generic/patches-2.6.39/630-packet_socket_type.patch
index 75b61290c3..122a108048 100644
--- a/target/linux/generic/patches-2.6.39/630-packet_socket_type.patch
+++ b/target/linux/generic/patches-2.6.39/630-packet_socket_type.patch
@@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop;
-@@ -1523,6 +1526,7 @@ static int packet_create(struct net *net
+@@ -1524,6 +1527,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;
@@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
if (sock->type == SOCK_PACKET)
po->prot_hook.func = packet_rcv_spkt;
-@@ -2091,6 +2095,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -2093,6 +2097,16 @@ packet_setsockopt(struct socket *sock, i
po->tp_tstamp = val;
return 0;
}
@@ -116,7 +116,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
default:
return -ENOPROTOOPT;
}
-@@ -2148,6 +2162,13 @@ static int packet_getsockopt(struct sock
+@@ -2150,6 +2164,13 @@ static int packet_getsockopt(struct sock
data = &val;
break;
diff --git a/target/linux/generic/patches-2.6.39/642-bridge_port_isolate.patch b/target/linux/generic/patches-2.6.39/642-bridge_port_isolate.patch
index c051a29f2d..09a3b913d0 100644
--- a/target/linux/generic/patches-2.6.39/642-bridge_port_isolate.patch
+++ b/target/linux/generic/patches-2.6.39/642-bridge_port_isolate.patch
@@ -1,6 +1,6 @@
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
-@@ -132,6 +132,7 @@ struct net_bridge_port
+@@ -133,6 +133,7 @@ struct net_bridge_port
unsigned long flags;
#define BR_HAIRPIN_MODE 0x00000001